unittests/frame_test.rb in watir-1.5.4 vs unittests/frame_test.rb in watir-1.5.5

@@ -1,16 +1,16 @@
 # feature tests for Frames
-# revision: $Revision: 1204 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Frames < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "frame_buttons.html")
+    goto_page "frame_buttons.html"
   end
   
   def test_frame_no_what
     assert_raises(UnknownFrameException) { $ie.frame("missingFrame").button(:id, "b2").enabled?  }  
     assert_raises(UnknownObjectException) { $ie.frame("buttonFrame2").button(:id, "b2").enabled?  }  
@@ -52,14 +52,14 @@
   end
   
 end
 
 class TC_Frames2 < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "frame_multi.html")
+    goto_page "frame_multi.html"
   end
   
   def test_frame_with_no_name
     assert_raises(UnknownFrameException) { $ie.frame(:name , "missingFrame").button(:id, "b2").enabled?  }  
   end            
@@ -74,14 +74,14 @@
   end
   
 end
 
 class TC_NestedFrames < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "nestedFrames.html")
+    goto_page "nestedFrames.html"
   end
   
   def test_frame
     assert_raises(UnknownFrameException) { $ie.frame("missingFrame").button(:id, "b2").enabled?  }  
     assert_raises(UnknownFrameException) { $ie.frame("nestedFrame").frame("subFrame").button(:id, "b2").enabled?  }  
@@ -93,13 +93,12 @@
   end
   
 end
 
 class TC_IFrames < Test::Unit::TestCase
-  include Watir
   
   def setup
-    $ie.goto($htmlRoot + "iframeTest.html")
+    goto_page "iframeTest.html"
   end
   
   def test_Iframe
     $ie.frame("senderFrame").text_field(:name , "textToSend").set( "Hello World")
     $ie.frame("senderFrame").button(:index, 1).click