Merge remote-tracking branch 'upstream/pull/3791'

[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 0a9a82f1cb4ce04781e2514580d23a033a7e2d91..634b279a5857ec134a59502cbdef1a37c64a3f86 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -151,7 +151,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     assert_response :success
     assert_template "new"
 
     assert_response :success
     assert_template "new"

-    assert_select "form > div.form-group > input.is-invalid#user_email"
+    assert_select "form > div > input.is-invalid#user_email"

   end
 
   def test_save_duplicate_email
   end
 
   def test_save_duplicate_email


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

-    assert_select "form > div.form-group > input.is-invalid#user_email"
+    assert_select "form > div > input.is-invalid#user_email"

   end
 
   def test_save_duplicate_email_uppercase
   end
 
   def test_save_duplicate_email_uppercase


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

-    assert_select "form > div.form-group > input.is-invalid#user_email"
+    assert_select "form > div > input.is-invalid#user_email"

   end
 
   def test_save_duplicate_name
   end
 
   def test_save_duplicate_name


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

-    assert_select "form > div.form-group > input.is-invalid#user_display_name"
+    assert_select "form > div > input.is-invalid#user_display_name"

   end
 
   def test_save_duplicate_name_uppercase
   end
 
   def test_save_duplicate_name_uppercase


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

-    assert_select "form > div.form-group > input.is-invalid#user_display_name"
+    assert_select "form > div > input.is-invalid#user_display_name"

   end
 
   def test_save_blocked_domain
   end
 
   def test_save_blocked_domain


@@ -547,39 +547,39 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     user = create(:user)
 
     # Try without logging in
     user = create(:user)
 
     # Try without logging in

-    post set_status_user_path(user), :params => { :status => "suspended" }
+    post set_status_user_path(user), :params => { :event => "confirm" }

     assert_response :forbidden
 
     # Now try as a normal user
     session_for(user)
     assert_response :forbidden
 
     # Now try as a normal user
     session_for(user)

-    post set_status_user_path(user), :params => { :status => "suspended" }
+    post set_status_user_path(user), :params => { :event => "confirm" }

     assert_response :redirect
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Finally try as an administrator
     session_for(create(:administrator_user))
     assert_response :redirect
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Finally try as an administrator
     session_for(create(:administrator_user))

-    post set_status_user_path(user), :params => { :status => "suspended" }
+    post set_status_user_path(user), :params => { :event => "confirm" }

     assert_response :redirect
     assert_redirected_to :action => :show, :display_name => user.display_name
     assert_response :redirect
     assert_redirected_to :action => :show, :display_name => user.display_name

-    assert_equal "suspended", User.find(user.id).status
+    assert_equal "confirmed", User.find(user.id).status

   end
 
   def test_destroy
     user = create(:user, :home_lat => 12.1, :home_lon => 12.1, :description => "test")
 
     # Try without logging in
   end
 
   def test_destroy
     user = create(:user, :home_lat => 12.1, :home_lon => 12.1, :description => "test")
 
     # Try without logging in

-    delete user_path(user), :params => { :status => "suspended" }
+    delete user_path(user)

     assert_response :forbidden
 
     # Now try as a normal user
     session_for(user)
     assert_response :forbidden
 
     # Now try as a normal user
     session_for(user)

-    delete user_path(user), :params => { :status => "suspended" }
+    delete user_path(user)

     assert_response :redirect
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Finally try as an administrator
     session_for(create(:administrator_user))
     assert_response :redirect
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Finally try as an administrator
     session_for(create(:administrator_user))

-    delete user_path(user), :params => { :status => "suspended" }
+    delete user_path(user)

     assert_response :redirect
     assert_redirected_to :action => :show, :display_name => user.display_name
 
     assert_response :redirect
     assert_redirected_to :action => :show, :display_name => user.display_name