capybara_minitest_spec 0.1.1 → 0.1.2

data/README.md

@@ -24,13 +24,9 @@ Compatibility
 
 In theory, this should work with any version of Capybara, so the runtime dependency is not version specific. At the time of this writing, it was tested with Capybara 1.1.1.
 
-TODO
-----
-
-* Better failure messages.
 
 Testing
 -------
 
-This gem was tested by copying the Capybara spec located in 'spec/rspec/matchers_spec.rb' and altering the test to run with MiniTest.
+This gem was tested by basically copying the Capybara spec located in 'spec/rspec/matchers_spec.rb' and altering the test to run with MiniTest.
 Capybara uses xpath as a submodule of the git repository. When adding this gem to gemtesters (http://test.rubygems.org/gems/capybara_minitest_spec), it sounded like too much trouble to check out the submodule, so I just used the regular gem.

data/lib/capybara_minitest_spec/version.rb

@@ -1,3 +1,3 @@
 module CapybaraMinitestSpec
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/capybara_minitest_spec.rb

@@ -13,7 +13,7 @@ module MiniTest::Expectations
     # Define positive assertion.
     positive_assertion_name = :"assert_page_#{without_question_mark}"
     define_method positive_assertion_name do |page, *args|
-      assert wrap(page).send(matcher_name, *args), "Matcher failed: #{without_question_mark}"
+      assert wrap(page).send(matcher_name, *args), positive_failure_message(matcher_name, *args)
     end
 
     # Infect positive assertion.
@@ -23,7 +23,7 @@ module MiniTest::Expectations
     # Define negative assertion.
     negative_assertion_name = :"refute_page_#{without_question_mark}"
     define_method negative_assertion_name do |page, *args|
-      refute wrap(page).send(matcher_name, *args), "Matcher should have failed: #{without_question_mark}"
+      refute wrap(page).send(matcher_name, *args), negative_failure_message(matcher_name, *args)
     end
 
     # Infect negative assertions.
@@ -43,4 +43,16 @@ module MiniTest::Expectations
     end
   end
 
+  def base_failure_message(matcher_name, *args)
+    "#{matcher_name}(#{args.join(', ')})"
+  end
+
+  def positive_failure_message(matcher_name, *args)
+    "Matcher failed: #{base_failure_message(matcher_name, *args)}"
+  end
+
+  def negative_failure_message(matcher_name, *args)
+    "Matcher should have failed: #{base_failure_message(matcher_name, *args)}"
+  end
+
 end

data/test/matchers_spec.rb

@@ -444,4 +444,17 @@ describe CapybaraMinitestSpec do
       end.must_raise(/expected table "No such Table"/)
     end
   end
+
+  describe 'failure message' do
+    it 'shows matcher name and args' do
+      begin
+        'actual'.must_have_css('expected', :count => 1)
+      rescue MiniTest::Assertion => ex
+        exception = ex
+      else
+        flunk 'No exception was raised'
+      end
+      assert_equal 'Matcher failed: has_css?(expected, {:count=>1})', exception.message
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: capybara_minitest_spec
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jared Ning