watir 1.9.2 → 2.0.0.rc2

data/unittests/element_test.rb

@@ -23,14 +23,14 @@ class TC_Elements < Test::Unit::TestCase
     assert_equal 3, browser.elements(:class, 'blueText').size
     assert_equal("span2", browser.elements(:class, 'blueText')[2].id)
     
-    index = 1
+    index = 0
     browser.elements(:id, /div/).each do |s|
       assert_equal(browser.div(:index,index).name, s.name)
       assert_equal(browser.div(:index,index).id, s.id)
       assert_equal(browser.div(:index,index).class_name , s.class_name)
       index += 1
     end
-    assert_equal(index - 1, browser.elements(:id, /div/).length)   # -1 as we add 1 at the end of the loop
+    assert_equal(index, browser.elements(:id, /div/).length)
   end
   
   def test_element_enumerable
@@ -39,8 +39,8 @@ class TC_Elements < Test::Unit::TestCase
   end
   
   def test_objects_in_element
-    assert browser.element(:id, 'buttons1').button(:index,1).exists? 
-    assert !browser.element(:id, 'buttons1').button(:index,3).exists? 
+    assert browser.element(:id, 'buttons1').button(:index,0).exists? 
+    assert !browser.element(:id, 'buttons1').button(:index,2).exists? 
     assert browser.element(:id, 'buttons1').button(:name,'b1').exists? 
   end
 

data/unittests/form_test.rb

@@ -12,11 +12,8 @@ class TC_Forms2 < Test::Unit::TestCase # Note: there is no TC_Forms1
     assert(browser.form(:name, "test2").exists?)   
     assert_false(browser.form(:name, "missing").exists?)   
     
-    assert(browser.form("test2").exists?)   
-    assert_false(browser.form("missing").exists?)   
-
-    assert(browser.form(:index, 1).exists?)   
-    assert_false(browser.form(:index, 88).exists?)   
+    assert(browser.form(:index, 0).exists?)   
+    assert_false(browser.form(:index, 87).exists?)   
     
     assert(browser.form(:method, "get").exists?)   
     assert_false(browser.form(:method, "missing").exists?)   
@@ -37,7 +34,7 @@ class TC_Forms2 < Test::Unit::TestCase # Note: there is no TC_Forms1
     assert(browser.form(:name, "test2").button(:caption, "Submit").exists?)
   end     
   def test_form_sub_element
-    assert_equal('Click Me', browser.form(:index, 1).button(:name, 'b1').value)
+    assert_equal('Click Me', browser.form(:index, 0).button(:name, 'b1').value)
   end
 
   # The following tests form bug 2261
@@ -121,12 +118,12 @@ class TC_Forms3 < Test::Unit::TestCase
   # The following tests form bug 2261 
   def test_p_in_form
     assert_equal "This form has a submit button that is an image", 
-      browser.form(:name, 'buttonsubmit').p(:index, 1).text
+      browser.form(:name, 'buttonsubmit').p(:index, 0).text
   end
   
   # test for bug reported by Scott Pack,  http://rubyforge.org/pipermail/wtr-general/2005-June/002223.html
   def test_index_other_element_before_it
-    assert_equal("check1" , browser.checkbox(:index,1).name)
+    assert_equal("check1" , browser.checkbox(:index,0).name)
   end
   
   tag_method :test_reset, :fails_on_firefox
@@ -141,14 +138,14 @@ class TC_Forms3 < Test::Unit::TestCase
     browser.text_field(:id, "t1").set("reset test - using a form")
     assert_equal(browser.text_field(:id, 't1').value, 'reset test - using a form')
     
-    browser.form(:index,2).button(:index,2).click
+    browser.form(:index,1).button(:index,1).click
     assert_equal("" , browser.text_field(:id, 't1').value)
     
     # also verify it works under a form, this time using the :id attribute
     browser.text_field(:id, "t1").set("reset test - using a form")
     assert_equal(browser.text_field(:id, 't1').value, 'reset test - using a form')
     
-    browser.form(:index,2).button(:id,'reset_button').click
+    browser.form(:index,1).button(:id,'reset_button').click
     assert_equal("" , browser.text_field(:id, 't1').value)
   end
   
@@ -218,13 +215,13 @@ class TC_Forms4 < Test::Unit::TestCase
   end
   
   def test_correct_form_field_is_found_using_form_index
-    assert_equal(browser.form(:index, 1).text_field(:name, 'name').value, 'apple')
-    assert_equal(browser.form(:index, 2).text_field(:name, 'name').value, 'banana')
+    assert_equal(browser.form(:index, 0).text_field(:name, 'name').value, 'apple')
+    assert_equal(browser.form(:index, 1).text_field(:name, 'name').value, 'banana')
   end
   
   def test_using_text_on_form
     browser.form(:name, 'apple_form').text_field(:name, 'name').set('strudel')
-    assert_equal(browser.form(:index, 1).text_field(:name, 'name').value, 'strudel')
+    assert_equal(browser.form(:index, 0).text_field(:name, 'name').value, 'strudel')
   end 
   
   def test_submit
@@ -241,12 +238,12 @@ class TC_Hidden_Fields < Test::Unit::TestCase
   def test_hidden
     
     # test using index
+    assert( browser.hidden(:index, 0).exists? )
     assert( browser.hidden(:index, 1).exists? )
-    assert( browser.hidden(:index, 2).exists? )
-    assert_false( browser.hidden(:index, 3).exists? )
+    assert_false( browser.hidden(:index, 2).exists? )
     
-    browser.hidden(:index, 1).value = 44
-    browser.hidden(:index, 2).value = 55
+    browser.hidden(:index, 0).value = 44
+    browser.hidden(:index, 1).value = 55
     
     browser.button(:value, "Show Hidden").click
     
@@ -308,8 +305,8 @@ class TC_Hidden_Fields < Test::Unit::TestCase
       count += 1
     end
     
-    assert_equal("hid1", browser.hiddens[1].name)
-    assert_equal("hidden_1", browser.hiddens[2].id)
+    assert_equal("hid1", browser.hiddens[0].name)
+    assert_equal("hidden_1", browser.hiddens[1].id)
   end
 end
 

data/unittests/form_xpath_test.rb

@@ -73,7 +73,7 @@ class TC_Forms3_XPath < Test::Unit::TestCase
   
   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" , browser.checkbox(:index,1).name )
+    assert_equal("check1" , browser.checkbox(:index,0).name )
   end
   
   def test_showforms # add verification of output!
@@ -164,7 +164,7 @@ class TC_Forms4_XPath < Test::Unit::TestCase
   
   def test_using_text_on_form
     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')
+    assert_equal(browser.form(:index, 0).text_field(:name, 'name').value, 'strudel')
   end 
   
   def test_submit
@@ -181,12 +181,12 @@ class TC_Hidden_Fields_XPath < Test::Unit::TestCase
   def test_hidden
     
     # test using index
+    assert( browser.hidden(:index,0).exists? )
     assert( browser.hidden(:index,1).exists? )
-    assert( browser.hidden(:index,2).exists? )
-    assert_false( browser.hidden(:index,3).exists? )
+    assert_false( browser.hidden(:index,2).exists? )
     
-    browser.hidden(:index,1).value = 44
-    browser.hidden(:index,2).value = 55
+    browser.hidden(:index,0).value = 44
+    browser.hidden(:index,1).value = 55
     
     browser.button(:value , "Show Hidden").click
     

data/unittests/frame_test.rb

@@ -3,121 +3,115 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 require 'unittests/setup'
 
-#class TC_Frames < Test::Unit::TestCase
-#  include Watir::Exception
-#
-#  def setup
-#    goto_page "frame_buttons.html"
-#  end
-#
-#  def test_frame_no_what
-#    assert_raises(UnknownObjectException) { 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(UnknownObjectException) { 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(UnknownObjectException) { 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(UnknownObjectException) { 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?)
-#    assert_equal('blankpage.html', browser.frame(:index, 2).src)
-#  end
-#
-#  tag_method :test_frame_with_invalid_attribute, :fails_on_firefox
-#
-#  def test_frame_with_invalid_attribute
-#    assert_raises(MissingWayOfFindingObjectException) { 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 = 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
-#
-#  def setup
-#    goto_page "frame_multi.html"
-#  end
-#
-#  def test_frame_with_no_name
-#    assert_raises(UnknownObjectException) { browser.frame(:name, "missingFrame").button(:id, "b2").enabled?  }
-#  end
-#
-#  def test_frame_by_id
-#    assert_raises(UnknownObjectException) { 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(browser.frame(:src, /pass/).button(:value, 'Close Window').exists?)
-#  end
-#
-#end
-#
-#class TC_NestedFrames < Test::Unit::TestCase
-#  tags :fails_on_firefox
-#
-#  def setup
-#    goto_page "nestedFrames.html"
-#  end
-#
-#  def test_frame
-#    assert_raises(UnknownObjectException) { browser.frame("missingFrame").button(:id, "b2").enabled?  }
-#    assert_raises(UnknownObjectException) { 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
-#    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
-#
-#  def test_iframes_id
-#    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
-#
+class TC_Frames < Test::Unit::TestCase
+  include Watir::Exception
+
+  def setup
+    goto_page "frame_buttons.html"
+  end
+
+  def test_frame_no_what
+    assert_raises(UnknownObjectException) { 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
+    assert_raises(UnknownObjectException) { 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(UnknownObjectException) { 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(UnknownObjectException) { browser.frame(:index, 7).button(:id, "b2").enabled?  }
+    assert_raises(UnknownObjectException) { browser.frame(:index, 1).button(:id, "b2").enabled?  }
+    assert(browser.frame(:index, 0 ).button(:id, "b2").enabled?)
+    assert_false(browser.frame(:index, 0).button(:caption, "Disabled Button").enabled?)
+    assert_equal('blankpage.html', browser.frame(:index, 1).src)
+  end
+
+  tag_method :test_frame_with_invalid_attribute, :fails_on_firefox
+
+  def test_frame_with_invalid_attribute
+    assert_raises(MissingWayOfFindingObjectException) { browser.frame(:blah, 'no_such_thing').button(:id, "b2").enabled?  }
+  end
+
+  def test_preset_frame
+    assert browser.frame(:name => "buttonFrame").button(:id, "b2").enabled?
+    assert !browser.frame(:name => "buttonFrame").button(:caption, "Disabled Button").enabled?
+  end
+end
+
+
+class TC_Frames2 < Test::Unit::TestCase
+  include Watir::Exception
+
+  def setup
+    goto_page "frame_multi.html"
+  end
+
+  def test_frame_with_no_name
+    assert_raises(UnknownObjectException) { browser.frame(:name, "missingFrame").button(:id, "b2").enabled?  }
+  end
+
+  def test_frame_by_id
+    assert_raises(UnknownObjectException) { 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(browser.frame(:src, /pass/).button(:value, 'Close Window').exists?)
+  end
+
+end
+
+class TC_NestedFrames < Test::Unit::TestCase
+  tags :fails_on_firefox
+
+  def setup
+    goto_page "nestedFrames.html"
+  end
+
+  def test_frame
+    assert_raises(UnknownObjectException) { browser.frame(:name => "missingFrame").button(:id, "b2").enabled?  }
+    assert_raises(UnknownObjectException) { browser.frame(:name => "nestedFrame").frame(:name => "subFrame").button(:id, "b2").enabled?  }
+    assert(browser.frame(:name => "nestedFrame").frame(:name => "senderFrame").button(:name, "sendIt").enabled?)
+    browser.frame(:name => "nestedFrame").frame(:name => "senderFrame").text_field(:index, "0").set("Hello")
+    browser.frame(:name => "nestedFrame").frame(:name => "senderFrame").button(:name, "sendIt").click
+    assert(browser.frame(:name => "nestedFrame").frame(:name => "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
+    browser.frame(:name => "senderFrame").text_field(:name, "textToSend").set( "Hello World")
+    browser.frame(:name => "senderFrame").button(:index, 0).click
+    assert( browser.frame(:name => "receiverFrame").text_field(:name, "receiverText").verify_contains("Hello World") )
+    assert_equal(browser.frame(:src, /iframeTest2/).text_field(:name, 'receiverText').value, "Hello World")
+  end
+
+  def test_iframes_id
+    browser.frame(:id, "sf").text_field(:name, "textToSend").set( "Hello World")
+    browser.frame(:id, "sf").button(:name, 'sendIt').click
+    assert( browser.frame(:name => "receiverFrame").text_field(:name, "receiverText").verify_contains("Hello World") )
+  end
+
+end
+
 class TC_show_frames < Test::Unit::TestCase
   include CaptureIOHelper
 
@@ -165,7 +159,7 @@ class TC_Frames_click_no_wait < Test::Unit::TestCase
   end
 
   def test_frame_click_no_wait
-    frame = browser.frame("buttonFrame")
+    frame = browser.frame(:name => "buttonFrame")
     assert !frame.text.include?("PASS")
     frame.button(:id => "b2").click_no_wait
     assert_nothing_raised {
@@ -192,8 +186,8 @@ class TC_frames_method_for_container < Test::Unit::TestCase
   def test_frames_collection
     frames = browser.frames
     assert_equal(3, frames.length)
-    assert_equal('first_frame', frames[1].id)
-    assert_equal('pass.html', frames[3].src)
+    assert_equal('first_frame', frames[0].id)
+    assert_equal('pass.html', frames[2].src)
   end
 end
 
@@ -206,7 +200,7 @@ class TC_iframe_access < Test::Unit::TestCase
     frame = browser.frame(:name, 'iframe')
     assert_nothing_raised {frame.src}
     assert_equal('http://www.google.com', frame.src)
-    assert_raises(FrameAccessDeniedException) {frame.button(:index, 1).click}
+    assert_raises(FrameAccessDeniedException) {frame.button(:index, 0).click}
   end
 
-end
+end

data/unittests/html/multiple_specifiers.html

@@ -0,0 +1,64 @@
+<!doctype html>
+<head>
+  <title>
+    Test page for multiple specifiers
+  </title>
+</head>
+<body>
+  <form name="testform" class="one">
+    <input type="button" name="testbutton" class="one"/>
+    <input type="button" name="testbutton" class="two"/>
+
+    <input type="text" name="testtext_field" class="one"/>
+    <input type="text" name="testtext_field" class="two"/>
+
+    <input type="file" name="testfile_field" class="one"/>
+    <input type="file" name="testfile_field" class="two"/>
+
+    <input type="hidden" name="testhidden" class="one"/>
+    <input type="hidden" name="testhidden" class="two"/>
+
+    <input type="checkbox" name="testcheckbox" class="one"/>
+    <input type="checkbox" name="testcheckbox" class="two"/>
+
+    <input type="radio" name="testradio" class="one"/>
+    <input type="radio" name="testradio" class="two"/>
+
+    <select name="testselect_list" class="one">
+    </select>
+    <select name="testselect_list" class="two">
+    </select>
+  </form>
+
+  <form name="testform" class="two">
+  </form>  
+
+  <a href="#" name="testlink" class="one"></a>
+  <a href="#" name="testlink" class="two"></a>
+
+  <img src="#" name="testimage" class="one"/>
+  <img src="#" name="testimage" class="two"/>
+
+  <div name="testdiv" class="one"></div>
+  <div name="testdiv" class="two"></div>
+
+  <span name="testelement" class="one"></span>
+  <span name="testelement" class="two"></span>
+
+  <table name="testtable" class="one">
+    <tr name="testrow" class="one">
+      <td name="testcell" class="one">
+      </td>
+      <td name="testcell" class="two">
+      </td>      
+    </tr>
+    <tr name="testrow" class="two">
+    </tr>
+  </table>
+
+  <table name="testtable" class="two">
+  </table>
+
+</body>
+</html>
+