lib/fracture/matchers/matcher.rb in fracture-0.11.4 vs lib/fracture/matchers/matcher.rb in fracture-0.12.0

@@ -2,77 +2,77 @@
   match do |page|
     @results = Fracture.test_fractures page, false, fracture_labels, nil
     @results[:passed]
   end
 
-  match_for_should_not do |page|
+  match_when_negated do |page|
     @results = Fracture.test_fractures page, true, fracture_labels, nil
     @results[:passed]
   end
 
-  failure_message_for_should { |actual| common_error(actual, @results) }
-  failure_message_for_should_not { |actual| common_error(actual, @results) }
+  failure_message { |actual| common_error(actual, @results) }
+  failure_message_when_negated { |actual| common_error(actual, @results) }
 end
 
 RSpec::Matchers.define :have_all_fractures do
   match do |page|
     @results = Fracture.test_fractures page, false, Fracture.all.keys, nil
     @results[:passed]
   end
 
-  match_for_should_not do |page|
+  match_when_negated do |page|
     @results = Fracture.test_fractures page, true, Fracture.all.keys, nil
     @results[:passed]
   end
 
-  failure_message_for_should { |actual| common_error(actual, @results) }
-  failure_message_for_should_not { |actual| common_error(actual, @results) }
+  failure_message { |actual| common_error(actual, @results) }
+  failure_message_when_negated { |actual| common_error(actual, @results) }
 end
 
 RSpec::Matchers.define :have_no_fractures do
   match do |page|
     @results = Fracture.test_fractures page, false, nil, Fracture.all.keys
     @results[:passed]
   end
 
-  match_for_should_not do |page|
+  match_when_negated do |page|
     @results = Fracture.test_fractures page, true, nil, Fracture.all.keys
     @results[:passed]
   end
 
-  failure_message_for_should { |actual| common_error(actual, @results) }
-  failure_message_for_should_not { |actual| common_error(actual, @results) }
+  failure_message { |actual| common_error(actual, @results) }
+  failure_message_when_negated { |actual| common_error(actual, @results) }
 end
 
 RSpec::Matchers.define :have_all_fractures_except do |*fracture_labels|
   match do |page|
     @results = Fracture.have_all_except_test(page, false, fracture_labels)
     @results[:passed]
   end
 
-  match_for_should_not do |page|
+  match_when_negated do |page|
     @results = Fracture.have_all_except_test(page, true, fracture_labels)
     @results[:passed]
   end
 
-  failure_message_for_should { |actual| common_error(actual, @results) }
-  failure_message_for_should_not { |actual| common_error(actual, @results) }
+  failure_message { |actual| common_error(actual, @results) }
+  failure_message_when_negated { |actual| common_error(actual, @results) }
 end
 
 RSpec::Matchers.define :have_only_fractures do |*fracture_labels|
   match do |page|
     @results = Fracture.have_only_test(page, false, fracture_labels)
     @results[:passed]
   end
 
-  match_for_should_not do |page|
+  match_when_negated do |page|
     @results = Fracture.have_only_test(page, true, fracture_labels)
     @results[:passed]
   end
 
-  failure_message_for_should { |actual| common_error(actual, @results) }
-  failure_message_for_should_not { |actual| common_error(actual, @results) }
+  failure_message { |actual| common_error(actual, @results) }
+  failure_message_when_negated { |actual| common_error(actual, @results) }
 end
 
 def common_error(actual, results)
   errors = ""
   unless results[:should].empty?
@@ -96,22 +96,22 @@
         page.at("form[action]").attributes.fetch("action", nil) &&
         page.at("form[action]").attributes.fetch("action", nil).value
     @has_form && !(@new_form && @edit_found) && (!@edit_form || @edit_found) && (!@expected_path || (@found_action == @expected_path))
   end
 
-  match_for_should_not do |page|
+  match_when_negated do |page|
     raise "Cannot use should_not chained with .is_for, .that_is_edit or .with_path_of " if @new_form || @edit_form || @expected_path
     page = Nokogiri::HTML.parse(page)
     !page.at("form[method='post']")
   end
 
   #chain(:for_action) { |action #new:edit| @new_form = true }
   chain(:that_is_new) { @new_form = true }
   chain(:that_is_edit) { @edit_form = true }
   #chain(:with_path) { |path| @expected_path = path }
   chain(:with_path_of) { |path| @expected_path = path }
-  failure_message_for_should do
+  failure_message do
     ret = case
       when !@has_form
         "expected to find a form on the page\n"
       when @new_form && @edit_found
         'Form is an edit'
@@ -122,7 +122,7 @@
       else
         raise "Unexpected have_form state."
     end
     ret
   end
-  failure_message_for_should_not { "expected not to find a form on the page" }
+  failure_message_when_negated { "expected not to find a form on the page" }
 end