From f814b79ac1a25775a510031956c57da53feb3ab2 Mon Sep 17 00:00:00 2001
From: Amos King <amos.l.king@gmail.com>
Date: Mon, 5 Jan 2009 12:58:40 -0600
Subject: [PATCH] change assert_xpath and assert_no_xpath to be
 assert_have_xpath and assert _have_no_xpath to be closer to the rspec
 matcher.

---
 lib/webrat/core/matchers/have_xpath.rb |  4 ++--
 spec/public/matchers_spec.rb           | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/webrat/core/matchers/have_xpath.rb b/lib/webrat/core/matchers/have_xpath.rb
index 532795eb..cc15a7a5 100644
--- a/lib/webrat/core/matchers/have_xpath.rb
+++ b/lib/webrat/core/matchers/have_xpath.rb
@@ -79,12 +79,12 @@ def have_xpath(expected, &block)
     end
     alias_method :match_xpath, :have_xpath
     
-    def assert_xpath(expected, &block)
+    def assert_have_xpath(expected, &block)
       hs = HaveXpath.new(expected, &block)
       raise Test::Unit::AssertionFailedError.new(hs.failure_message) unless hs.matches?(response_body)
     end
     
-    def assert_no_xpath(expected, &block)
+    def assert_have_no_xpath(expected, &block)
       hs = HaveXpath.new(expected, &block)
       raise Test::Unit::AssertionFailedError.new(hs.negative_failure_message) if hs.matches?(response_body)
     end
diff --git a/spec/public/matchers_spec.rb b/spec/public/matchers_spec.rb
index 26f8e03f..7a4649be 100644
--- a/spec/public/matchers_spec.rb
+++ b/spec/public/matchers_spec.rb
@@ -59,24 +59,24 @@
           should_receive(:response_body).and_return @body
           require 'test/unit'
         end
-        describe "assert_xpath" do
+        describe "assert_have_xpath" do
           it "should pass when body contains the selection" do
-            assert_xpath("//div")
+            assert_have_xpath("//div")
           end
 
           it "should throw an exception when the body doesnt have matching xpath" do
-            lambda {assert_xpath("//p")}.should raise_error(Test::Unit::AssertionFailedError)
+            lambda {assert_have_xpath("//p")}.should raise_error(Test::Unit::AssertionFailedError)
           end
 
         end
 
-        describe "assert_no_xpath" do
+        describe "assert_have_no_xpath" do
           it "should pass when the body doesn't contan the xpath" do
-            assert_no_xpath("//p")
+            assert_have_no_xpath("//p")
           end
 
           it "should throw an exception when the body does contain the xpath" do
-            lambda {assert_no_xpath("//div")}.should raise_error(Test::Unit::AssertionFailedError)
+            lambda {assert_have_no_xpath("//div")}.should raise_error(Test::Unit::AssertionFailedError)
           end
         end
     end