watir 3.0.0.rc2 → 3.0.0.rc3

data/unittests/selectbox_test.rb

@@ -29,9 +29,9 @@ class TC_SelectList < Test::Unit::TestCase
   end
 
   def test_select_by_text
-    assert_equal(['Option 3'], browser.select_list(:name, "sel1").getSelectedItems)
+    assert_equal('Option 3', browser.select_list(:name, "sel1").selected_options.first.text)
     browser.select_list(:name, "sel1").select('Option 2')
-    assert_equal(['Option 2'], browser.select_list(:name, "sel1").getSelectedItems)
+    assert_equal('Option 2', browser.select_list(:name, "sel1").selected_options.first.text)
   end
   
   def test_select_by_value
@@ -39,12 +39,6 @@ class TC_SelectList < Test::Unit::TestCase
     assert(browser.text.include?("PASS"))
   end
   
-  def test_set # by text
-    assert_equal(['Option 3'], browser.select_list(:name, "sel1").getSelectedItems)
-    browser.select_list(:name, "sel1").set('Option 2')
-    assert_equal(['Option 2'], browser.select_list(:name, "sel1").getSelectedItems)
-  end
-  
   # Option
   
   def test_Option_text_select
@@ -52,12 +46,15 @@ class TC_SelectList < Test::Unit::TestCase
     assert_raises(UnknownObjectException) { browser.select_list(:name, "sel1").option(:text, /missing/).select }  
     assert_raises(MissingWayOfFindingObjectException) { browser.select_list(:name, "sel1").option(:missing, "Option 1").select }
     
-    # the select method keeps any currently selected items - use the clear selection method first
-    browser.select_list(:name, "sel1").clearSelection
     browser.select_list(:name, "sel1").option(:text, "Option 1").select
-    assert_equal(["Option 1" ], browser.select_list(:name, "sel1").getSelectedItems)   
+    assert_equal("Option 1", browser.select_list(:name, "sel1").selected_options.first.text)
   end    
-  
+
+  def test_clear_selection
+    assert_raises(TypeError) { browser.select_list(:name, "sel1").clear }
+    assert_nothing_thrown    { browser.select_list(:name, "sel2").clear }
+  end
+
   def xtest_option_class_name
     # the option object doesnt inherit from element, so this doesnt work
     assert_raises(UnknownObjectException) { browser.select_list(:name, "sel1").option(:text, "missing item").class_name }  
@@ -69,10 +66,10 @@ class TC_SelectList < Test::Unit::TestCase
     
   tag_method :test_includes, :fails_on_firefox
   def test_includes
-    assert browser.select_list(:name, 'sel1').includes?('Option 1')
-    assert browser.select_list(:name, 'sel1').includes?(/option/i)
-    assert ! browser.select_list(:name, 'sel1').includes?('Option 6')
-    assert ! browser.select_list(:name, 'sel1').includes?(/foobar/)
+    assert browser.select_list(:name, 'sel1').include?('Option 1')
+    assert browser.select_list(:name, 'sel1').include?(/option/i)
+    assert ! browser.select_list(:name, 'sel1').include?('Option 6')
+    assert ! browser.select_list(:name, 'sel1').include?(/foobar/)
   end  
   
   # SelectList#selected?
@@ -97,7 +94,7 @@ class TC_SelectList < Test::Unit::TestCase
     assert_raises(UnknownObjectException) { browser.select_list(:index, 199).value }  
     assert_raises(UnknownObjectException) { browser.select_list(:index, 199).name }  
     assert_raises(UnknownObjectException) { browser.select_list(:index, 199).id }  
-    assert_raises(UnknownObjectException) { browser.select_list(:index, 199).disabled }  
+    assert_raises(UnknownObjectException) { browser.select_list(:index, 199).disabled? }  
     assert_raises(UnknownObjectException) { browser.select_list(:index, 199).type }  
     
     assert_equal("o3"   ,    browser.select_list(:index, 0).value)  
@@ -109,9 +106,9 @@ class TC_SelectList < Test::Unit::TestCase
     browser.select_list(:index,0).select(/1/)
     assert_equal("o1", browser.select_list(:index, 0).value)  
     
-    assert_false( browser.select_list(:index, 0).disabled)
-    assert(browser.select_list(:index, 3).disabled)
-    assert(browser.select_list(:id, 'selectbox_4').disabled)
+    assert_false( browser.select_list(:index, 0).disabled?)
+    assert(browser.select_list(:index, 3).disabled?)
+    assert(browser.select_list(:id, 'selectbox_4').disabled?)
   end
   
   def test_iterator
@@ -141,7 +138,7 @@ class TC_Select_Options < Test::Unit::TestCase
   
   def test_options_text
     browser.select_list(:name, 'op_numhits').option(:text, '>=').select
-    assert(browser.select_list(:name, 'op_numhits').option(:text, '>=').selected)
+    assert(browser.select_list(:name, 'op_numhits').option(:text, '>=').selected?)
   end
 end
 

data/unittests/selectbox_xpath_test.rb

@@ -24,52 +24,39 @@ class TC_Selectbox_XPath < Test::Unit::TestCase
   def test_select_list_getAllContents
     assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").getAllContents }  
     assert_equal( ["Option 1" ,"Option 2" , "Option 3" , "Option 4"] , 
-    browser.select_list(:xpath, "//select[@name='sel1']/").getAllContents)   
+    browser.select_list(:xpath, "//select[@name='sel1']/").options.map(&:text))
   end
   
   def test_select_list_getSelectedItems
     assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
     assert_equal( ["Option 3" ] , 
-    browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    browser.select_list(:xpath, "//select[@name='sel1']/").selected_options.map(&:text))
     assert_equal( ["Option 3" , "Option 6" ] , 
-    browser.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
+    browser.select_list(:xpath, "//select[@name='sel2']/").selected_options.map(&:text))
   end
   
   def test_clearSelection
-    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").clearSelection }  
-    browser.select_list(:xpath, "//select[@name='sel1']/").clearSelection
-    
-    if Watir::IE.version_parts[0].to_i >= 9
-      # ie9 allows you to clear a selected item even if it requires a selection
-      assert_equal( [] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)
-    else
-      # the box sel1 has no ability to have a de-selected item
-      assert_equal( ["Option 3" ] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)
-    end
-
     browser.select_list(:xpath, "//select[@name='sel2']/").clearSelection
-    assert_equal( [ ] , browser.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
+    assert_equal( [ ] , browser.select_list(:xpath, "//select[@name='sel2']/").selected_options.map(&:text))
   end
   
   def test_select_list_select
-    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
+    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").selected_options.map(&:text) }
     assert_raises(NoValueFoundException) { browser.select_list(:xpath, "//select[@name='sel1']/").select("missing item") }  
     assert_raises(NoValueFoundException) { browser.select_list(:xpath, "//select[@name='sel1']/").select(/missing/) }  
     
     # the select method keeps any currently selected items - use the clear selectcion method first
-    browser.select_list(:xpath, "//select[@name='sel1']/").clearSelection
     browser.select_list(:xpath, "//select[@name='sel1']/").select("Option 1")
-    assert_equal( ["Option 1" ] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    assert_equal( ["Option 1" ] , browser.select_list(:xpath, "//select[@name='sel1']/").selected_options.map(&:text))
     
-    browser.select_list(:xpath, "//select[@name='sel1']/").clearSelection
     browser.select_list(:xpath, "//select[@name='sel1']/").select(/2/)
-    assert_equal( ["Option 2" ] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    assert_equal( ["Option 2" ] , browser.select_list(:xpath, "//select[@name='sel1']/").selected_options.map(&:text))
     
     browser.select_list(:xpath, "//select[@name='sel2']/").clearSelection
     browser.select_list(:xpath, "//select[@name='sel2']/").select( /2/ )
     browser.select_list(:xpath, "//select[@name='sel2']/").select( /4/ )
     assert_equal( ["Option 2" , "Option 4" ] , 
-    browser.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
+    browser.select_list(:xpath, "//select[@name='sel2']/").selected_options.map(&:text))
     
     # these are to test the onchange event
     # the event shouldnt get fired, as this is the selected item
@@ -89,18 +76,16 @@ class TC_Selectbox_XPath < Test::Unit::TestCase
     assert_raises(NoValueFoundException) { browser.select_list(:xpath, "//select[@name='sel1']/").select_value(/missing/) }  
     
     # the select method keeps any currently selected items - use the clear selectcion method first
-    browser.select_list(:xpath, "//select[@name='sel1']/").clearSelection
     browser.select_list(:xpath, "//select[@name='sel1']/").select_value("o1")
-    assert_equal( ["Option 1" ] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    assert_equal( ["Option 1" ] , browser.select_list(:xpath, "//select[@name='sel1']/").selected_options.map(&:text))
     
-    browser.select_list(:xpath, "//select[@name='sel1']/").clearSelection
     browser.select_list(:xpath, "//select[@name='sel1']/").select_value(/2/)
-    assert_equal( ["Option 2" ] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    assert_equal( ["Option 2" ] , browser.select_list(:xpath, "//select[@name='sel1']/").selected_options.map(&:text))
     
     browser.select_list(:xpath, "//select[@name='sel2']/").clearSelection
     browser.select_list(:xpath, "//select[@name='sel2']/").select( /2/ )
     browser.select_list(:xpath, "//select[@name='sel2']/").select( /4/ )
-    assert_equal( ["Option 2" , "Option 4" ] , browser.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
+    assert_equal( ["Option 2" , "Option 4" ] , browser.select_list(:xpath, "//select[@name='sel2']/").selected_options.map(&:text))
     
     # these are to test the onchange event
     # the event shouldnt get fired, as this is the selected item

data/unittests/table_test.rb

@@ -58,8 +58,7 @@ class TC_Tables < Test::Unit::TestCase
   tag_method :test_row_counts, :fails_on_firefox
   def test_row_counts
     table = browser.table(:id => 't2')
-    assert_equal(3, table.row_count)
-    assert_equal(2, table.row_count_excluding_nested_tables)
+    assert_equal(2, table.row_count)
   end
 
   tag_method :test_dynamic_tables, :fails_on_firefox
@@ -82,25 +81,19 @@ class TC_Tables < Test::Unit::TestCase
     assert_equal(1, browser.table(:id, 't1').column_count)   # row one has 1 cell with a colspan of 2
   end
   
-  def test_to_a
-    expected = [ ["Row 1 Col1" , "Row 1 Col2"],
-                 [ "Row 2 Col1" , "Row 2 Col2"] ]
-    assert_equal(expected, browser.table(:index , 0).to_a)
-  end
-  
   def test_links_and_images_in_table
     table = browser.table(:id, 'pic_table')
     image = table[0][1].image(:index,0)
-    assert_equal("106", image.width)
+    assert_equal(106, image.width)
     
     link = table[0][3].link(:index,0)
-    assert_equal("Google", link.innerText)
+    assert_equal("Google", link.text)
   end
   
   def test_cell_directly
-    assert browser.cell(:id, 'cell1').exists?
-    assert ! browser.cell(:id, 'no_exist').exists?
-    assert_equal("Row 1 Col1", browser.cell(:id, 'cell1').to_s.strip)
+    assert browser.td(:id, 'cell1').exists?
+    assert ! browser.td(:id, 'no_exist').exists?
+    assert_equal("Row 1 Col1", browser.td(:id, 'cell1').to_s.strip)
   end
   
   def test_cell_another_way
@@ -108,11 +101,11 @@ class TC_Tables < Test::Unit::TestCase
   end
   
   def test_row_directly
-    assert browser.row(:id, 'row1').exists?
-    assert ! browser.row(:id, 'no_exist').exists?
+    assert browser.tr(:id, 'row1').exists?
+    assert ! browser.tr(:id, 'no_exist').exists?
   end
   def test_row_another_way
-    assert_equal('Row 2 Col1',  browser.row(:id, 'row1')[0].to_s.strip)
+    assert_equal('Row 2 Col1',  browser.tr(:id, 'row1')[0].to_s.strip)
   end
 
   tag_method :test_row_in_table, :fails_on_firefox
@@ -121,16 +114,6 @@ class TC_Tables < Test::Unit::TestCase
       browser.table(:id, 't1').row(:id, 'row1').text.gsub(/(\r|\n)/,'')
   end
   
-  def test_row_iterator
-    t = browser.table(:index, 0)
-    count = 1
-    t.each do |row|
-      assert("Row #{count} Col1", row[0].text)
-      assert("Row #{count} Col2", row[1].text)
-      count += 1
-    end
-  end
-  
   def test_row_collection
     t = browser.table(:index,0)
     t.rows.each_with_index do |row, i|
@@ -148,11 +131,11 @@ class TC_Tables < Test::Unit::TestCase
    
   tag_method :test_table_body, :fails_on_firefox
   def test_table_body
-    assert_equal(1, browser.table(:index, 0).bodies.length)
-    assert_equal(3, browser.table(:id, 'body_test').bodies.length)
+    assert_equal(1, browser.table(:index, 0).tbodys.length)
+    assert_equal(3, browser.table(:id, 'body_test').tbodys.length)
     
     count = 1
-    browser.table(:id, 'body_test').bodies.each do |n|
+    browser.table(:id, 'body_test').tbodys.each do |n|
       # do something better here!
       case count 
       when 1 
@@ -165,19 +148,8 @@ class TC_Tables < Test::Unit::TestCase
       assert_equal(compare_text, n[0][0].to_s.strip )   # this is the 1st cell of the first row of this particular body
       count += 1
     end
-    assert_equal( count - 1, browser.table(:id, 'body_test').bodies.length )
-    assert_equal( "This text is in the THIRD TBODY." ,browser.table(:id, 'body_test' ).body(:index,2)[0][0].to_s.strip ) 
-    
-    # iterate through all the rows in a table body
-    count = 1
-    browser.table(:id, 'body_test').body(:index, 1).each do | row |
-      if count == 1
-        assert_equal('This text is in the SECOND TBODY.', row[0].text.strip )
-      elsif count == 2
-        assert_equal("This text is also in the SECOND TBODY.", row[0].text.strip )        
-      end
-      count+=1
-    end
+    assert_equal( count - 1, browser.table(:id, 'body_test').tbodys.length )
+    assert_equal( "This text is in the THIRD TBODY." ,browser.table(:id, 'body_test' ).tbody(:index,2)[0][0].to_s.strip ) 
   end
   
   def test_table_container
@@ -265,30 +237,6 @@ class TC_Tables_Buttons < Test::Unit::TestCase
     assert_match(/3\.gif/, table[2][0].image(:index, 2).src)
   end
   
-  def test_table_with_hidden_or_visible_rows
-    t = browser.table(:id , 'show_hide')
-    
-    # expand the table
-    t.each do |r|
-      r[0].image(:src, /plus/).click if r[0].image(:src, /plus/).exists?
-    end
-    
-    # shrink rows 1,2,3
-    count = 1
-    t.each do |r|
-      r[0].image(:src, /minus/).click if r[0].image(:src, /minus/).exists? and (1..3) === count 
-      count = 2
-    end
-  end
-  
-  tag_method :test_table_from_element, :fails_on_firefox
-  def test_table_from_element
-    button = browser.button(:id, "b1")
-    table = Watir::Table.create_from_element(browser, button)
-    
-    table[1][0].button(:index, 0).click
-    assert(browser.text_field(:name, "confirmtext").verify_contains(/CLICK2/i))
-  end
 end
 
 class TC_Table_Columns < Test::Unit::TestCase
@@ -345,17 +293,4 @@ class TC_Tables_Complex < Test::Unit::TestCase
     assert_equal("subtable2 Row 1 Col1",table[1][0].table(:index,0)[0][0].text.strip)
   end
   
-  def test_each_itterator
-    # for WTR-324: keep Watir::Table.each from crashing when run on nested tables
-    table = browser.table(:index,0)
-    assert_equal(table.row_count, 4)
-    assert_equal(table.row_count_excluding_nested_tables, 2)
-    example_row_count = 0
-    assert_nothing_thrown do 
-      table.each do
-        example_row_count += 1
-      end
-    end
-    assert_equal(example_row_count, 2)
-  end
 end

data/unittests/textfields_test.rb

@@ -18,17 +18,12 @@ class TC_Fields < Test::Unit::TestCase
     assert(browser.text_field(:id, "text2").exists?)   
     assert_false(browser.text_field(:id, "alsomissing").exists?)   
     
-    assert(browser.text_field(:beforeText, "This Text After").exists? )
-    assert(browser.text_field(:afterText, "This Text Before").exists? )
-    
-    assert(browser.text_field(:beforeText, /after/i).exists? )
-    assert(browser.text_field(:afterText, /before/i).exists? )
     assert(browser.text_field(:value, 'foo').exists?)
   end
   
   tag_method :test_text_field_dragContentsTo, :fails_on_firefox
   def test_text_field_dragContentsTo
-    browser.text_field(:name, "text1").dragContentsTo(:id, "text2")
+    browser.text_field(:name, "text1").drag_contents_to(:id, "text2")
     assert_equal(browser.text_field(:name, "text1").value, "") 
     assert_equal(browser.text_field(:id, "text2").value, "goodbye allHello World") 
   end
@@ -61,34 +56,6 @@ class TC_Fields < Test::Unit::TestCase
     assert_equal("Hello World", browser.text_field(:name, "text1").value)  
   end
   
-  tag_method :test_text_field_to_s, :fails_on_firefox
-  def test_text_field_to_s
-    expected = [
-    build_to_s_regex("type", "text"),
-    build_to_s_regex("id", ""),
-    build_to_s_regex("name", "text1"),
-    build_to_s_regex("value", "Hello World"),
-    build_to_s_regex("disabled", "false"),
-    build_to_s_regex("length", "20"),
-    build_to_s_regex("max length", "20"),
-    build_to_s_regex("read only", "false")
-    ]
-    items = browser.text_field(:index, 0).to_s.split(/\n/)
-    expected.each_with_index{|regex, x| assert_match(regex, items[x]) }
-    expected[1] = build_to_s_regex("id", "text2")
-    expected[2] = build_to_s_regex("name", "")
-    expected[3] = build_to_s_regex("value", "goodbye all")
-    expected[6] = build_to_s_regex("max length", "2147483647")  
-      
-    items = browser.text_field(:index, 1).to_s.split(/\n/)
-    expected.each_with_index{|regex, x| assert_match(regex, items[x]) }
-    assert_raises(UnknownObjectException) { browser.text_field(:index, 999).to_s }  
-  end
-  
-  def build_to_s_regex(lhs, rhs)
-    Regexp.new("^#{lhs}: +#{rhs}$")
-  end
-  
   tag_method :test_text_field_append, :fails_on_firefox
   def test_text_field_append
     assert_raises(ObjectReadOnlyException) { browser.text_field(:id, "readOnly2").append("Some Text") }  
@@ -116,19 +83,19 @@ class TC_Fields < Test::Unit::TestCase
     assert_raises(UnknownObjectException) { browser.text_field(:index, 199).value }  
     assert_raises(UnknownObjectException) { browser.text_field(:index, 199).name }  
     assert_raises(UnknownObjectException) { browser.text_field(:index, 199).id }  
-    assert_raises(UnknownObjectException) { browser.text_field(:index, 199).disabled }  
+    assert_raises(UnknownObjectException) { browser.text_field(:index, 199).disabled? }  
     assert_raises(UnknownObjectException) { browser.text_field(:index, 199).type }  
     
     assert_equal("Hello World" , browser.text_field(:index, 0).value) 
     assert_equal("text"        , browser.text_field(:index, 0).type)
     assert_equal("text1"       , browser.text_field(:index, 0).name)
     assert_equal(""            , browser.text_field(:index, 0).id)
-    assert_equal(false         , browser.text_field(:index, 0).disabled)
+    assert_equal(false         , browser.text_field(:index, 0).disabled?)
     
     assert_equal(""            , browser.text_field(:index, 1).name)
     assert_equal("text2"       , browser.text_field(:index, 1).id)
     
-    assert(browser.text_field(:index, 3).disabled)
+    assert(browser.text_field(:index, 3).disabled?)
     
     assert_equal("This used to test :afterText", browser.text_field(:name, "aftertest").title)
     assert_equal("", browser.text_field(:index, 0).title)
@@ -176,8 +143,8 @@ class TC_Fields < Test::Unit::TestCase
   
   def test_labels_iterator
     assert_equal(3, browser.labels.length)
-    assert_equal('Label For this Field' , browser.labels[0].innerText.strip )
-    assert_equal('Password With ID ( the text here is a label for it )' , browser.labels[2].innerText )
+    assert_equal('Label For this Field' , browser.labels[0].text.strip )
+    assert_equal('Password With ID ( the text here is a label for it )' , browser.labels[2].text )
     
     count=0
     browser.labels.each do |l|
@@ -187,10 +154,8 @@ class TC_Fields < Test::Unit::TestCase
   end
   
   def test_label_properties
-    assert_raises(UnknownObjectException) { browser.label(:index,20).innerText } 
+    assert_raises(UnknownObjectException) { browser.label(:index,20).text } 
     assert_raises(UnknownObjectException) { browser.label(:index,20).for } 
-    assert_raises(UnknownObjectException) { browser.label(:index,20).name } 
-    assert_raises(UnknownObjectException) { browser.label(:index,20).type } 
     assert_raises(UnknownObjectException) { browser.label(:index,20).id } 
     
     assert_false(browser.label(:index,10).exists?) 
@@ -203,7 +168,7 @@ class TC_Fields < Test::Unit::TestCase
     
     assert_equal("label2", browser.label(:index,1).id )
     
-    assert_equal("Password With ID ( the text here is a label for it )" , browser.label(:index,2).innerText)
+    assert_equal("Password With ID ( the text here is a label for it )" , browser.label(:index,2).text)
     assert_equal("password1", browser.label(:index,2).for)
   end
 
@@ -216,8 +181,4 @@ class TC_Fields < Test::Unit::TestCase
     assert_equal(20, browser.text_field(:name, 'text1').maxlength)
   end
   
-  def test_additional_events
-    browser.text_field(:value, 'foo').set 'bar'
-	assert(browser.text_field(:value, 'bar').exists?)
-  end
 end

data/unittests/windows/attach_to_new_window_test.rb

@@ -23,14 +23,6 @@ class TC_NewWindow< Watir::TestCase
     ie_new.close
   end
   
-  def test_attach_to_new_window_using_separate_process
-    browser.eval_in_spawned_process "link(:text, 'New Window').click"
-    IE.attach_timeout = 6.0
-    ie_new = IE.attach(:title, 'Pass Page')
-    assert(ie_new.text.include?('PASS'))
-    ie_new.close
-  end
-  
   def test_attach_to_new_window_using_click_no_wait
     # this test is sometimes failing with a "Canvas does not allow drawing" error
     # this is with IE7. I think the problem could be with the highlighting of the