Remove ignoring of nearby column

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

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index 20002917680d70da8ceb0ad3fb89bca48acba4bc..08b1acb3460d1f7a7135d4bb0980771a2b887a15 100644 (file)
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -5,21 +5,21 @@ class IssuesTest < ApplicationSystemTestCase
 
   def test_view_issues_not_logged_in
     visit issues_path
 
   def test_view_issues_not_logged_in
     visit issues_path

-    assert page.has_content?(I18n.t("user.login.title"))
+    assert page.has_content?(I18n.t("users.login.title"))

   end
 
   def test_view_issues_normal_user
     sign_in_as(create(:user))
 
     visit issues_path
   end
 
   def test_view_issues_normal_user
     sign_in_as(create(:user))
 
     visit issues_path

-    assert page.has_content?(I18n.t("application.require_moderator_or_admin.not_a_moderator_or_admin"))
+    assert page.has_content?("Forbidden")

   end
 
   def test_view_no_issues
     sign_in_as(create(:moderator_user))
 
     visit issues_path
   end
 
   def test_view_no_issues
     sign_in_as(create(:moderator_user))
 
     visit issues_path

-    assert page.has_content?(I18n.t(".issues.index.issues_not_found"))
+    assert page.has_content?(I18n.t("issues.index.issues_not_found"))

   end
 
   def test_view_issues
   end
 
   def test_view_issues


@@ -33,7 +33,7 @@ class IssuesTest < ApplicationSystemTestCase
   def test_view_issues_with_no_reported_user
     sign_in_as(create(:moderator_user))
     anonymous_note = create(:note_with_comments)
   def test_view_issues_with_no_reported_user
     sign_in_as(create(:moderator_user))
     anonymous_note = create(:note_with_comments)

-    issue = create(:issue, :reportable => anonymous_note)
+    issue = create(:issue, :reportable => anonymous_note, :assigned_role => "moderator")

 
     visit issues_path
     assert page.has_content?(reportable_title(anonymous_note))
 
     visit issues_path
     assert page.has_content?(reportable_title(anonymous_note))


@@ -53,19 +53,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 page.has_content?(I18n.t(".issues.index.issues_not_found"))
+    assert_not page.has_content?(I18n.t("issues.index.user_not_found"))
+    assert page.has_content?(I18n.t("issues.index.issues_not_found"))

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

-    assert page.has_content?(I18n.t(".issues.index.user_not_found"))
+    assert page.has_content?(I18n.t("issues.index.user_not_found"))
+    assert page.has_content?(I18n.t("issues.index.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 !page.has_content?(I18n.t(".issues.index.issues_not_found"))
+    assert_not page.has_content?(I18n.t("issues.index.user_not_found"))
+    assert_not page.has_content?(I18n.t("issues.index.issues_not_found"))

   end
 
   def test_commenting
   end
 
   def test_commenting


@@ -75,8 +78,8 @@ class IssuesTest < ApplicationSystemTestCase
     visit issue_path(issue)
 
     fill_in :issue_comment_body, :with => "test comment"
     visit issue_path(issue)
 
     fill_in :issue_comment_body, :with => "test comment"

-    click_on "Submit"
-    assert page.has_content?(I18n.t(".issues.comment.comment_created"))
+    click_on "Add Comment"
+    assert page.has_content?(I18n.t("issue_comments.create.comment_created"))

     assert page.has_content?("test comment")
 
     issue.reload
     assert page.has_content?("test comment")
 
     issue.reload


@@ -92,7 +95,7 @@ class IssuesTest < ApplicationSystemTestCase
 
     fill_in :issue_comment_body, :with => "reassigning to moderators"
     check :reassign
 
     fill_in :issue_comment_body, :with => "reassigning to moderators"
     check :reassign

-    click_on "Submit"
+    click_on "Add Comment"

 
     issue.reload
     assert_equal "moderator", issue.assigned_role
 
     issue.reload
     assert_equal "moderator", issue.assigned_role


@@ -110,7 +113,7 @@ class IssuesTest < ApplicationSystemTestCase
 
     visit issues_path
 
 
     visit issues_path
 

-    assert page.has_link?(I18n.t(".issues.index.reports_count", :count => issue1.reports_count), :href => issue_path(issue1))
-    assert page.has_link?(I18n.t(".issues.index.reports_count", :count => issue2.reports_count), :href => issue_path(issue2))
+    assert page.has_link?(I18n.t("issues.index.reports_count", :count => issue1.reports_count), :href => issue_path(issue1))
+    assert page.has_link?(I18n.t("issues.index.reports_count", :count => issue2.reports_count), :href => issue_path(issue2))

   end
 end
   end
 end