watir 1.5.6 → 1.6.2

data/unittests/form_xpath_test.rb

@@ -1,7 +1,7 @@
 # feature tests for Forms
-# revision: $Revision: 1348 $
+# revision: $Revision: 1544 $
 
-$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_Forms2_XPath < Test::Unit::TestCase
@@ -10,28 +10,28 @@ class TC_Forms2_XPath < Test::Unit::TestCase
   end
   
   def test_Form_Exists
-    assert($ie.form(:xpath , "//form[@name='test2']/").exists?)   
-    assert(!$ie.form(:xpath , "//form[@name='missing']/").exists?)   
+    assert(browser.form(:xpath , "//form[@name='test2']/").exists?)   
+    assert_false(browser.form(:xpath , "//form[@name='missing']/").exists?)   
     
-    assert($ie.form(:xpath , "//form[@method='get']/").exists?)   
-    assert(!$ie.form(:xpath , "//form[@method='missing']/").exists?)   
+    assert(browser.form(:xpath , "//form[@method='get']/").exists?)   
+    assert_false(browser.form(:xpath , "//form[@method='missing']/").exists?)   
     
-    assert($ie.form(:xpath , "//form[@action='pass.html']/").exists?)   
-    assert(!$ie.form(:xpath , "//form[@action='missing']/").exists?)   
+    assert(browser.form(:xpath , "//form[@action='pass.html']/").exists?)   
+    assert_false(browser.form(:xpath , "//form[@action='missing']/").exists?)   
   end
   
   def test_ButtonInForm
-    assert($ie.form(:xpath , "//form[@name='test2']/").button(:caption , "Submit").exists?)
+    assert(browser.form(:xpath , "//form[@name='test2']/").button(:caption , "Submit").exists?)
   end     
 end
 
 require 'unittests/iostring'
-class TC_Form_Display < Test::Unit::TestCase
+class TC_Form_Display_XPath < Test::Unit::TestCase
   include MockStdoutTestCase                
   def test_showforms
     goto_page "forms2.html"
     $stdout = @mockout
-    $ie.show_forms
+    browser.show_forms
     assert_equal(<<END_OF_MESSAGE, @mockout)
 There are 4 forms
 Form name: 
@@ -54,125 +54,125 @@ END_OF_MESSAGE
   end
 end
 
-class TC_Forms3 < Test::Unit::TestCase
+class TC_Forms3_XPath < Test::Unit::TestCase
   def setup
     goto_page "forms3.html"
   end
   
   def test_Form_Exists
-    assert($ie.form(:xpath , "//form[@name='test2']/").exists?)   
-    assert(!$ie.form(:xpath , "//form[@name='missing']/").exists?)   
+    assert(browser.form(:xpath , "//form[@name='test2']/").exists?)   
+    assert_false(browser.form(:xpath , "//form[@name='missing']/").exists?)   
     
-    assert($ie.form(:xpath , "//form[@method='get']/").exists?)   
-    assert(!$ie.form(:xpath , "//form[@method='missing']/").exists?)   
+    assert(browser.form(:xpath , "//form[@method='get']/").exists?)   
+    assert_false(browser.form(:xpath , "//form[@method='missing']/").exists?)   
     
-    assert($ie.form(:xpath , "//form[@action='pass.html']/").exists?)   
-    assert(!$ie.form(:xpath , "//form[@action='missing']/").exists?)   
+    assert(browser.form(:xpath , "//form[@action='pass.html']/").exists?)   
+    assert_false(browser.form(:xpath , "//form[@action='missing']/").exists?)   
   end
   
   def test_getObject_when_non_watir_object_before_it
     # test for bug reported by Scott Pack,  http://rubyforge.org/pipermail/wtr-general/2005-June/002223.html
-    assert_equal("check1" , $ie.checkbox(:index,1).name )
+    assert_equal("check1" , browser.checkbox(:index,1).name )
   end
   
   def test_showforms # add verification of output!
-    $ie.show_forms
+    browser.show_forms
   end
   
   def test_reset
     
-    $ie.text_field(:id, "t1").set("Hello, reset test!")
-    assert_equal($ie.text_field(:id, 't1').value, 'Hello, reset test!')
+    browser.text_field(:id, "t1").set("Hello, reset test!")
+    assert_equal(browser.text_field(:id, 't1').value, 'Hello, reset test!')
     
-    $ie.button(:caption, "Reset").click
-    assert_equal("" , $ie.text_field(:id, 't1').value )
+    browser.button(:caption, "Reset").click
+    assert_equal("" , browser.text_field(:id, 't1').value )
     
     # also verify it works under a form
-    $ie.text_field(:id, "t1").set("reset test - using a form")
-    assert_equal($ie.text_field(:id, 't1').value, 'reset test - using a form')
+    browser.text_field(:id, "t1").set("reset test - using a form")
+    assert_equal(browser.text_field(:id, 't1').value, 'reset test - using a form')
         
     # also verify it works under a form, this time using the :id attribute
-    $ie.text_field(:id, "t1").set("reset test - using a form")
-    assert_equal($ie.text_field(:id, 't1').value, 'reset test - using a form')    
+    browser.text_field(:id, "t1").set("reset test - using a form")
+    assert_equal(browser.text_field(:id, 't1').value, 'reset test - using a form')    
   end
     
   def test_flash1
-    $ie.form(:xpath , "//form[@name='test2']/").button(:caption , "Submit").flash
+    browser.form(:xpath , "//form[@name='test2']/").button(:caption , "Submit").flash
   end 
   
   def test_objects_with_same_name
-    assert_equal('textfield' ,$ie.text_field( :name , 'g1').value )
-    assert_equal('button'    ,$ie.button(    :name , 'g1').value )
-    assert_equal('1'         ,$ie.checkbox(  :name , 'g1').value )
-    assert_equal('2'         ,$ie.radio(     :name , 'g1').value )
+    assert_equal('textfield' ,browser.text_field( :name , 'g1').value )
+    assert_equal('button'    ,browser.button(    :name , 'g1').value )
+    assert_equal('1'         ,browser.checkbox(  :name , 'g1').value )
+    assert_equal('2'         ,browser.radio(     :name , 'g1').value )
     
-    assert_equal('textfield_id' ,$ie.text_field( :id , 'g1').value )
-    assert_equal('button_id'    ,$ie.button(    :id , 'g1').value )
-    assert_equal('1_id'         ,$ie.checkbox(  :id , 'g1').value )
-    assert_equal('2_id'         ,$ie.radio(     :id , 'g1').value )
+    assert_equal('textfield_id' ,browser.text_field( :id , 'g1').value )
+    assert_equal('button_id'    ,browser.button(    :id , 'g1').value )
+    assert_equal('1_id'         ,browser.checkbox(  :id , 'g1').value )
+    assert_equal('2_id'         ,browser.radio(     :id , 'g1').value )
   end
   
   def test_flash2
-    $ie.button(:value, 'Click Me').flash
-    assert_raises( Watir::UnknownObjectException ) { $ie.text_field( :name , 'g177').flash }
+    browser.button(:value, 'Click Me').flash
+    assert_raises( Watir::UnknownObjectException ) { browser.text_field( :name , 'g177').flash }
   end
   
   def test_showElements # add verification!
-    $ie.show_all_objects
+    browser.show_all_objects
   end
   
   def test_showText
-    puts $ie.text
+    puts browser.text
   end
   
   def test_showHTML
-    puts $ie.html
+    puts browser.html
   end
   
   def test_submitWithImage
-    assert( $ie.button(:alt , "submit").exists? )
-    assert( $ie.button(:alt , /sub/).exists? )
+    assert( browser.button(:alt , "submit").exists? )
+    assert( browser.button(:alt , /sub/).exists? )
     
-    assert(! $ie.button(:alt , "missing").exists? )
-    assert(! $ie.button(:alt , /missing/).exists? )
+    assert_false( browser.button(:alt , "missing").exists? )
+    assert_false( browser.button(:alt , /missing/).exists? )
     
-    #assert( $ie.button(:src , "file:///#{$myDir}/html/images/button.jpg").exists? )    # this doesnt work for everybody
-    assert( $ie.button(:src , /button/).exists? )
+    #assert( browser.button(:src , "file:///#{$myDir}/html/images/button.jpg").exists? )    # this doesnt work for everybody
+    assert( browser.button(:src , /button/).exists? )
     
-    assert(! $ie.button(:src , "missing").exists? )
-    assert(! $ie.button(:src , /missing/).exists? )
-    assert_nothing_raised("raised an exception when it shouldnt have") { $ie.button(:src , /button/).click }
+    assert_false( browser.button(:src , "missing").exists? )
+    assert_false( browser.button(:src , /missing/).exists? )
+    assert_nothing_raised("raised an exception when it shouldnt have") { browser.button(:src , /button/).click }
     
-    assert( $ie.contains_text("PASS") )
+    assert( browser.contains_text("PASS") )
   end
 end
 
-class TC_Forms4 < Test::Unit::TestCase
+class TC_Forms4_XPath < Test::Unit::TestCase
   def setup
     goto_page "forms4.html"
   end
   
   def test_find_text_field_ignoring_form
-    assert_equal($ie.text_field(:name, 'name').value, 'apple') # should it raise a not-unique error instead?
+    assert_equal(browser.text_field(:name, 'name').value, 'apple') # should it raise a not-unique error instead?
   end
   
   def test_correct_form_field_is_found_using_form_name
-    assert_equal($ie.form(:xpath , "//form[@name='apple_form']/").text_field(:name, 'name').value, 'apple')
-    assert_equal($ie.form(:xpath , "//form[@name='banana_form']/").text_field(:name, 'name').value, 'banana')
+    assert_equal(browser.form(:xpath , "//form[@name='apple_form']/").text_field(:name, 'name').value, 'apple')
+    assert_equal(browser.form(:xpath , "//form[@name='banana_form']/").text_field(:name, 'name').value, 'banana')
   end
   
   def test_using_text_on_form
-    $ie.form(:xpath , "//form[@name='apple_form']/").text_field(:name, 'name').set('strudel')
-    assert_equal($ie.form(:index, 1).text_field(:name, 'name').value, 'strudel')
+    browser.form(:xpath , "//form[@name='apple_form']/").text_field(:name, 'name').set('strudel')
+    assert_equal(browser.form(:index, 1).text_field(:name, 'name').value, 'strudel')
   end 
   
   def test_submit
-    $ie.form(:xpath , "//form[@name='apple_form']/").submit
-    assert( $ie.contains_text("PASS") )
+    browser.form(:xpath , "//form[@name='apple_form']/").submit
+    assert( browser.contains_text("PASS") )
   end
 end
 
-class TC_Hidden_Fields < Test::Unit::TestCase
+class TC_Hidden_Fields_XPath < Test::Unit::TestCase
   def setup
     goto_page "forms3.html"
   end
@@ -180,62 +180,62 @@ class TC_Hidden_Fields < Test::Unit::TestCase
   def test_hidden
     
     # test using index
-    assert( $ie.hidden(:index,1).exists? )
-    assert( $ie.hidden(:index,2).exists? )
-    assert(! $ie.hidden(:index,3).exists? )
+    assert( browser.hidden(:index,1).exists? )
+    assert( browser.hidden(:index,2).exists? )
+    assert_false( browser.hidden(:index,3).exists? )
     
-    $ie.hidden(:index,1).value = 44
-    $ie.hidden(:index,2).value = 55
+    browser.hidden(:index,1).value = 44
+    browser.hidden(:index,2).value = 55
     
-    $ie.button(:value , "Show Hidden").click
+    browser.button(:value , "Show Hidden").click
     
-    assert_equal("44"  , $ie.text_field(:name , "vis1").value ) 
-    assert_equal("55"  , $ie.text_field(:name , "vis2").value )
+    assert_equal("44"  , browser.text_field(:name , "vis1").value ) 
+    assert_equal("55"  , browser.text_field(:name , "vis2").value )
     
     # test using name and ID
-    assert( $ie.hidden(:name ,"hid1").exists? )
-    assert( $ie.hidden(:id,"hidden_1").exists? )
-    assert(! $ie.hidden(:name,"hidden_44").exists? )
-    assert(! $ie.hidden(:id,"hidden_55").exists? )
+    assert( browser.hidden(:name ,"hid1").exists? )
+    assert( browser.hidden(:id,"hidden_1").exists? )
+    assert_false( browser.hidden(:name,"hidden_44").exists? )
+    assert_false( browser.hidden(:id,"hidden_55").exists? )
     
-    $ie.hidden(:name ,"hid1").value = 444
-    $ie.hidden(:id,"hidden_1").value = 555
+    browser.hidden(:name ,"hid1").value = 444
+    browser.hidden(:id,"hidden_1").value = 555
     
-    $ie.button(:value , "Show Hidden").click
+    browser.button(:value , "Show Hidden").click
     
-    assert_equal("444"  , $ie.text_field(:name , "vis1").value ) 
-    assert_equal("555"  , $ie.text_field(:name ,"vis2").value )
+    assert_equal("444"  , browser.text_field(:name , "vis1").value ) 
+    assert_equal("555"  , browser.text_field(:name ,"vis2").value )
     
     #  test the over-ridden append method
-    $ie.hidden(:name ,"hid1").append("a")
-    $ie.button(:value , "Show Hidden").click
-    assert_equal("444a"  , $ie.text_field(:name , "vis1").value ) 
-    assert_equal("555"  , $ie.text_field(:name ,"vis2").value )
+    browser.hidden(:name ,"hid1").append("a")
+    browser.button(:value , "Show Hidden").click
+    assert_equal("444a"  , browser.text_field(:name , "vis1").value ) 
+    assert_equal("555"  , browser.text_field(:name ,"vis2").value )
     
     #  test the over-ridden clear method
-    $ie.hidden(:name ,"hid1").clear
-    $ie.button(:value , "Show Hidden").click
-    assert_equal(""  , $ie.text_field(:name , "vis1").value ) 
-    assert_equal("555"  , $ie.text_field(:name ,"vis2").value )
+    browser.hidden(:name ,"hid1").clear
+    browser.button(:value , "Show Hidden").click
+    assert_equal(""  , browser.text_field(:name , "vis1").value ) 
+    assert_equal("555"  , browser.text_field(:name ,"vis2").value )
     
     # test using a form
-    assert( $ie.form(:xpath , "//form[@name='has_a_hidden']/").hidden(:name ,"hid1").exists? )
-    assert( $ie.form(:xpath , "//form[@name='has_a_hidden']/").hidden(:id,"hidden_1").exists? )
-    assert(! $ie.form(:xpath , "//form[@name='has_a_hidden']/").hidden(:name,"hidden_44").exists? )
-    assert(! $ie.form(:xpath , "//form[@name='has_a_hidden']/").hidden(:id,"hidden_55").exists? )
+    assert( browser.form(:xpath , "//form[@name='has_a_hidden']/").hidden(:name ,"hid1").exists? )
+    assert( browser.form(:xpath , "//form[@name='has_a_hidden']/").hidden(:id,"hidden_1").exists? )
+    assert_false( browser.form(:xpath , "//form[@name='has_a_hidden']/").hidden(:name,"hidden_44").exists? )
+    assert_false( browser.form(:xpath , "//form[@name='has_a_hidden']/").hidden(:id,"hidden_55").exists? )
     
-    $ie.form(:xpath , "//form[@name='has_a_hidden']/").hidden(:name ,"hid1").value = 222
-    $ie.form(:xpath , "//form[@name='has_a_hidden']/").hidden(:id,"hidden_1").value = 333
+    browser.form(:xpath , "//form[@name='has_a_hidden']/").hidden(:name ,"hid1").value = 222
+    browser.form(:xpath , "//form[@name='has_a_hidden']/").hidden(:id,"hidden_1").value = 333
     
-    $ie.button(:value , "Show Hidden").click
+    browser.button(:value , "Show Hidden").click
     
-    assert_equal("222"  , $ie.text_field(:name , "vis1").value ) 
-    assert_equal("333"  , $ie.text_field(:name ,"vis2").value )
+    assert_equal("222"  , browser.text_field(:name , "vis1").value ) 
+    assert_equal("333"  , browser.text_field(:name ,"vis2").value )
     
     # iterators
-    assert_equal(2, $ie.hiddens.length)
+    assert_equal(2, browser.hiddens.length)
     count =1
-    $ie.hiddens.each do |h|
+    browser.hiddens.each do |h|
       case count
       when 1
         assert_equal( "", h.id)
@@ -247,7 +247,7 @@ class TC_Hidden_Fields < Test::Unit::TestCase
       count+=1
     end
     
-    assert_equal("hid1" , $ie.hiddens[1].name )
-    assert_equal("hidden_1" , $ie.hiddens[2].id )
+    assert_equal("hid1" , browser.hiddens[1].name )
+    assert_equal("hidden_1" , browser.hiddens[2].id )
   end
 end

data/unittests/frame_test.rb

@@ -1,7 +1,7 @@
 # feature tests for Frames
-# revision: $Revision: 1348 $
+# revision: $Revision: 1505 $
 
-$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_Frames < Test::Unit::TestCase
@@ -12,46 +12,47 @@ class TC_Frames < Test::Unit::TestCase
   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?  }  
-    assert($ie.frame("buttonFrame").button(:id, "b2").enabled?)   
-    assert(!$ie.frame("buttonFrame").button(:caption, "Disabled Button").enabled?)
+    assert_raises(UnknownFrameException) { browser.frame("missingFrame").button(:id, "b2").enabled?  }  
+    assert_raises(UnknownObjectException) { browser.frame("buttonFrame2").button(:id, "b2").enabled?  }  
+    assert(browser.frame("buttonFrame").button(:id, "b2").enabled?)   
+    assert_false(browser.frame("buttonFrame").button(:caption, "Disabled Button").enabled?)
   end
   
   def test_frame_using_name
-    assert_raises(UnknownFrameException) { $ie.frame(:name , "missingFrame").button(:id, "b2").enabled?  }  
-    assert_raises(UnknownObjectException) { $ie.frame(:name, "buttonFrame2").button(:id, "b2").enabled?  }  
-    assert($ie.frame(:name, "buttonFrame").button(:id, "b2").enabled?)   
-    assert(!$ie.frame(:name , "buttonFrame").button(:caption, "Disabled Button").enabled?)
+    assert_raises(UnknownFrameException) { browser.frame(:name , "missingFrame").button(:id, "b2").enabled?  }  
+    assert_raises(UnknownObjectException) { browser.frame(:name, "buttonFrame2").button(:id, "b2").enabled?  }  
+    assert(browser.frame(:name, "buttonFrame").button(:id, "b2").enabled?)   
+    assert_false(browser.frame(:name , "buttonFrame").button(:caption, "Disabled Button").enabled?)
   end
   
   def test_frame_using_name_and_regexp
-    assert_raises(UnknownFrameException) { $ie.frame(:name , /missingFrame/).button(:id, "b2").enabled?  }  
-    assert($ie.frame(:name, /button/).button(:id, "b2").enabled?)   
+    assert_raises(UnknownFrameException) { browser.frame(:name , /missingFrame/).button(:id, "b2").enabled?  }  
+    assert(browser.frame(:name, /button/).button(:id, "b2").enabled?)   
   end
   
   def test_frame_using_index
-    assert_raises(UnknownFrameException) { $ie.frame(:index, 8).button(:id, "b2").enabled?  }  
-    assert_raises(UnknownObjectException) { $ie.frame(:index, 2).button(:id, "b2").enabled?  }  
-    assert($ie.frame(:index, 1 ).button(:id, "b2").enabled?)   
-    assert(!$ie.frame(:index, 1).button(:caption, "Disabled Button").enabled?)
+    assert_raises(UnknownFrameException) { browser.frame(:index, 8).button(:id, "b2").enabled?  }  
+    assert_raises(UnknownObjectException) { browser.frame(:index, 2).button(:id, "b2").enabled?  }  
+    assert(browser.frame(:index, 1 ).button(:id, "b2").enabled?)   
+    assert_false(browser.frame(:index, 1).button(:caption, "Disabled Button").enabled?)
   end
   
+  tag_method :test_frame_with_invalid_attribute, :fails_on_firefox
   def test_frame_with_invalid_attribute
-    assert_raises(ArgumentError) { $ie.frame(:blah, 'no_such_thing').button(:id, "b2").enabled?  }  
+    assert_raises(ArgumentError) { browser.frame(:blah, 'no_such_thing').button(:id, "b2").enabled?  }  
   end
   
   def test_preset_frame
     # with ruby's instance_eval, we are able to use the same frame for several actions
-    results = $ie.frame("buttonFrame").instance_eval do [
+    results = browser.frame("buttonFrame").instance_eval do [
       button(:id, "b2").enabled?, 
       button(:caption, "Disabled Button").enabled?
       ]
     end
     assert_equal([true, false], results)
   end
-  
 end
+  
 
 class TC_Frames2 < Test::Unit::TestCase
   include Watir::Exception
@@ -61,57 +62,55 @@ class TC_Frames2 < Test::Unit::TestCase
   end
   
   def test_frame_with_no_name
-    assert_raises(UnknownFrameException) { $ie.frame(:name , "missingFrame").button(:id, "b2").enabled?  }  
+    assert_raises(UnknownFrameException) { browser.frame(:name , "missingFrame").button(:id, "b2").enabled?  }  
   end            
   
   def test_frame_by_id
-    assert_raises(UnknownFrameException) { $ie.frame(:id , "missingFrame").button(:id, "b2").enabled?  }  
-    assert($ie.frame(:id, 'first_frame').button(:id, "b2").enabled?)
+    assert_raises(UnknownFrameException) { browser.frame(:id , "missingFrame").button(:id, "b2").enabled?  }  
+    assert(browser.frame(:id, 'first_frame').button(:id, "b2").enabled?)
   end
   
   def test_frame_by_src
-    assert($ie.frame(:src, /pass/).button(:value, 'Close Window').exists?)
+    assert(browser.frame(:src, /pass/).button(:value, 'Close Window').exists?)
   end
   
 end
 
 class TC_NestedFrames < Test::Unit::TestCase
-  include Watir::Exception
-  
+  tags :fails_on_firefox  
   def setup
     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?  }  
-    assert($ie.frame("nestedFrame").frame("senderFrame").button(:name, "sendIt").enabled?)   
-    $ie.frame("nestedFrame").frame("senderFrame").text_field(:index, "1").set("Hello")
-    $ie.frame("nestedFrame").frame("senderFrame").button(:name, "sendIt").click
-    assert($ie.frame("nestedFrame").frame("receiverFrame").text_field(:name, "receiverText").verify_contains("Hello"))   
-    
+    assert_raises(UnknownFrameException) { browser.frame("missingFrame").button(:id, "b2").enabled?  }  
+    assert_raises(UnknownFrameException) { browser.frame("nestedFrame").frame("subFrame").button(:id, "b2").enabled?  }  
+    assert(browser.frame("nestedFrame").frame("senderFrame").button(:name, "sendIt").enabled?)   
+    browser.frame("nestedFrame").frame("senderFrame").text_field(:index, "1").set("Hello")
+    browser.frame("nestedFrame").frame("senderFrame").button(:name, "sendIt").click
+    assert(browser.frame("nestedFrame").frame("receiverFrame").text_field(:name, "receiverText").verify_contains("Hello"))   
   end
   
 end
 
 class TC_IFrames < Test::Unit::TestCase
-  
+  tags :fails_on_firefox
+
   def setup
     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
-    assert( $ie.frame("receiverFrame").text_field(:name , "receiverText").verify_contains("Hello World") )
-    assert_equal($ie.frame(:src, /iframeTest2/).text_field(:name, 'receiverText').value, "Hello World")    
+    browser.frame("senderFrame").text_field(:name , "textToSend").set( "Hello World")
+    browser.frame("senderFrame").button(:index, 1).click
+    assert( browser.frame("receiverFrame").text_field(:name , "receiverText").verify_contains("Hello World") )
+    assert_equal(browser.frame(:src, /iframeTest2/).text_field(:name, 'receiverText').value, "Hello World")    
   end
 
-  #VALIDATE THAT WE CAN GET THERE VIA id  
   def test_iframes_id 
-    $ie.frame(:id, "sf").text_field(:name , "textToSend").set( "Hello World")
-    $ie.frame(:id, "sf").button(:name,'sendIt').click
-    assert( $ie.frame("receiverFrame").text_field(:name , "receiverText").verify_contains("Hello World") )  
+    browser.frame(:id, "sf").text_field(:name , "textToSend").set( "Hello World")
+    browser.frame(:id, "sf").button(:name,'sendIt').click
+    assert( browser.frame("receiverFrame").text_field(:name , "receiverText").verify_contains("Hello World") )  
   end   
   
 end   
@@ -121,12 +120,13 @@ class TC_show_frames < Test::Unit::TestCase
   include MockStdoutTestCase                
   
   def capture_and_compare(page, expected)
-    $ie.goto($htmlRoot + page)
+    goto_page page
     $stdout = @mockout
-    $ie.showFrames
+    browser.showFrames
     assert_equal(expected, @mockout)
   end
-  
+
+  tag_method :test_show_nested_frames, :fails_on_firefox
   def test_show_nested_frames
     capture_and_compare("nestedFrames.html", <<END_OF_MESSAGE)
 there are 2 frames
@@ -135,6 +135,7 @@ frame  index: 2 name: nestedFrame2
 END_OF_MESSAGE
   end
   
+  tag_method :test_button_frames, :fails_on_firefox
   def test_button_frames
     capture_and_compare("frame_buttons.html", <<END_OF_MESSAGE)
 there are 2 frames
@@ -143,6 +144,7 @@ frame  index: 2 name: buttonFrame2
 END_OF_MESSAGE
   end
   
+  tag_method :test_iframes, :fails_on_firefox
   def test_iframes
     capture_and_compare("iframeTest.html", <<END_OF_MESSAGE)
 there are 2 frames