Make it rspec-rails compatible.

shingara · Jul 28, 2009 · 4920776 · 4920776
1 parent 4e27e05
commit 4920776
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/lib/remarkable_mongomapper.rb b/lib/remarkable_mongomapper.rb
@@ -17,5 +17,10 @@
 Dir[File.join(dir, 'remarkable_mongomapper', 'matchers', '*.rb')].each do |file|
   require file
 end
-
-Remarkable.include_matchers!(Remarkable::MongoMapper, Spec::Example::ExampleGroup)
+
+# Include Remarkable MongoMapper matcher in appropriate ExampleGroup
+if defined?(Spec::Rails)
+  Remarkable.include_matchers!(Remarkable::MongoMapper, Spec::Rails::Example::ModelExampleGroup)
+else
+  Remarkable.include_matchers!(Remarkable::MongoMapper, Spec::Example::ExampleGroup)
+end
diff --git a/lib/remarkable_mongomapper/matchers/have_key_matcher.rb b/lib/remarkable_mongomapper/matchers/have_key_matcher.rb
@@ -10,7 +10,7 @@ class HaveKeyMatcher < Remarkable::Base #:nodoc:
         protected
 
           def has_key?
-            @subject.respond_to?(@key) && @subject.respond_to?("#{@key}=")
+            @subject.reader?(@key) && @subject.writer?(@key)
           end
 
       end

diff --git a/spec/spec.opts b/spec/spec.opts
@@ -1,6 +1,4 @@
 --colour
---format
-progress
---loadby
-mtime
+--format progress
+--loadby mtime
 --reverse