unittests/pagecontainstext_test.rb in watir-1.5.6 vs unittests/pagecontainstext_test.rb in watir-1.6.2

@@ -1,67 +1,70 @@
 # feature tests for IE::contains_text
-# revision: $Revision: 1348 $
+# revision: $Revision: 1579 $
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 require 'unittests/setup'
 
 class TC_contains_text < Test::Unit::TestCase
   
   def setup
     goto_page "textsearch.html"
   end        
   
   def test_text_found
-    assert($ie.contains_text('slings and arrows of outrageous fortune'))
+    assert(browser.contains_text('slings and arrows of outrageous fortune'))
   end
   
   def test_text_not_found
-    assert(!$ie.contains_text('So are they all, all honourable men'))
+    assert_false(browser.contains_text('So are they all, all honourable men'))
   end
   
   def test_regexp_found
-    assert($ie.contains_text(/bodkin.*fardels/))
+    assert(browser.contains_text(/bodkin.*fardels/))
   end
   
   def test_regexp_not_found
-    assert(!$ie.contains_text(/winding.*watch.*wit/))
+    assert_false(browser.contains_text(/winding.*watch.*wit/))
   end
   
   def test_match_regexp_found
-    $~ = $ie.contains_text(/Messages ([0-9]+)/)
+    $~ = browser.contains_text(/Messages ([0-9]+)/)
     assert_equal('42', $1)
   end
   
   def test_bad_search_argument
     assert_raises(ArgumentError) do
-      $ie.contains_text
+      browser.contains_text
     end
     assert_raises(ArgumentError) do
-      $ie.contains_text(nil)
+      browser.contains_text(nil)
     end
     assert_raises(ArgumentError) do
-      $ie.contains_text(42)
+      browser.contains_text(42)
     end
   end
   
 end
 
 class TC_contains_text_in_new_ie < Test::Unit::TestCase
+  tags :fails_on_firefox
+  # Doesn't actually raise an error, but fails to close the window afterwards
+  # http://jira.openqa.org/browse/WTR-265
   def setup
-    @ie = Watir::IE.new
+    @new_browser = Watir::Browser.new
   end
   def test_nothing_raised
-    assert_nothing_raised {@ie.contains_text ''}
+    assert_nothing_raised {@new_browser.text.include? ''}
   end
   def teardown
-    @ie.close
+    @new_browser.close
   end
 end
 
 class TC_contains_text_in_frame < Test::Unit::TestCase
   def setup
     goto_page "frame_links.html"
   end        
   def test_in_frame
-    assert $ie.frame('linkFrame').contains_text('The button is really a link')
+    assert browser.frame('linkFrame').contains_text('The button is really a link')
   end
 end
\ No newline at end of file