summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-09-03 10:49:00 +0200
committerAzul <azul@leap.se>2013-09-03 10:49:00 +0200
commit9a70f0e317e62993337e3e47382dcb7795d65652 (patch)
tree25e04f1e44723d2a7044fbfe05993f96b6406be7 /users
parentc17edbc069c6dcfc3dd20d8cdfb5922032769a5f (diff)
Cleanup sessions controller - webapp logs in through the api.
So the #create and #update actions were not needed anymore. Also removed the tests
Diffstat (limited to 'users')
-rw-r--r--users/app/controllers/sessions_controller.rb10
-rw-r--r--users/test/functional/sessions_controller_test.rb21
2 files changed, 0 insertions, 31 deletions
diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb
index d6c455b..0494b51 100644
--- a/users/app/controllers/sessions_controller.rb
+++ b/users/app/controllers/sessions_controller.rb
@@ -8,16 +8,6 @@ class SessionsController < ApplicationController
end
end
- def create
- logout if logged_in?
- authenticate!
- end
-
- def update
- authenticate!
- render :json => session.delete(:handshake)
- end
-
def destroy
logout
redirect_to root_path
diff --git a/users/test/functional/sessions_controller_test.rb b/users/test/functional/sessions_controller_test.rb
index b22c3a3..a630e6e 100644
--- a/users/test/functional/sessions_controller_test.rb
+++ b/users/test/functional/sessions_controller_test.rb
@@ -41,27 +41,6 @@ class SessionsControllerTest < ActionController::TestCase
assert_json_error :login => I18n.t(:all_strategies_failed)
end
- # Warden takes care of parsing the params and
- # rendering the response. So not much to test here.
- test "should perform handshake" do
- request.env['warden'].expects(:authenticate!)
- # make sure we don't get a template missing error:
- @controller.stubs(:render)
- post :create, :login => @user.login, 'A' => @client_hex
- end
-
- test "should authorize" do
- request.env['warden'].expects(:authenticate!)
- handshake = stub(:to_json => "JSON")
- session[:handshake] = handshake
-
- post :update, :id => @user.login, :client_auth => @client_hex
-
- assert_nil session[:handshake]
- assert_response :success
- assert_json_response handshake
- end
-
test "logout should reset warden user" do
expect_warden_logout
delete :destroy