Update bounded landuses

[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 e979e5f6db69169ceb091c99fa8d257744f2eeca..402129d326e19908ba57feaf74c5f18a48acf9db 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


@@ -495,6 +495,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0
       assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0
       assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 0
       assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0
       assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0
       assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 0

+      assert_select "a[href='/api/0.6/user/#{ERB::Util.u(user.id)}']", 0

     end
 
     # Login as a moderator
     end
 
     # Login as a moderator


@@ -512,6 +513,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0
       assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0
       assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 1
       assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0
       assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0
       assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 1

+      assert_select "a[href='/api/0.6/user/#{ERB::Util.u(user.id)}']", 1

     end
   end
 
     end
   end
 


@@ -529,7 +531,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     get user_path(seen_user)
     assert_response :success
 
     get user_path(seen_user)
     assert_response :success

-    # put @response.body

     assert_select "div.content-heading" do
       assert_select "dt", :count => 1, :text => /Contributor terms/
       assert_select "dd", /Declined/
     assert_select "div.content-heading" do
       assert_select "dt", :count => 1, :text => /Contributor terms/
       assert_select "dd", /Declined/


@@ -547,21 +548,21 @@ 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
   end
 
   def test_destroy