Refactor login/logout into sessions controller

[rails.git] / test / controllers / users_controller_test.rb

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 89c2d2c9c040f8f0d50ed0de0c0fe5d8dd080bc5..7d8f569f0ad089a070b191eb5fe879f4df13074f 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -6,27 +6,27 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
   def test_routes
     assert_routing(
       { :path => "/login", :method => :get },
   def test_routes
     assert_routing(
       { :path => "/login", :method => :get },

-      { :controller => "users", :action => "login" }
+      { :controller => "sessions", :action => "new" }

     )
     assert_routing(
       { :path => "/login", :method => :post },
     )
     assert_routing(
       { :path => "/login", :method => :post },

-      { :controller => "users", :action => "login" }
+      { :controller => "sessions", :action => "create" }

     )
     assert_recognizes(
     )
     assert_recognizes(

-      { :controller => "users", :action => "login", :format => "html" },
+      { :controller => "sessions", :action => "new", :format => "html" },

       { :path => "/login.html", :method => :get }
     )
 
     assert_routing(
       { :path => "/logout", :method => :get },
       { :path => "/login.html", :method => :get }
     )
 
     assert_routing(
       { :path => "/logout", :method => :get },

-      { :controller => "users", :action => "logout" }
+      { :controller => "sessions", :action => "destroy" }

     )
     assert_routing(
       { :path => "/logout", :method => :post },
     )
     assert_routing(
       { :path => "/logout", :method => :post },

-      { :controller => "users", :action => "logout" }
+      { :controller => "sessions", :action => "destroy" }

     )
     assert_recognizes(
     )
     assert_recognizes(

-      { :controller => "users", :action => "logout", :format => "html" },
+      { :controller => "sessions", :action => "destroy", :format => "html" },

       { :path => "/logout.html", :method => :get }
     )
 
       { :path => "/logout.html", :method => :get }
     )
 


@@ -233,7 +233,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     assert_response :success
     assert_template "new"
 
     assert_response :success
     assert_template "new"

-    assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_email"
+    assert_select "form > div.form-group > input.is-invalid#user_email"

   end
 
   def test_save_duplicate_email
   end
 
   def test_save_duplicate_email


@@ -262,7 +262,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     assert_response :success
     assert_template "new"
 
     assert_response :success
     assert_template "new"

-    assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_email"
+    assert_select "form > div.form-group > input.is-invalid#user_email"

   end
 
   def test_save_duplicate_email_uppercase
   end
 
   def test_save_duplicate_email_uppercase


@@ -291,7 +291,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     assert_response :success
     assert_template "new"
 
     assert_response :success
     assert_template "new"

-    assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_email"
+    assert_select "form > div.form-group > input.is-invalid#user_email"

   end
 
   def test_save_duplicate_name
   end
 
   def test_save_duplicate_name


@@ -320,7 +320,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     assert_response :success
     assert_template "new"
 
     assert_response :success
     assert_template "new"

-    assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
+    assert_select "form > div.form-group > input.is-invalid#user_display_name"

   end
 
   def test_save_duplicate_name_uppercase
   end
 
   def test_save_duplicate_name_uppercase


@@ -349,7 +349,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     assert_response :success
     assert_template "new"
 
     assert_response :success
     assert_template "new"

-    assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
+    assert_select "form > div.form-group > input.is-invalid#user_display_name"

   end
 
   def test_save_blocked_domain
   end
 
   def test_save_blocked_domain


@@ -406,6 +406,25 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     ActionMailer::Base.deliveries.clear
   end
 
     ActionMailer::Base.deliveries.clear
   end
 

+  def test_login
+    user = create(:user)
+
+    get login_path
+    assert_response :redirect
+    assert_redirected_to login_path(:cookie_test => true)
+    follow_redirect!
+    assert_response :success
+    assert_template "sessions/new"
+
+    get login_path, :params => { :username => user.display_name, :password => "test" }
+    assert_response :success
+    assert_template "sessions/new"
+
+    post login_path, :params => { :username => user.display_name, :password => "test" }
+    assert_response :redirect
+    assert_redirected_to root_path
+  end
+

   def test_logout_without_referer
     post logout_path
     assert_response :redirect
   def test_logout_without_referer
     post logout_path
     assert_response :redirect


@@ -421,14 +440,14 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
   def test_logout_fallback_without_referer
     get logout_path
     assert_response :success
   def test_logout_fallback_without_referer
     get logout_path
     assert_response :success

-    assert_template :logout
+    assert_template "sessions/destroy"

     assert_select "input[name=referer]:not([value])"
   end
 
   def test_logout_fallback_with_referer
     get logout_path, :params => { :referer => "/test" }
     assert_response :success
     assert_select "input[name=referer]:not([value])"
   end
 
   def test_logout_fallback_with_referer
     get logout_path, :params => { :referer => "/test" }
     assert_response :success

-    assert_template :logout
+    assert_template "sessions/destroy"

     assert_select "input[name=referer][value=?]", "/test"
   end
 
     assert_select "input[name=referer][value=?]", "/test"
   end
 


@@ -583,7 +602,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     confirm_string = User.find_by(:email => user.email).tokens.create(:referer => new_diary_entry_path).token
     post user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
 
     confirm_string = User.find_by(:email => user.email).tokens.create(:referer => new_diary_entry_path).token
     post user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }

-    assert_redirected_to :action => "login"
+    assert_redirected_to login_path

     assert_match(/already been confirmed/, flash[:error])
   end
 
     assert_match(/already been confirmed/, flash[:error])
   end
 


@@ -812,13 +831,23 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     user = create(:user)
     uppercase_user = build(:user, :email => user.email.upcase).tap { |u| u.save(:validate => false) }
 
     user = create(:user)
     uppercase_user = build(:user, :email => user.email.upcase).tap { |u| u.save(:validate => false) }
 

+    # Resetting with GET should fail
+    assert_no_difference "ActionMailer::Base.deliveries.size" do
+      perform_enqueued_jobs do
+        get user_forgot_password_path, :params => { :email => user.email }
+      end
+    end
+    assert_response :success
+    assert_template :lost_password
+
+    # Resetting with POST should work

     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       perform_enqueued_jobs do
         post user_forgot_password_path, :params => { :email => user.email }
       end
     end
     assert_response :redirect
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       perform_enqueued_jobs do
         post user_forgot_password_path, :params => { :email => user.email }
       end
     end
     assert_response :redirect

-    assert_redirected_to :action => :login
+    assert_redirected_to login_path

     assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count


@@ -833,7 +862,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       end
     end
     assert_response :redirect
       end
     end
     assert_response :redirect

-    assert_redirected_to :action => :login
+    assert_redirected_to login_path

     assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count


@@ -860,7 +889,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       end
     end
     assert_response :redirect
       end
     end
     assert_response :redirect

-    assert_redirected_to :action => :login
+    assert_redirected_to login_path

     assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count


@@ -875,7 +904,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       end
     end
     assert_response :redirect
       end
     end
     assert_response :redirect

-    assert_redirected_to :action => :login
+    assert_redirected_to login_path

     assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count


@@ -931,7 +960,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     # you are not logged in
     get user_account_path(user)
     assert_response :redirect
     # you are not logged in
     get user_account_path(user)
     assert_response :redirect

-    assert_redirected_to :action => "login", :referer => "/user/#{ERB::Util.u(user.display_name)}/account"
+    assert_redirected_to login_path(:referer => "/user/#{ERB::Util.u(user.display_name)}/account")

 
     # Make sure that you are blocked when not logged in as the right user
     session_for(create(:user))
 
     # Make sure that you are blocked when not logged in as the right user
     session_for(create(:user))


@@ -949,15 +978,25 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       assert_equal "/user/#{ERB::Util.u(user.display_name)}/account", form.attr("action").to_s
     end
 
       assert_equal "/user/#{ERB::Util.u(user.display_name)}/account", form.attr("action").to_s
     end
 

+    # Updating the description using GET should fail
+    user.description = "new description"
+    user.preferred_editor = "default"
+    get user_account_path(user), :params => { :user => user.attributes }
+    assert_response :success
+    assert_template :account
+    assert_not_equal user.description, User.find(user.id).description
+

     # Updating the description should work
     user.description = "new description"
     user.preferred_editor = "default"
     post user_account_path(user), :params => { :user => user.attributes }
     # Updating the description should work
     user.description = "new description"
     user.preferred_editor = "default"
     post user_account_path(user), :params => { :user => user.attributes }

+    assert_response :redirect
+    assert_redirected_to user_account_url(user)
+    get user_account_path(user)

     assert_response :success
     assert_template :account
     assert_response :success
     assert_template :account

-    assert_select "div#errorExplanation", false

     assert_select ".notice", /^User information updated successfully/
     assert_select ".notice", /^User information updated successfully/

-    assert_select "form#accountForm > fieldset > div.standard-form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description
+    assert_select "form#accountForm > div.form-group > div#user_description_container > div#user_description_content > textarea#user_description", user.description

 
     # Changing to a invalid editor should fail
     user.preferred_editor = "unknown"
 
     # Changing to a invalid editor should fail
     user.preferred_editor = "unknown"


@@ -965,51 +1004,61 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template :account
     assert_select ".notice", false
     assert_response :success
     assert_template :account
     assert_select ".notice", false

-    assert_select "div#errorExplanation"
-    assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected]", false
+    assert_select "form#accountForm > div.form-group > select#user_preferred_editor > option[selected]", false

 
     # Changing to a valid editor should work
     user.preferred_editor = "id"
     post user_account_path(user), :params => { :user => user.attributes }
 
     # Changing to a valid editor should work
     user.preferred_editor = "id"
     post user_account_path(user), :params => { :user => user.attributes }

+    assert_response :redirect
+    assert_redirected_to user_account_url(user)
+    get user_account_path(user)

     assert_response :success
     assert_template :account
     assert_response :success
     assert_template :account

-    assert_select "div#errorExplanation", false

     assert_select ".notice", /^User information updated successfully/
     assert_select ".notice", /^User information updated successfully/

-    assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected][value=?]", "id"
+    assert_select "form#accountForm > div.form-group > select#user_preferred_editor > option[selected][value=?]", "id"

 
     # Changing to the default editor should work
     user.preferred_editor = "default"
     post user_account_path(user), :params => { :user => user.attributes }
 
     # Changing to the default editor should work
     user.preferred_editor = "default"
     post user_account_path(user), :params => { :user => user.attributes }

+    assert_response :redirect
+    assert_redirected_to user_account_url(user)
+    get user_account_path(user)

     assert_response :success
     assert_template :account
     assert_response :success
     assert_template :account

-    assert_select "div#errorExplanation", false

     assert_select ".notice", /^User information updated successfully/
     assert_select ".notice", /^User information updated successfully/

-    assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected]", false
+    assert_select "form#accountForm > div.form-group > select#user_preferred_editor > option[selected]", false

 
     # Changing to an uploaded image should work
     image = Rack::Test::UploadedFile.new("test/gpx/fixtures/a.gif", "image/gif")
     post user_account_path(user), :params => { :avatar_action => "new", :user => user.attributes.merge(:avatar => image) }
 
     # Changing to an uploaded image should work
     image = Rack::Test::UploadedFile.new("test/gpx/fixtures/a.gif", "image/gif")
     post user_account_path(user), :params => { :avatar_action => "new", :user => user.attributes.merge(:avatar => image) }

+    assert_response :redirect
+    assert_redirected_to user_account_url(user)
+    get user_account_path(user)

     assert_response :success
     assert_template :account
     assert_response :success
     assert_template :account

-    assert_select "div#errorExplanation", false

     assert_select ".notice", /^User information updated successfully/
     assert_select ".notice", /^User information updated successfully/

-    assert_select "form#accountForm > fieldset > div.standard-form-row.accountImage input[name=avatar_action][checked][value=?]", "keep"
+    assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-check > input[name=avatar_action][checked][value=?]", "keep"

 
     # Changing to a gravatar image should work
     post user_account_path(user), :params => { :avatar_action => "gravatar", :user => user.attributes }
 
     # Changing to a gravatar image should work
     post user_account_path(user), :params => { :avatar_action => "gravatar", :user => user.attributes }

+    assert_response :redirect
+    assert_redirected_to user_account_url(user)
+    get user_account_path(user)

     assert_response :success
     assert_template :account
     assert_response :success
     assert_template :account

-    assert_select "div#errorExplanation", false

     assert_select ".notice", /^User information updated successfully/
     assert_select ".notice", /^User information updated successfully/

-    assert_select "form#accountForm > fieldset > div.standard-form-row.accountImage input[name=avatar_action][checked][value=?]", "gravatar"
+    assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-group > div.form-check > input[name=avatar_action][checked][value=?]", "gravatar"

 
     # Removing the image should work
     post user_account_path(user), :params => { :avatar_action => "delete", :user => user.attributes }
 
     # Removing the image should work
     post user_account_path(user), :params => { :avatar_action => "delete", :user => user.attributes }

+    assert_response :redirect
+    assert_redirected_to user_account_url(user)
+    get user_account_path(user)

     assert_response :success
     assert_template :account
     assert_response :success
     assert_template :account

-    assert_select "div#errorExplanation", false

     assert_select ".notice", /^User information updated successfully/
     assert_select ".notice", /^User information updated successfully/

-    assert_select "form#accountForm > fieldset > div.standard-form-row.accountImage input[name=avatar_action][checked]", false
+    assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-check > input[name=avatar_action][checked]", false
+    assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-group > div.form-check > input[name=avatar_action][checked]", false

 
     # Adding external authentication should redirect to the auth provider
     post user_account_path(user), :params => { :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") }
 
     # Adding external authentication should redirect to the auth provider
     post user_account_path(user), :params => { :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") }


@@ -1022,8 +1071,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template :account
     assert_select ".notice", false
     assert_response :success
     assert_template :account
     assert_select ".notice", false

-    assert_select "div#errorExplanation"
-    assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
+    assert_select "form#accountForm > div.form-group > input.is-invalid#user_display_name"

 
     # Changing name to one that exists should fail, regardless of case
     new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name.upcase)
 
     # Changing name to one that exists should fail, regardless of case
     new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name.upcase)


@@ -1031,17 +1079,18 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template :account
     assert_select ".notice", false
     assert_response :success
     assert_template :account
     assert_select ".notice", false

-    assert_select "div#errorExplanation"
-    assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
+    assert_select "form#accountForm > div.form-group > input.is-invalid#user_display_name"

 
     # Changing name to one that doesn't exist should work
     new_attributes = user.attributes.dup.merge(:display_name => "new tester")
     post user_account_path(user), :params => { :user => new_attributes }
 
     # Changing name to one that doesn't exist should work
     new_attributes = user.attributes.dup.merge(:display_name => "new tester")
     post user_account_path(user), :params => { :user => new_attributes }

+    assert_response :redirect
+    assert_redirected_to user_account_url(:display_name => "new tester")
+    get user_account_path(:display_name => "new tester")

     assert_response :success
     assert_template :account
     assert_response :success
     assert_template :account

-    assert_select "div#errorExplanation", false

     assert_select ".notice", /^User information updated successfully/
     assert_select ".notice", /^User information updated successfully/

-    assert_select "form#accountForm > fieldset > div.standard-form-row > input#user_display_name[value=?]", "new tester"
+    assert_select "form#accountForm > div.form-group > input#user_display_name[value=?]", "new tester"

 
     # Record the change of name
     user.display_name = "new tester"
 
     # Record the change of name
     user.display_name = "new tester"


@@ -1056,8 +1105,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template :account
     assert_select ".notice", false
     assert_response :success
     assert_template :account
     assert_select ".notice", false

-    assert_select "div#errorExplanation"
-    assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_new_email"
+    assert_select "form#accountForm > div.form-group > input.is-invalid#user_new_email"

 
     # Changing email to one that exists should fail, regardless of case
     user.new_email = create(:user).email.upcase
 
     # Changing email to one that exists should fail, regardless of case
     user.new_email = create(:user).email.upcase


@@ -1069,8 +1117,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template :account
     assert_select ".notice", false
     assert_response :success
     assert_template :account
     assert_select ".notice", false

-    assert_select "div#errorExplanation"
-    assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_new_email"
+    assert_select "form#accountForm > div.form-group > input.is-invalid#user_new_email"

 
     # Changing email to one that doesn't exist should work
     user.new_email = "new_tester@example.com"
 
     # Changing email to one that doesn't exist should work
     user.new_email = "new_tester@example.com"


@@ -1079,11 +1126,13 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
         post user_account_path(user), :params => { :user => user.attributes }
       end
     end
         post user_account_path(user), :params => { :user => user.attributes }
       end
     end

+    assert_response :redirect
+    assert_redirected_to user_account_url(user)
+    get user_account_path(user)

     assert_response :success
     assert_template :account
     assert_response :success
     assert_template :account

-    assert_select "div#errorExplanation", false

     assert_select ".notice", /^User information updated successfully/
     assert_select ".notice", /^User information updated successfully/

-    assert_select "form#accountForm > fieldset > div.standard-form-row > input#user_new_email[value=?]", user.new_email
+    assert_select "form#accountForm > div.form-group > input#user_new_email[value=?]", user.new_email

     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal user.new_email, email.to.first
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal user.new_email, email.to.first


@@ -1287,7 +1336,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     # Shouldn't work when not logged in
     get users_path
     assert_response :redirect
     # Shouldn't work when not logged in
     get users_path
     assert_response :redirect

-    assert_redirected_to :action => :login, :referer => users_path
+    assert_redirected_to login_path(:referer => users_path)

 
     session_for(user)
 
 
     session_for(user)