Remove conditional for polyline layer

[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 bffcfe5bde6f0b11c58d0bd39d25dc9181668e6f..c21f820469b42844242ce4cebf76dc8b7ea218a8 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -233,7 +233,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 +262,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 +291,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 +320,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 +349,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
@@ -953,6 +953,9 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     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_select "div#errorExplanation", false
@@ -969,17 +972,23 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected]", false
 
     # Changing to a valid editor should work
-    user.preferred_editor = "potlatch2"
+    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_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=?]", "potlatch2"
+    assert_select "form#accountForm > fieldset > div.standard-form-row > 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 }
+    assert_response :redirect
+    assert_redirected_to user_account_url(user)
+    get user_account_path(user)
     assert_response :success
     assert_template :account
     assert_select "div#errorExplanation", false
@@ -989,6 +998,9 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     # 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_select "div#errorExplanation", false
@@ -997,6 +1009,9 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     # 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_select "div#errorExplanation", false
@@ -1005,6 +1020,9 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     # 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_select "div#errorExplanation", false
@@ -1037,6 +1055,9 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     # 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_select "div#errorExplanation", false
@@ -1079,6 +1100,9 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
         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_select "div#errorExplanation", false