devise 1.0.11 → 1.1.0

data/test/failure_app_test.rb

@@ -1,44 +1,123 @@
-require 'test/test_helper'
+require 'test_helper'
 require 'ostruct'
 
 class FailureTest < ActiveSupport::TestCase
+  def self.context(name, &block)
+    instance_eval(&block)
+  end
 
   def call_failure(env_params={})
-    env = {'warden.options' => { :scope => :user }}.merge!(env_params)
-    Devise::FailureApp.call(env)
+    env = {
+      'REQUEST_URI' => 'http://test.host/',
+      'HTTP_HOST' => 'test.host',
+      'REQUEST_METHOD' => 'GET',
+      'warden.options' => { :scope => :user },
+      'rack.session' => {},
+      'action_dispatch.request.formats' => Array(env_params.delete('formats') || :html),
+      'rack.input' => "",
+      'warden' => OpenStruct.new(:message => nil)
+    }.merge!(env_params)
+    
+    @response = Devise::FailureApp.call(env).to_a
+    @request  = ActionDispatch::Request.new(env)
   end
 
-  test 'return 302 status' do
-    assert_equal 302, call_failure.first
-  end
+  context 'When redirecting' do
+    test 'return 302 status' do
+      call_failure
+      assert_equal 302, @response.first
+    end
 
-  test 'return to the default redirect location' do
-    assert_equal '/users/sign_in?unauthenticated=true', call_failure.second['Location']
-  end
+    test 'return to the default redirect location' do
+      call_failure
+      assert_equal 'You need to sign in or sign up before continuing.', @request.flash[:alert]
+      assert_equal 'http://test.host/users/sign_in', @response.second['Location']
+    end
 
-  test 'uses the proxy failure message' do
-    warden = OpenStruct.new(:message => :test)
-    location = call_failure('warden' => warden).second['Location']
-    assert_equal '/users/sign_in?test=true', location
-  end
+    test 'uses the proxy failure message as symbol' do
+      call_failure('warden' => OpenStruct.new(:message => :test))
+      assert_equal 'test', @request.flash[:alert]
+      assert_equal 'http://test.host/users/sign_in', @response.second["Location"]
+    end
 
-  test 'uses the given message' do
-    warden = OpenStruct.new(:message => 'Hello world')
-    location = call_failure('warden' => warden).second['Location']
-    assert_equal '/users/sign_in?message=Hello+world', location
-  end
+    test 'uses the proxy failure message as string' do
+      call_failure('warden' => OpenStruct.new(:message => 'Hello world'))
+      assert_equal 'Hello world', @request.flash[:alert]
+      assert_equal 'http://test.host/users/sign_in', @response.second["Location"]
+    end
+
+    test 'set content type to default text/html' do
+      call_failure
+      assert_equal 'text/html; charset=utf-8', @response.second['Content-Type']
+    end
 
-  test 'setup default url' do
-    Devise::FailureApp.default_url = 'test/sign_in'
-    location = call_failure('warden.options' => { :scope => nil }).second['Location']
-    assert_equal '/test/sign_in?unauthenticated=true', location
+    test 'setup a default message' do
+      call_failure
+      assert_match /You are being/, @response.last.body
+      assert_match /redirected/, @response.last.body
+      assert_match /users\/sign_in/, @response.last.body
+    end
+
+    test 'works for any navigational format' do
+      swap Devise, :navigational_formats => [:xml] do
+        call_failure('formats' => :xml)
+        assert_equal 302, @response.first
+      end
+    end
   end
 
-  test 'set content type to default text/plain' do
-    assert_equal 'text/plain', call_failure.second['Content-Type']
+  context 'For HTTP request' do
+    test 'return 401 status' do
+      call_failure('formats' => :xml)
+      assert_equal 401, @response.first
+    end
+
+    test 'return WWW-authenticate headers' do
+      call_failure('formats' => :xml)
+      assert_equal 'Basic realm="Application"', @response.second["WWW-Authenticate"]
+    end
+
+    test 'dont return WWW-authenticate on ajax call if http_authenticatable_on_xhr false' do
+      swap Devise, :http_authenticatable_on_xhr => false do
+        call_failure('formats' => :html, 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest')
+        assert_equal 302, @response.first
+        assert_equal 'http://test.host/users/sign_in', @response.second["Location"]
+        assert_nil @response.second['WWW-Authenticate']
+      end
+    end
+
+    test 'return WWW-authenticate on ajax call if http_authenticatable_on_xhr true' do
+      swap Devise, :http_authenticatable_on_xhr => true do
+        call_failure('formats' => :html, 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest')
+        assert_equal 401, @response.first
+        assert_equal 'Basic realm="Application"', @response.second["WWW-Authenticate"]
+      end
+    end
+    
+    test 'uses the proxy failure message as response body' do
+      call_failure('formats' => :xml, 'warden' => OpenStruct.new(:message => :invalid))
+      assert_match '<error>Invalid email or password.</error>', @response.third.body
+    end
+
+    test 'works for any non navigational format' do
+      swap Devise, :navigational_formats => [] do
+        call_failure('formats' => :html)
+        assert_equal 401, @response.first
+      end
+    end
   end
 
-  test 'setup a default message' do
-    assert_equal ['You are being redirected to /users/sign_in?unauthenticated=true'], call_failure.last
+  context 'With recall' do
+    test 'calls the original controller' do
+      env = {
+        "action_dispatch.request.parameters" => { :controller => "devise/sessions" },
+        "warden.options" => { :recall => "new", :attempted_path => "/users/sign_in" },
+        "devise.mapping" => Devise.mappings[:user],
+        "warden" => stub_everything
+      }
+      call_failure(env)
+      assert @response.third.body.include?('<h2>Sign in</h2>')
+      assert @response.third.body.include?('Invalid email or password.')
+    end
   end
 end

data/test/integration/authenticatable_test.rb

@@ -1,6 +1,15 @@
-require 'test/test_helper'
+require 'test_helper'
 
 class AuthenticationSanityTest < ActionController::IntegrationTest
+
+  def setup
+    Devise.sign_out_all_scopes = false
+  end
+
+  def teardown
+    Devise.sign_out_all_scopes = false
+  end
+
   test 'home should be accessible without sign in' do
     visit '/'
     assert_response :success
@@ -29,7 +38,7 @@ class AuthenticationSanityTest < ActionController::IntegrationTest
     assert warden.authenticated?(:admin)
   end
 
-  test 'sign out as user should not touch admin authentication' do
+  test 'sign out as user should not touch admin authentication if sign_out_all_scopes is false' do
     sign_in_as_user
     sign_in_as_admin
 
@@ -38,7 +47,7 @@ class AuthenticationSanityTest < ActionController::IntegrationTest
     assert warden.authenticated?(:admin)
   end
 
-  test 'sign out as admin should not touch user authentication' do
+  test 'sign out as admin should not touch user authentication if sign_out_all_scopes is false' do
     sign_in_as_user
     sign_in_as_admin
 
@@ -47,11 +56,59 @@ class AuthenticationSanityTest < ActionController::IntegrationTest
     assert warden.authenticated?(:user)
   end
 
+  test 'sign out as user should also sign out admin if sign_out_all_scopes is true' do
+    Devise.sign_out_all_scopes = true
+    sign_in_as_user
+    sign_in_as_admin
+
+    get destroy_user_session_path
+    assert_not warden.authenticated?(:user)
+    assert_not warden.authenticated?(:admin)
+  end
+
+  test 'sign out as admin should also sign out user if sign_out_all_scopes is true' do
+    Devise.sign_out_all_scopes = true
+    sign_in_as_user
+    sign_in_as_admin
+
+    get destroy_admin_session_path
+    assert_not warden.authenticated?(:admin)
+    assert_not warden.authenticated?(:user)
+  end
+
   test 'not signed in as admin should not be able to access admins actions' do
     get admins_path
 
-    assert_redirected_to new_admin_session_path(:unauthenticated => true)
+    assert_redirected_to new_admin_session_path
+    assert_not warden.authenticated?(:admin)
+  end
+
+  test 'not signed in as admin should not be able to access private route restricted to admins' do
+    get private_path
+
+    assert_redirected_to new_admin_session_path
+    assert_not warden.authenticated?(:admin)
+  end
+
+  test 'signed in as user should not be able to access private route restricted to admins' do
+    sign_in_as_user
+    assert warden.authenticated?(:user)
     assert_not warden.authenticated?(:admin)
+
+    get private_path
+    assert_redirected_to new_admin_session_path
+  end
+
+  test 'signed in as admin should be able to access private route restricted to admins' do
+    sign_in_as_admin
+    assert warden.authenticated?(:admin)
+    assert_not warden.authenticated?(:user)
+
+    get private_path
+
+    assert_response :success
+    assert_template 'home/private'
+    assert_contain 'Private!'
   end
 
   test 'signed in as user should not be able to access admins actions' do
@@ -60,7 +117,7 @@ class AuthenticationSanityTest < ActionController::IntegrationTest
     assert_not warden.authenticated?(:admin)
 
     get admins_path
-    assert_redirected_to new_admin_session_path(:unauthenticated => true)
+    assert_redirected_to new_admin_session_path
   end
 
   test 'signed in as admin should be able to access admin actions' do
@@ -107,48 +164,11 @@ class AuthenticationSanityTest < ActionController::IntegrationTest
   end
 end
 
-class AuthenticationTest < ActionController::IntegrationTest
-  test 'sign in should not authenticate if not using proper authentication keys' do
-    swap Devise, :authentication_keys => [:username] do
-      sign_in_as_user
-      assert_not warden.authenticated?(:user)
-    end
-  end
-
-  test 'sign in with invalid email should return to sign in form with error message' do
-    sign_in_as_admin do
-      fill_in 'email', :with => 'wrongemail@test.com'
-    end
-
-    assert_contain 'Invalid email or password'
-    assert_not warden.authenticated?(:admin)
-  end
-
-  test 'sign in with invalid pasword should return to sign in form with error message' do
-    sign_in_as_admin do
-      fill_in 'password', :with => 'abcdef'
-    end
-
-    assert_contain 'Invalid email or password'
-    assert_not warden.authenticated?(:admin)
-  end
-
-  test 'error message is configurable by resource name' do
-    store_translations :en, :devise => {
-      :sessions => { :admin => { :invalid => "Invalid credentials" } }
-    } do
-      sign_in_as_admin do
-        fill_in 'password', :with => 'abcdef'
-      end
-
-      assert_contain 'Invalid credentials'
-    end
-  end
-
+class AuthenticationRedirectTest < ActionController::IntegrationTest
   test 'redirect from warden shows sign in or sign up message' do
     get admins_path
 
-    warden_path = new_admin_session_path(:unauthenticated => true)
+    warden_path = new_admin_session_path
     assert_redirected_to warden_path
 
     get warden_path
@@ -157,78 +177,68 @@ class AuthenticationTest < ActionController::IntegrationTest
 
   test 'redirect to default url if no other was configured' do
     sign_in_as_user
-
     assert_template 'home/index'
-    assert_nil session[:"user.return_to"]
+    assert_nil session[:"user_return_to"]
   end
 
   test 'redirect to requested url after sign in' do
     get users_path
-    assert_redirected_to new_user_session_path(:unauthenticated => true)
-    assert_equal users_path, session[:"user.return_to"]
+    assert_redirected_to new_user_session_path
+    assert_equal users_path, session[:"user_return_to"]
 
     follow_redirect!
     sign_in_as_user :visit => false
 
-    assert_template 'users/index'
-    assert_nil session[:"user.return_to"]
+    assert_current_url '/users'
+    assert_nil session[:"user_return_to"]
   end
 
   test 'redirect to last requested url overwriting the stored return_to option' do
     get expire_user_path(create_user)
-    assert_redirected_to new_user_session_path(:unauthenticated => true)
-    assert_equal expire_user_path(create_user), session[:"user.return_to"]
+    assert_redirected_to new_user_session_path
+    assert_equal expire_user_path(create_user), session[:"user_return_to"]
 
     get users_path
-    assert_redirected_to new_user_session_path(:unauthenticated => true)
-    assert_equal users_path, session[:"user.return_to"]
+    assert_redirected_to new_user_session_path
+    assert_equal users_path, session[:"user_return_to"]
 
     follow_redirect!
     sign_in_as_user :visit => false
 
-    assert_template 'users/index'
-    assert_nil session[:"user.return_to"]
+    assert_current_url '/users'
+    assert_nil session[:"user_return_to"]
   end
 
   test 'xml http requests does not store urls for redirect' do
-    xhr :get, users_path
-    assert_nil session[:"user.return_to"]
-
-    sign_in_as_user
-    assert_template 'home/index'
+    get users_path, {}, 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest'
+    assert_equal 401, response.status
+    assert_nil session[:"user_return_to"]
   end
 
   test 'redirect to configured home path for a given scope after sign in' do
     sign_in_as_admin
     assert_equal "/admin_area/home", @request.path
   end
+end
 
+class AuthenticationSessionTest < ActionController::IntegrationTest
   test 'destroyed account is signed out' do
     sign_in_as_user
-    visit 'users/index'
+    get '/users'
 
     User.destroy_all
-    visit 'users/index'
-    assert_redirected_to '/users/sign_in?unauthenticated=true'
+    get '/users'
+    assert_redirected_to new_user_session_path
   end
 
-  test 'allows session to be set by a given scope' do
+  test 'allows session to be set for a given scope' do
     sign_in_as_user
-    visit 'users/index'
-    assert_equal "Cart", @controller.user_session[:cart]
-  end
-
-  test 'session id is changed on sign in' do
     get '/users'
-    session_id = request.session[:session_id]
-
-    get '/users'
-    assert_equal session_id, request.session[:session_id]
-
-    sign_in_as_user
-    assert_not_equal session_id, request.session[:session_id]
+    assert_equal "Cart", @controller.user_session[:cart]
   end
+end
 
+class AuthenticationWithScopesTest < ActionController::IntegrationTest
   test 'renders the scoped view if turned on and view is available' do
     swap Devise, :scoped_views => true do
       assert_raise Webrat::NotFoundError do
@@ -240,15 +250,15 @@ class AuthenticationTest < ActionController::IntegrationTest
 
   test 'renders the scoped view if turned on in an specific controller' do
     begin
-      SessionsController.scoped_views = true
+      Devise::SessionsController.scoped_views = true
       assert_raise Webrat::NotFoundError do
         sign_in_as_user
       end
 
       assert_match /Special user view/, response.body
-      assert !PasswordsController.scoped_views
+      assert !Devise::PasswordsController.scoped_views?
     ensure
-      SessionsController.send :remove_instance_variable, :@scoped_views
+      Devise::SessionsController.send :remove_instance_variable, :@scoped_views
     end
   end
 
@@ -268,73 +278,67 @@ class AuthenticationTest < ActionController::IntegrationTest
     end
   end
 
-  test 'render 404 on roles without permission' do
-    get 'admin_area/password/new'
-    assert_response :not_found
-    assert_not_contain 'Send me reset password instructions'
-  end
-
-  test 'render 404 on roles without mapping' do
-    get 'sign_in'
-    assert_response :not_found
-    assert_not_contain 'Sign in'
+  test 'uses the mapping from router' do
+    sign_in_as_user :visit => "/as/sign_in"
+    assert warden.authenticated?(:user)
+    assert_not warden.authenticated?(:admin)
   end
 
-  test 'uses the mapping from the default scope if specified' do
-    swap Devise, :use_default_scope => true do
-      get 'sign_in'
-      assert_response :ok
-      assert_contain 'Sign in'
-    end
+  test 'uses the mapping from nested devise_for call' do
+    sign_in_as_user :visit => "/devise_for/sign_in"
+    assert warden.authenticated?(:user)
+    assert_not warden.authenticated?(:admin)
   end
 end
 
-class AuthenticationSignOutViaTest < ActionController::IntegrationTest
-  def sign_in!(scope)
-    visit send("new_#{scope}_session_path")
-    sign_in_as_user(:visit => false)
-    assert warden.authenticated?(scope)
+class AuthenticationOthersTest < ActionController::IntegrationTest
+  test 'uses the custom controller with the custom controller view' do
+    get '/admin_area/sign_in'
+    assert_contain 'Sign in'
+    assert_contain 'Welcome to "sessions" controller!'
+    assert_contain 'Welcome to "sessions/new" view!'
   end
 
-  test 'allow sign out via delete when sign_out_via provides only delete' do
-    sign_in!(:sign_out_via_delete)
-    delete destroy_sign_out_via_delete_session_path
-    assert_not warden.authenticated?(:sign_out_via_delete)
+  test 'render 404 on roles without routes' do
+    get '/admin_area/password/new'
+    assert_equal 404, response.status
   end
 
-  test 'do not allow sign out via get when sign_out_via provides only delete' do
-    sign_in!(:sign_out_via_delete)
-    get destroy_sign_out_via_delete_session_path
-    assert warden.authenticated?(:sign_out_via_delete)
+  test 'render 404 on roles without mapping' do
+    assert_raise AbstractController::ActionNotFound do
+      get '/sign_in'
+    end
   end
 
-  test 'allow sign out via post when sign_out_via provides only post' do
-    sign_in!(:sign_out_via_post)
-    post destroy_sign_out_via_post_session_path
-    assert_not warden.authenticated?(:sign_out_via_post)
+  test 'sign in with script name' do
+    assert_nothing_raised do
+      get new_user_session_path, {}, "SCRIPT_NAME" => "/omg"
+      fill_in "email", "user@test.com"
+    end
   end
 
-  test 'do not allow sign out via get when sign_out_via provides only post' do
-    sign_in!(:sign_out_via_post)
-    get destroy_sign_out_via_delete_session_path
-    assert warden.authenticated?(:sign_out_via_post)
+  test 'registration in xml format' do
+    assert_nothing_raised do
+      post user_registration_path(:format => 'xml', :user => {:email => "test@example.com", :password => "invalid"} )
+    end
   end
 
-  test 'allow sign out via delete when sign_out_via provides any method' do
-    sign_in!(:sign_out_via_anymethod)
-    delete destroy_sign_out_via_anymethod_session_path
-    assert_not warden.authenticated?(:sign_out_via_anymethod)
-  end
+  test 'does not explode when invalid user class is stored in session' do
+    klass = User
+    paths = ActiveSupport::Dependencies.autoload_paths.dup
 
-  test 'allow sign out via post when sign_out_via provides any method' do
-    sign_in!(:sign_out_via_anymethod)
-    post destroy_sign_out_via_anymethod_session_path
-    assert_not warden.authenticated?(:sign_out_via_anymethod)
-  end
+    begin
+      sign_in_as_user
+      assert warden.authenticated?(:user)
+
+      Object.send :remove_const, :User
+      ActiveSupport::Dependencies.autoload_paths.clear
 
-  test 'allow sign out via get when sign_out_via provides any method' do
-    sign_in!(:sign_out_via_anymethod)
-    get destroy_sign_out_via_anymethod_session_path
-    assert_not warden.authenticated?(:sign_out_via_anymethod)
+      visit "/users"
+      assert_not warden.authenticated?(:user)
+    ensure
+      Object.const_set(:User, klass)
+      ActiveSupport::Dependencies.autoload_paths.replace(paths)
+    end
   end
 end

data/test/integration/confirmable_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require 'test_helper'
 
 class ConfirmationTest < ActionController::IntegrationTest
 
@@ -11,45 +11,52 @@ class ConfirmationTest < ActionController::IntegrationTest
     ActionMailer::Base.deliveries.clear
 
     visit new_user_session_path
-    click_link 'Didn\'t receive confirmation instructions?'
+    click_link "Didn't receive confirmation instructions?"
 
     fill_in 'email', :with => user.email
     click_button 'Resend confirmation instructions'
 
-    assert_template 'sessions/new'
+    assert_current_url '/users/sign_in'
     assert_contain 'You will receive an email with instructions about how to confirm your account in a few minutes'
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
 
   test 'user with invalid confirmation token should not be able to confirm an account' do
     visit_user_confirmation_with_token('invalid_confirmation')
-
-    assert_response :success
-    assert_template 'confirmations/new'
-    assert_have_selector '#errorExplanation'
+    assert_have_selector '#error_explanation'
     assert_contain /Confirmation token(.*)invalid/
   end
 
   test 'user with valid confirmation token should be able to confirm an account' do
     user = create_user(:confirm => false)
     assert_not user.confirmed?
-
     visit_user_confirmation_with_token(user.confirmation_token)
 
-    assert_template 'home/index'
     assert_contain 'Your account was successfully confirmed.'
-
+    assert_current_url '/'
     assert user.reload.confirmed?
   end
 
-  test 'user already confirmed user should not be able to confirm the account again' do
+  test 'already confirmed user should not be able to confirm the account again' do
+    user = create_user(:confirm => false)
+    user.confirmed_at = Time.now
+    user.save
+    visit_user_confirmation_with_token(user.confirmation_token)
+
+    assert_have_selector '#error_explanation'
+    assert_contain 'already confirmed'
+  end
+
+  test 'already confirmed user should not be able to confirm the account again neither request confirmation' do
     user = create_user(:confirm => false)
     user.confirmed_at = Time.now
     user.save
+
     visit_user_confirmation_with_token(user.confirmation_token)
+    assert_contain 'already confirmed'
 
-    assert_template 'confirmations/new'
-    assert_have_selector '#errorExplanation'
+    fill_in 'email', :with => user.email
+    click_button 'Resend confirmation instructions'
     assert_contain 'already confirmed'
   end
 
@@ -88,9 +95,9 @@ class ConfirmationTest < ActionController::IntegrationTest
 
   test 'error message is configurable by resource name' do
     store_translations :en, :devise => {
-      :sessions => { :admin => { :unconfirmed => "Not confirmed user" } }
+      :failure => { :user => { :unconfirmed => "Not confirmed user" } }
     } do
-      get new_admin_session_path(:unconfirmed => true)
+      sign_in_as_user(:confirm => false)
       assert_contain 'Not confirmed user'
     end
   end

data/test/integration/database_authenticatable_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+class DatabaseAuthenticationTest < ActionController::IntegrationTest
+  test 'sign in should not authenticate if not using proper authentication keys' do
+    swap Devise, :authentication_keys => [:username] do
+      sign_in_as_user
+      assert_not warden.authenticated?(:user)
+    end
+  end
+
+  test 'sign in with invalid email should return to sign in form with error message' do
+    sign_in_as_admin do
+      fill_in 'email', :with => 'wrongemail@test.com'
+    end
+
+    assert_contain 'Invalid email or password'
+    assert_not warden.authenticated?(:admin)
+  end
+
+  test 'sign in with invalid pasword should return to sign in form with error message' do
+    sign_in_as_admin do
+      fill_in 'password', :with => 'abcdef'
+    end
+
+    assert_contain 'Invalid email or password'
+    assert_not warden.authenticated?(:admin)
+  end
+
+  test 'error message is configurable by resource name' do
+    store_translations :en, :devise => { :failure => { :admin => { :invalid => "Invalid credentials" } } } do
+      sign_in_as_admin do
+        fill_in 'password', :with => 'abcdef'
+      end
+
+      assert_contain 'Invalid credentials'
+    end
+  end
+end