Strip away class attributes from sanitized outputs

[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 12a804bc56cef94f074f482601cc2679d67bc739..6cefcaa93b47ef052184637e3d13e3f757eca52e 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -4,32 +4,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
   ##
   # test all routes which lead to this controller
   def test_routes
-    assert_routing(
-      { :path => "/login", :method => :get },
-      { :controller => "users", :action => "login" }
-    )
-    assert_routing(
-      { :path => "/login", :method => :post },
-      { :controller => "users", :action => "login" }
-    )
-    assert_recognizes(
-      { :controller => "users", :action => "login", :format => "html" },
-      { :path => "/login.html", :method => :get }
-    )
-
-    assert_routing(
-      { :path => "/logout", :method => :get },
-      { :controller => "users", :action => "logout" }
-    )
-    assert_routing(
-      { :path => "/logout", :method => :post },
-      { :controller => "users", :action => "logout" }
-    )
-    assert_recognizes(
-      { :controller => "users", :action => "logout", :format => "html" },
-      { :path => "/logout.html", :method => :get }
-    )
-
     assert_routing(
       { :path => "/user/new", :method => :get },
       { :controller => "users", :action => "new" }
@@ -233,7 +207,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     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
@@ -262,7 +236,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     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
@@ -291,7 +265,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     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
@@ -320,7 +294,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     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
@@ -349,7 +323,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     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
@@ -406,44 +380,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     ActionMailer::Base.deliveries.clear
   end
 
-  def test_logout_without_referer
-    post logout_path
-    assert_response :redirect
-    assert_redirected_to root_path
-  end
-
-  def test_logout_with_referer
-    post logout_path, :params => { :referer => "/test" }
-    assert_response :redirect
-    assert_redirected_to "/test"
-  end
-
-  def test_logout_fallback_without_referer
-    get logout_path
-    assert_response :success
-    assert_template :logout
-    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_select "input[name=referer][value=?]", "/test"
-  end
-
-  def test_logout_removes_session_token
-    user = build(:user, :pending)
-    post user_new_path, :params => { :user => user.attributes }
-    post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
-
-    assert_difference "User.find_by(:email => user.email).tokens.count", -1 do
-      post logout_path
-    end
-    assert_response :redirect
-    assert_redirected_to root_path
-  end
-
   def test_confirm_get
     user = build(:user, :pending)
     post user_new_path, :params => { :user => user.attributes }
@@ -583,7 +519,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 }
-    assert_redirected_to :action => "login"
+    assert_redirected_to login_path
     assert_match(/already been confirmed/, flash[:error])
   end
 
@@ -812,13 +748,23 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     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_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
@@ -833,7 +779,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       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
@@ -860,7 +806,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       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
@@ -875,7 +821,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       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
@@ -931,7 +877,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     # 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))
@@ -949,6 +895,14 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       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"
@@ -958,9 +912,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     get user_account_path(user)
     assert_response :success
     assert_template :account
-    assert_select "div#errorExplanation", false
     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"
@@ -968,8 +921,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     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"
@@ -979,9 +931,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     get user_account_path(user)
     assert_response :success
     assert_template :account
-    assert_select "div#errorExplanation", false
     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"
@@ -991,9 +942,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     get user_account_path(user)
     assert_response :success
     assert_template :account
-    assert_select "div#errorExplanation", false
     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")
@@ -1003,9 +953,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     get user_account_path(user)
     assert_response :success
     assert_template :account
-    assert_select "div#errorExplanation", false
     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 }
@@ -1014,9 +963,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     get user_account_path(user)
     assert_response :success
     assert_template :account
-    assert_select "div#errorExplanation", false
     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 }
@@ -1025,9 +973,9 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     get user_account_path(user)
     assert_response :success
     assert_template :account
-    assert_select "div#errorExplanation", false
     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") }
@@ -1040,8 +988,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     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)
@@ -1049,8 +996,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     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")
@@ -1060,9 +1006,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     get user_account_path(:display_name => "new tester")
     assert_response :success
     assert_template :account
-    assert_select "div#errorExplanation", false
     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"
@@ -1077,8 +1022,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     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
@@ -1090,8 +1034,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     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"
@@ -1105,9 +1048,8 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     get user_account_path(user)
     assert_response :success
     assert_template :account
-    assert_select "div#errorExplanation", false
     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
@@ -1311,7 +1253,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     # 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)