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

[rails.git] / test / system / issues_test.rb

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index 4086a4fe4868c306a55b3bafadd8538fecd97730..4d6d9519bf725215efa722c30632cda810d3863f 100644 (file)
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -19,7 +19,7 @@ class IssuesTest < ApplicationSystemTestCase
     sign_in_as(create(:moderator_user))
 
     visit issues_path
     sign_in_as(create(:moderator_user))
 
     visit issues_path

-    assert_content I18n.t("issues.index.issues_not_found")
+    assert_content I18n.t("issues.page.issues_not_found")

   end
 
   def test_view_issues
   end
 
   def test_view_issues


@@ -81,22 +81,22 @@ class IssuesTest < ApplicationSystemTestCase
     visit issues_path
     fill_in "search_by_user", :with => good_user.display_name
     click_on "Search"
     visit issues_path
     fill_in "search_by_user", :with => good_user.display_name
     click_on "Search"

-    assert_no_content I18n.t("issues.index.user_not_found")
-    assert_content I18n.t("issues.index.issues_not_found")
+    assert_no_content I18n.t("issues.page.user_not_found")
+    assert_content I18n.t("issues.page.issues_not_found")

 
     # User doesn't exist
     visit issues_path
     fill_in "search_by_user", :with => "Nonexistent User"
     click_on "Search"
 
     # User doesn't exist
     visit issues_path
     fill_in "search_by_user", :with => "Nonexistent User"
     click_on "Search"

-    assert_content I18n.t("issues.index.user_not_found")
-    assert_content I18n.t("issues.index.issues_not_found")
+    assert_content I18n.t("issues.page.user_not_found")
+    assert_no_content I18n.t("issues.page.issues_not_found")

 
     # Find Issue against bad_user
     visit issues_path
     fill_in "search_by_user", :with => bad_user.display_name
     click_on "Search"
 
     # Find Issue against bad_user
     visit issues_path
     fill_in "search_by_user", :with => bad_user.display_name
     click_on "Search"

-    assert_no_content I18n.t("issues.index.user_not_found")
-    assert_no_content I18n.t("issues.index.issues_not_found")
+    assert_no_content I18n.t("issues.page.user_not_found")
+    assert_no_content I18n.t("issues.page.issues_not_found")

   end
 
   def test_commenting
   end
 
   def test_commenting


@@ -163,30 +163,45 @@ class IssuesTest < ApplicationSystemTestCase
   end
 
   def test_issues_pagination
   end
 
   def test_issues_pagination

-    1.upto(80).each do
-      user = create(:user)
+    1.upto(8).each do |n|
+      user = create(:user, :display_name => "extra_#{n}")

       create(:issue, :reportable => user, :reported_user => user, :assigned_role => "administrator")
     end
 
     sign_in_as(create(:administrator_user))
 
       create(:issue, :reportable => user, :reported_user => user, :assigned_role => "administrator")
     end
 
     sign_in_as(create(:administrator_user))
 

-    visit issues_path
+    visit issues_path(:limit => 5)

 
     # First Page
 
     # First Page

-    assert_no_content I18n.t("issues.index.user_not_found")
-    assert_no_content I18n.t("issues.index.issues_not_found")
-    assert_css "tr", :count => 51
+    assert_no_content I18n.t("issues.page.user_not_found")
+    assert_no_content I18n.t("issues.page.issues_not_found")
+    4.upto(8).each do |n|
+      assert_content(/extra_#{n}[^\d]/i, :count => 2)
+    end
+    1.upto(3).each do |n|
+      assert_no_content(/extra_#{n}[^\d]/i)
+    end

 
     # Second Page
     click_on I18n.t("issues.page.older_issues")
 
     # Second Page
     click_on I18n.t("issues.page.older_issues")

-    assert_no_content I18n.t("issues.index.user_not_found")
-    assert_no_content I18n.t("issues.index.issues_not_found")
-    assert_css "tr", :count => 31, :wait => 1
+    assert_no_content I18n.t("issues.page.user_not_found")
+    assert_no_content I18n.t("issues.page.issues_not_found")
+    4.upto(8).each do |n|
+      assert_no_content(/extra_#{n}[^\d]/i)
+    end
+    1.upto(3).each do |n|
+      assert_content(/extra_#{n}[^\d]/i, :count => 2)
+    end

 
     # Back to First Page
     click_on I18n.t("issues.page.newer_issues")
 
     # Back to First Page
     click_on I18n.t("issues.page.newer_issues")

-    assert_no_content I18n.t("issues.index.user_not_found")
-    assert_no_content I18n.t("issues.index.issues_not_found")
-    assert_css "tr", :count => 51, :wait => 1
+    assert_no_content I18n.t("issues.page.user_not_found")
+    assert_no_content I18n.t("issues.page.issues_not_found")
+    4.upto(8).each do |n|
+      assert_content(/extra_#{n}[^\d]/i, :count => 2)
+    end
+    1.upto(3).each do |n|
+      assert_no_content(/extra_#{n}[^\d]/i)
+    end

   end
 end
   end
 end