Add validation for before/after parameters to pagination concern

[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 a530a6f858a0751623708a34681ec91e23d62e2a..02cc2eb582cbeea9abc91c7f15ac62e41f617e83 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -69,7 +69,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
   # The user creation page loads
   def test_new_view
     get user_new_path
   # The user creation page loads
   def test_new_view
     get user_new_path

-    assert_response :redirect

     assert_redirected_to user_new_path(:cookie_test => "true")
 
     get user_new_path, :params => { :cookie_test => "true" }
     assert_redirected_to user_new_path(:cookie_test => "true")
 
     get user_new_path, :params => { :cookie_test => "true" }


@@ -98,11 +97,9 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     session_for(create(:user))
 
     get user_new_path
     session_for(create(:user))
 
     get user_new_path

-    assert_response :redirect

     assert_redirected_to root_path
 
     get user_new_path, :params => { :referer => "/test" }
     assert_redirected_to root_path
 
     get user_new_path, :params => { :referer => "/test" }

-    assert_response :redirect

     assert_redirected_to "/test"
   end
 
     assert_redirected_to "/test"
   end
 


@@ -346,7 +343,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     session_for(user)
 
     get user_terms_path
     session_for(user)
 
     get user_terms_path

-    assert_response :redirect

     assert_redirected_to edit_account_path
   end
 
     assert_redirected_to edit_account_path
   end
 


@@ -360,7 +356,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_template :terms
 
     post user_save_path, :params => { :user => { :consider_pd => true }, :read_ct => 1, :read_tou => 1 }
     assert_template :terms
 
     post user_save_path, :params => { :user => { :consider_pd => true }, :read_ct => 1, :read_tou => 1 }

-    assert_response :redirect

     assert_redirected_to edit_account_path
     assert_equal "Thanks for accepting the new contributor terms!", flash[:notice]
 
     assert_redirected_to edit_account_path
     assert_equal "Thanks for accepting the new contributor terms!", flash[:notice]
 


@@ -381,7 +376,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_template :terms
 
     post user_save_path, :params => { :user => { :consider_pd => true }, :referer => "/test", :read_ct => 1, :read_tou => 1 }
     assert_template :terms
 
     post user_save_path, :params => { :user => { :consider_pd => true }, :referer => "/test", :read_ct => 1, :read_tou => 1 }

-    assert_response :redirect

     assert_redirected_to "/test"
     assert_equal "Thanks for accepting the new contributor terms!", flash[:notice]
 
     assert_redirected_to "/test"
     assert_equal "Thanks for accepting the new contributor terms!", flash[:notice]
 


@@ -399,7 +393,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     session_for(user)
 
     get edit_account_path
     session_for(user)
 
     get edit_account_path

-    assert_response :redirect

     assert_redirected_to :controller => :users, :action => :terms, :referer => "/account/edit"
   end
 
     assert_redirected_to :controller => :users, :action => :terms, :referer => "/account/edit"
   end
 


@@ -415,7 +408,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     post user_go_public_path
 
 
     post user_go_public_path
 

-    assert_response :redirect

     assert_redirected_to edit_account_path
     assert User.find(user.id).data_public
   end
     assert_redirected_to edit_account_path
     assert User.find(user.id).data_public
   end


@@ -424,7 +416,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
   # information for the user
   def test_show
     # Test a non-existent user
   # information for the user
   def test_show
     # Test a non-existent user

-    get user_path(:display_name => "unknown")
+    get user_path("unknown")

     assert_response :not_found
 
     # Test a normal user
     assert_response :not_found
 
     # Test a normal user


@@ -552,13 +544,11 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     # Now try as a normal user
     session_for(user)
     post set_status_user_path(user), :params => { :event => "confirm" }
     # Now try as a normal user
     session_for(user)
     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))
     post set_status_user_path(user), :params => { :event => "confirm" }
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Finally try as an administrator
     session_for(create(:administrator_user))
     post set_status_user_path(user), :params => { :event => "confirm" }

-    assert_response :redirect

     assert_redirected_to :action => :show, :display_name => user.display_name
     assert_equal "confirmed", User.find(user.id).status
   end
     assert_redirected_to :action => :show, :display_name => user.display_name
     assert_equal "confirmed", User.find(user.id).status
   end


@@ -573,13 +563,11 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     # Now try as a normal user
     session_for(user)
     delete user_path(user)
     # Now try as a normal user
     session_for(user)
     delete user_path(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)
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Finally try as an administrator
     session_for(create(:administrator_user))
     delete user_path(user)

-    assert_response :redirect

     assert_redirected_to :action => :show, :display_name => user.display_name
 
     # Check that the user was deleted properly
     assert_redirected_to :action => :show, :display_name => user.display_name
 
     # Check that the user was deleted properly


@@ -609,21 +597,18 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     # Shouldn't work when not logged in
     get users_path
 
     # Shouldn't work when not logged in
     get users_path

-    assert_response :redirect

     assert_redirected_to login_path(:referer => users_path)
 
     session_for(user)
 
     # Shouldn't work when logged in as a normal user
     get users_path
     assert_redirected_to login_path(:referer => users_path)
 
     session_for(user)
 
     # Shouldn't work when logged in as a normal user
     get users_path

-    assert_response :redirect

     assert_redirected_to :controller => :errors, :action => :forbidden
 
     session_for(moderator_user)
 
     # Shouldn't work when logged in as a moderator
     get users_path
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     session_for(moderator_user)
 
     # Shouldn't work when logged in as a moderator
     get users_path

-    assert_response :redirect

     assert_redirected_to :controller => :errors, :action => :forbidden
 
     session_for(administrator_user)
     assert_redirected_to :controller => :errors, :action => :forbidden
 
     session_for(administrator_user)


@@ -633,19 +618,19 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     get users_path
     assert_response :success
     assert_template :index
     get users_path
     assert_response :success
     assert_template :index

-    assert_select "table#user_list tr", :count => 7 + 1
+    assert_select "table#user_list tbody tr", :count => 7

 
     # Should be able to limit by status
     get users_path, :params => { :status => "suspended" }
     assert_response :success
     assert_template :index
 
     # Should be able to limit by status
     get users_path, :params => { :status => "suspended" }
     assert_response :success
     assert_template :index

-    assert_select "table#user_list tr", :count => 1 + 1
+    assert_select "table#user_list tbody tr", :count => 1

 
     # Should be able to limit by IP address
     get users_path, :params => { :ip => "1.2.3.4" }
     assert_response :success
     assert_template :index
 
     # Should be able to limit by IP address
     get users_path, :params => { :ip => "1.2.3.4" }
     assert_response :success
     assert_template :index

-    assert_select "table#user_list tr", :count => 1 + 1
+    assert_select "table#user_list tbody tr", :count => 1

   end
 
   def test_index_get_paginated
   end
 
   def test_index_get_paginated


@@ -659,23 +644,56 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     # 100 examples, an administrator, and a granter for the admin.
     assert_equal 102, User.count
 
     # 100 examples, an administrator, and a granter for the admin.
     assert_equal 102, User.count

+    next_path = users_path

 
 

-    get users_path
+    get next_path

     assert_response :success
     assert_template :index
     assert_response :success
     assert_template :index

-    assert_select "table#user_list tr", :count => 51
+    assert_select "table#user_list tbody tr", :count => 50
+    check_no_page_link "Newer Users"
+    next_path = check_page_link "Older Users"

 
 

-    get users_path, :params => { :page => 2 }
+    get next_path

     assert_response :success
     assert_template :index
     assert_response :success
     assert_template :index

-    assert_select "table#user_list tr", :count => 51
+    assert_select "table#user_list tbody tr", :count => 50
+    check_page_link "Newer Users"
+    next_path = check_page_link "Older Users"

 
 

-    get users_path, :params => { :page => 3 }
+    get next_path

     assert_response :success
     assert_template :index
     assert_response :success
     assert_template :index

-    assert_select "table#user_list tr", :count => 3
+    assert_select "table#user_list tbody tr", :count => 2
+    check_page_link "Newer Users"
+    check_no_page_link "Older Users"
+  end
+
+  def test_index_get_invalid_paginated
+    session_for(create(:administrator_user))
+
+    %w[-1 0 fred].each do |id|
+      get users_path(:before => id)
+      assert_redirected_to :controller => :errors, :action => :bad_request
+
+      get users_path(:after => id)
+      assert_redirected_to :controller => :errors, :action => :bad_request
+    end

   end
 
   end
 

+  private
+
+  def check_no_page_link(name)
+    assert_select "a.page-link", { :text => /#{Regexp.quote(name)}/, :count => 0 }, "unexpected #{name} page link"
+  end
+
+  def check_page_link(name)
+    assert_select "a.page-link", { :text => /#{Regexp.quote(name)}/ }, "missing #{name} page link" do |buttons|
+      return buttons.first.attributes["href"].value
+    end
+  end
+
+  public
+

   def test_index_post_confirm
     inactive_user = create(:user, :pending)
     suspended_user = create(:user, :suspended)
   def test_index_post_confirm
     inactive_user = create(:user, :pending)
     suspended_user = create(:user, :suspended)


@@ -695,7 +713,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_no_difference "User.active.count" do
       post users_path, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
     end
     assert_no_difference "User.active.count" do
       post users_path, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
     end

-    assert_response :redirect

     assert_redirected_to :controller => :errors, :action => :forbidden
     assert_equal "pending", inactive_user.reload.status
     assert_equal "suspended", suspended_user.reload.status
     assert_redirected_to :controller => :errors, :action => :forbidden
     assert_equal "pending", inactive_user.reload.status
     assert_equal "suspended", suspended_user.reload.status


@@ -706,7 +723,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_no_difference "User.active.count" do
       post users_path, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
     end
     assert_no_difference "User.active.count" do
       post users_path, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
     end

-    assert_response :redirect

     assert_redirected_to :controller => :errors, :action => :forbidden
     assert_equal "pending", inactive_user.reload.status
     assert_equal "suspended", suspended_user.reload.status
     assert_redirected_to :controller => :errors, :action => :forbidden
     assert_equal "pending", inactive_user.reload.status
     assert_equal "suspended", suspended_user.reload.status


@@ -717,7 +733,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_difference "User.active.count", 2 do
       post users_path, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
     end
     assert_difference "User.active.count", 2 do
       post users_path, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
     end

-    assert_response :redirect

     assert_redirected_to :action => :index
     assert_equal "confirmed", inactive_user.reload.status
     assert_equal "confirmed", suspended_user.reload.status
     assert_redirected_to :action => :index
     assert_equal "confirmed", inactive_user.reload.status
     assert_equal "confirmed", suspended_user.reload.status


@@ -742,7 +757,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_no_difference "User.active.count" do
       post users_path, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
     end
     assert_no_difference "User.active.count" do
       post users_path, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
     end

-    assert_response :redirect

     assert_redirected_to :controller => :errors, :action => :forbidden
     assert_equal "active", normal_user.reload.status
     assert_equal "confirmed", confirmed_user.reload.status
     assert_redirected_to :controller => :errors, :action => :forbidden
     assert_equal "active", normal_user.reload.status
     assert_equal "confirmed", confirmed_user.reload.status


@@ -753,7 +767,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_no_difference "User.active.count" do
       post users_path, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
     end
     assert_no_difference "User.active.count" do
       post users_path, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
     end

-    assert_response :redirect

     assert_redirected_to :controller => :errors, :action => :forbidden
     assert_equal "active", normal_user.reload.status
     assert_equal "confirmed", confirmed_user.reload.status
     assert_redirected_to :controller => :errors, :action => :forbidden
     assert_equal "active", normal_user.reload.status
     assert_equal "confirmed", confirmed_user.reload.status


@@ -764,7 +777,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     assert_difference "User.active.count", -2 do
       post users_path, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
     end
     assert_difference "User.active.count", -2 do
       post users_path, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
     end

-    assert_response :redirect

     assert_redirected_to :action => :index
     assert_equal "deleted", normal_user.reload.status
     assert_equal "deleted", confirmed_user.reload.status
     assert_redirected_to :action => :index
     assert_equal "deleted", normal_user.reload.status
     assert_equal "deleted", confirmed_user.reload.status


@@ -772,15 +784,12 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
   def test_auth_failure_callback
     get auth_failure_path
 
   def test_auth_failure_callback
     get auth_failure_path

-    assert_response :redirect

     assert_redirected_to login_path
 
     get auth_failure_path, :params => { :origin => "/" }
     assert_redirected_to login_path
 
     get auth_failure_path, :params => { :origin => "/" }

-    assert_response :redirect

     assert_redirected_to root_path
 
     get auth_failure_path, :params => { :origin => "http://www.google.com" }
     assert_redirected_to root_path
 
     get auth_failure_path, :params => { :origin => "http://www.google.com" }

-    assert_response :redirect

     assert_redirected_to login_path
   end
 end
     assert_redirected_to login_path
   end
 end