Moved include of Private helpers from AR::Macros to general Macros

thoughtbot · Sep 1, 2008 · 1d1c5e1 · 1d1c5e1
1 parent 424c484
commit 1d1c5e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lib/shoulda.rb b/lib/shoulda.rb
@@ -13,7 +13,6 @@ class TestCase
   end
 end
 
-require 'shoulda/private_helpers'
 require 'shoulda/general'
 require 'shoulda/active_record'
 require 'shoulda/controller'

diff --git a/lib/shoulda/active_record/macros.rb b/lib/shoulda/active_record/macros.rb
@@ -679,9 +679,6 @@ def should_have_named_scope(scope_call, *args)
           end
         end
 
-        private
-
-        include ThoughtBot::Shoulda::Private
       end
     end
   end

diff --git a/lib/shoulda/macros.rb b/lib/shoulda/macros.rb
@@ -1,3 +1,5 @@
+require 'shoulda/private_helpers'
+
 module ThoughtBot # :nodoc:
   module Shoulda # :nodoc:
     module Macros
@@ -69,6 +71,10 @@ def should_not_change(expression)
           assert_equal @_before_should_not_change, new_value, "#{expression.inspect} changed"
         end
       end
+
+      private
+
+      include ThoughtBot::Shoulda::Private
     end
   end
 end