Skip to content
Browse files

Change rails detection, delete rails.rb

  • Loading branch information...
1 parent 107c5d5 commit 679bc268132e4fcd892526515f3570bf6d586549 @soulcutter soulcutter committed Feb 24, 2014
View
7 lib/rspec/collection_matchers.rb
@@ -1,4 +1,9 @@
require 'rspec/collection_matchers/version'
require 'rspec/collection_matchers/matchers'
require 'rspec/collection_matchers/have'
-require 'rspec/collection_matchers/rails' if defined? Rails && respond_to?(:alias_method_chain)
+
+begin
+ require 'rspec/collection_matchers/rails/have_extensions'
+rescue LoadError
+ # must not have rails
+end
View
1 lib/rspec/collection_matchers/rails.rb
@@ -1 +0,0 @@
-require 'rspec/collection_matchers/rails/have_extensions'
View
2 lib/rspec/collection_matchers/rails/have_extensions.rb
@@ -1,5 +1,3 @@
-require 'rspec/collection_matchers/have'
-
require 'active_support/concern'
require 'active_support/core_ext/module/aliasing'

0 comments on commit 679bc26

Please sign in to comment.
Something went wrong with that request. Please try again.