Use assert_not_predicate instead of assert_not next to assert_predicate

diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb
index a988fc909f7cc3a73ad3417db5ca43958d8c4b01..0dfc01da045f3eccd75be132e69270386cb54103 100644 (file)
--- a/test/controllers/issues_controller_test.rb
+++ b/test/controllers/issues_controller_test.rb
@@ -87,7 +87,7 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
     session_for(create(:administrator_user))
     post resolve_issue_path(:id => issue)
     assert_redirected_to :controller => :errors, :action => :not_found
     session_for(create(:administrator_user))
     post resolve_issue_path(:id => issue)
     assert_redirected_to :controller => :errors, :action => :not_found

-    assert_not issue.reload.resolved?
+    assert_not_predicate issue.reload, :resolved?

 
     # Resolve issue as moderator
     session_for(create(:moderator_user))
 
     # Resolve issue as moderator
     session_for(create(:moderator_user))


@@ -113,7 +113,7 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
     session_for(create(:moderator_user))
     post resolve_issue_path(:id => issue)
     assert_redirected_to :controller => :errors, :action => :not_found
     session_for(create(:moderator_user))
     post resolve_issue_path(:id => issue)
     assert_redirected_to :controller => :errors, :action => :not_found

-    assert_not issue.reload.resolved?
+    assert_not_predicate issue.reload, :resolved?

 
     # Resolve issue as administrator
     session_for(create(:administrator_user))
 
     # Resolve issue as administrator
     session_for(create(:administrator_user))


@@ -139,7 +139,7 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
     session_for(create(:administrator_user))
     post ignore_issue_path(:id => issue)
     assert_redirected_to :controller => :errors, :action => :not_found
     session_for(create(:administrator_user))
     post ignore_issue_path(:id => issue)
     assert_redirected_to :controller => :errors, :action => :not_found

-    assert_not issue.reload.ignored?
+    assert_not_predicate issue.reload, :ignored?

 
     # Ignore issue as moderator
     session_for(create(:moderator_user))
 
     # Ignore issue as moderator
     session_for(create(:moderator_user))


@@ -165,7 +165,7 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
     session_for(create(:moderator_user))
     post ignore_issue_path(:id => issue)
     assert_redirected_to :controller => :errors, :action => :not_found
     session_for(create(:moderator_user))
     post ignore_issue_path(:id => issue)
     assert_redirected_to :controller => :errors, :action => :not_found

-    assert_not issue.reload.ignored?
+    assert_not_predicate issue.reload, :ignored?

 
     # Ignore issue as administrator
     session_for(create(:administrator_user))
 
     # Ignore issue as administrator
     session_for(create(:administrator_user))


@@ -193,7 +193,7 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
     session_for(create(:administrator_user))
     post reopen_issue_path(:id => issue)
     assert_redirected_to :controller => :errors, :action => :not_found
     session_for(create(:administrator_user))
     post reopen_issue_path(:id => issue)
     assert_redirected_to :controller => :errors, :action => :not_found

-    assert_not issue.reload.open?
+    assert_not_predicate issue.reload, :open?

 
     # Reopen issue as moderator
     session_for(create(:moderator_user))
 
     # Reopen issue as moderator
     session_for(create(:moderator_user))


@@ -221,7 +221,7 @@ class IssuesControllerTest < ActionDispatch::IntegrationTest
     session_for(create(:moderator_user))
     post reopen_issue_path(:id => issue)
     assert_redirected_to :controller => :errors, :action => :not_found
     session_for(create(:moderator_user))
     post reopen_issue_path(:id => issue)
     assert_redirected_to :controller => :errors, :action => :not_found

-    assert_not issue.reload.open?
+    assert_not_predicate issue.reload, :open?

 
     # Reopen issue as administrator
     session_for(create(:administrator_user))
 
     # Reopen issue as administrator
     session_for(create(:administrator_user))

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 92e7d419c33c50f7ec91d1899581793ffd72508a..10fd3d97ec9cb533494e72946a049def4c936620 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -111,10 +111,10 @@ class UserTest < ActiveSupport::TestCase
     user = build(:user)
 
     user.display_name = "user_#{existing_user.id}"
     user = build(:user)
 
     user.display_name = "user_#{existing_user.id}"

-    assert_not user.valid?, "user_<id> name is valid for existing user id when it shouldn't be"
+    assert_not_predicate user, :valid?, "user_<id> name is valid for existing user id when it shouldn't be"

 
     user.display_name = "user_#{existing_user.id + 1}"
 
     user.display_name = "user_#{existing_user.id + 1}"

-    assert_not user.valid?, "user_<id> name is valid for new user id when it shouldn't be"
+    assert_not_predicate user, :valid?, "user_<id> name is valid for new user id when it shouldn't be"

   end
 
   def test_display_name_user_id_rename
   end
 
   def test_display_name_user_id_rename


@@ -122,7 +122,7 @@ class UserTest < ActiveSupport::TestCase
     user = create(:user)
 
     user.display_name = "user_#{existing_user.id}"
     user = create(:user)
 
     user.display_name = "user_#{existing_user.id}"

-    assert_not user.valid?, "user_<id> name is valid for existing user id when it shouldn't be"
+    assert_not_predicate user, :valid?, "user_<id> name is valid for existing user id when it shouldn't be"

 
     user.display_name = "user_#{user.id}"
     assert_predicate user, :valid?, "user_<id> name is invalid for own id, when it should be"
 
     user.display_name = "user_#{user.id}"
     assert_predicate user, :valid?, "user_<id> name is invalid for own id, when it should be"