1 files changed, 29 insertions, 42 deletions

diff --git a/spec/support/matchers.rb b/spec/support/matchers.rb
index 52b11bd6323..a2f853e3e70 100644
--- a/spec/support/matchers.rb
+++ b/spec/support/matchers.rb
@@ -1,30 +1,43 @@
 RSpec::Matchers.define :be_valid_commit do
   match do |actual|
-    actual != nil
-    actual.id == ValidCommit::ID
-    actual.message == ValidCommit::MESSAGE
-    actual.author_name == ValidCommit::AUTHOR_FULL_NAME
+    actual &&
+      actual.id == ValidCommit::ID &&
+      actual.message == ValidCommit::MESSAGE &&
+      actual.author_name == ValidCommit::AUTHOR_FULL_NAME
   end
 end
 
+def emulate_user(user)
+  user = case user
+         when :user then create(:user)
+         when :visitor then nil
+         when :admin then create(:admin)
+         else user
+         end
+  login_with(user) if user
+end
+
 RSpec::Matchers.define :be_allowed_for do |user|
   match do |url|
-    include UrlAccess
-    url_allowed?(user, url)
+    emulate_user(user)
+    visit url
+    status_code != 404 && current_path != new_user_session_path
   end
 end
 
 RSpec::Matchers.define :be_denied_for do |user|
   match do |url|
-    include UrlAccess
-    url_denied?(user, url)
+    emulate_user(user)
+    visit url
+    status_code == 404 || current_path == new_user_session_path
   end
 end
 
-RSpec::Matchers.define :be_404_for do |user|
+RSpec::Matchers.define :be_not_found_for do |user|
   match do |url|
-    include UrlAccess
-    url_404?(user, url)
+    emulate_user(user)
+    visit url
+    status_code == 404
   end
 end
 
@@ -33,44 +46,18 @@ RSpec::Matchers.define :include_module do |expected|
     described_class.included_modules.include?(expected)
   end
 
-  failure_message_for_should do
-    "expected #{described_class} to include the #{expected} module"
+  description do
+    "includes the #{expected} module"
   end
-end
 
-module UrlAccess
-  def url_allowed?(user, url)
-    emulate_user(user)
-    visit url
-    (status_code != 404 && current_path != new_user_session_path)
-  end
-
-  def url_denied?(user, url)
-    emulate_user(user)
-    visit url
-    (status_code == 404 || current_path == new_user_session_path)
-  end
-
-  def url_404?(user, url)
-    emulate_user(user)
-    visit url
-    status_code == 404
-  end
-
-  def emulate_user(user)
-    user = case user
-           when :user then create(:user)
-           when :visitor then nil
-           when :admin then create(:admin)
-           else user
-           end
-    login_with(user) if user
+  failure_message do
+    "expected #{described_class} to include the #{expected} module"
   end
 end
 
 # Extend shoulda-matchers
 module Shoulda::Matchers::ActiveModel
-  class EnsureLengthOfMatcher
+  class ValidateLengthOfMatcher
     # Shortcut for is_at_least and is_at_most
     def is_within(range)
       is_at_least(range.min) && is_at_most(range.max)