watir 3.0.0.rc2 → 3.0.0.rc3

data/unittests/ie_test.rb

@@ -22,16 +22,14 @@ class TC_ie < Test::Unit::TestCase
     assert_in_delta(wait_time, elapsed_time, 0.5)
   end
   
-  # is this correct? 
   def test_getLink_ByIndexReturnsNilOnNoLinks
-    assert_nil(@faked_ie.tagged_element_locator('A', :index, 0))
-    assert_nil(@faked_ie.tagged_element_locator('A', :index, 0))
+    assert_false(@faked_ie.link(:index, 0).exists?)
   end
   
   def test_getLink_ByBadHow
     @faked_ie.addLink "foo"
-    assert_raise(MissingWayOfFindingObjectException) do
-      @faked_ie.tagged_element_locator('A', :no_such_mechanism, "verifying error handling")
+    assert_raise(UnknownObjectException) do
+      @faked_ie.link(:no_such_mechanism, "verifying error handling").click
     end
   end
 
@@ -44,14 +42,12 @@ class TC_ie < Test::Unit::TestCase
     assert_equal "something else", browser.execute_script(script)
   end
   
-  # is this correct? 
   def test_getLink_ByUrlReturnsNilOnNoLinks
-    assert_nil(@faked_ie.tagged_element_locator('A', :url, "whatever"))
+    assert_false(@faked_ie.link(:url, "whatever").exists?)
   end
     
-  # is this correct? 
   def test_getLink_ByTextReturnsNilOnNoLinks
-    assert_nil(@faked_ie.tagged_element_locator('A', :text, "whatever"))
+    assert_false(@faked_ie.link(:text, "whatever").exists?)
   end
 
 end

data/unittests/images_test.rb

@@ -100,12 +100,12 @@ class TC_Images < Test::Unit::TestCase
     assert_equal( "square" , browser.image(:index, 1).id )
     assert_match( /square\.jpg/i ,browser.image(:index, 1).src )
     assert_equal( "" , browser.image(:index, 1).value )
-    assert_equal( "88" , browser.image(:index, 1).height )
-    assert_equal( "88" , browser.image(:index, 1).width )
+    assert_equal( 88 , browser.image(:index, 1).height )
+    assert_equal( 88 , browser.image(:index, 1).width )
     
     # this line fails, as the date is when it is installed on the local oc, not the date the file was really created
     #assert_equal( "03/10/2005" , browser.image(:index, 2).fileCreatedDate )
-    assert_equal( "788",  browser.image(:index, 1).fileSize )
+    assert_equal( 788,  browser.image(:index, 1).fileSize )
     
     # tool tips: alt text + title
     assert_equal('circle' , browser.image(:index, 5).alt) 
@@ -119,9 +119,9 @@ class TC_Images < Test::Unit::TestCase
   
   def test_image_iterator
     assert_equal(6 , browser.images.length)
-    assert_equal("" , browser.images[2].name )
-    assert_equal("square", browser.images[2].id )
-    assert_match(/square/, browser.images[2].src )
+    assert_equal("" , browser.images[1].name )
+    assert_equal("square", browser.images[1].id )
+    assert_match(/square/, browser.images[1].src )
     
     index = 0
     browser.images.each do |i|

data/unittests/index_specifier_test.rb

@@ -10,7 +10,6 @@ class TC_BaseIndex < Test::Unit::TestCase
 
   def test_default_index
     assert "one", browser.table.row.cell.class_name
-    assert "testcell", browser.table.row.cell.name
   end
 
   def test_zero_based_indexing

data/unittests/js_events_test.rb

@@ -1,6 +1,6 @@
 # feature tests for JavaScript events
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 require 'unittests/setup'
 
 class TC_JSEvents < Test::Unit::TestCase

data/unittests/links_multi_test.rb

@@ -31,18 +31,4 @@ class TC_Links_Multi < Test::Unit::TestCase
     assert_match(/papa.html/, browser.link(:class => 'Papa', :index => 1).href)
   end  
 
-  def test_not_found_single
-    exception = assert_raise(UnknownObjectException) do
-      browser.link(:id, 'Missing').href
-    end
-    assert_equal('Unable to locate element, using :id, "Missing"', exception.message)
-  end
-  
-  def test_not_found_with_multi
-    exception = assert_raise(UnknownObjectException) do
-      browser.link(:class => 'Missing', :index => 1).href
-    end
-    assert_equal('Unable to locate element, using {:class=>"Missing", :index=>1}', exception.message)
-  end
-  
 end

data/unittests/links_test.rb

@@ -13,12 +13,10 @@ class TC_Links < Test::Unit::TestCase
   
   tag_method :test_bad_attribute, :fails_on_firefox
   def test_bad_attribute
-    assert_raises(MissingWayOfFindingObjectException) { browser.link(:bad_attribute, 199).click }  
-    begin
-      browser.link(:bad_attribute, 199).click 
-    rescue MissingWayOfFindingObjectException => e           
-      assert_equal "bad_attribute is an unknown way of finding a <A> element (199)", e.to_s
-    end
+    browser.link(:bad_attribute, 199).click 
+    fail "#click should have raised an Exception!"
+  rescue MissingWayOfFindingObjectException => e           
+    assert_equal "bad_attribute is an unknown way of finding a <a> element (199)", e.to_s
   end
   
   def xtest_missing_links_dont_exist
@@ -46,12 +44,6 @@ class TC_Links < Test::Unit::TestCase
     assert(browser.link(:id, /_id/).exists?)   
     assert_false(browser.link(:id, /alsomissing/).exists?)   
     
-    assert(browser.link(:name, "link_name").exists?)   
-    assert_false(browser.link(:name, "alsomissing").exists?)   
-    
-    assert(browser.link(:name, /_n/).exists?)   
-    assert_false(browser.link(:name, /missing/).exists?)   
-    
     assert(browser.link(:title, /ti/).exists?)   
     assert(browser.link(:title, "link_title").exists?)   
     
@@ -79,25 +71,17 @@ class TC_Links < Test::Unit::TestCase
   
   def test_link_properties
     assert_raises(UnknownObjectException) { browser.link(:index, 199).href }  
-    assert_raises(UnknownObjectException) { browser.link(:index, 199).value}  
-    assert_raises(UnknownObjectException) { browser.link(:index, 199).innerText }  
-    assert_raises(UnknownObjectException) { browser.link(:index, 199).name }  
+    assert_raises(UnknownObjectException) { browser.link(:index, 199).text }  
     assert_raises(UnknownObjectException) { browser.link(:index, 199).id }  
-    assert_raises(UnknownObjectException) { browser.link(:index, 199).disabled }  
-    assert_raises(UnknownObjectException) { browser.link(:index, 199).type }  
     assert_raises(UnknownObjectException) { browser.link(:index, 199).class_name }  
     
     assert_match(/links2/ ,browser.link(:index, 0).href )
-    assert_equal(""      , browser.link(:index, 0).value)
-    assert_equal("test1" , browser.link(:index, 0).innerText )
-    assert_equal(""      , browser.link(:index, 0).name )
+    assert_equal("test1" , browser.link(:index, 0).text )
     assert_equal(""      , browser.link(:index, 0).id )
-    assert_equal(false   , browser.link(:index, 0).disabled )  
     assert_equal(""      , browser.link(:index, 0).class_name)
     assert_equal("link_class_1"      , browser.link(:index, 1).class_name)
     
     assert_equal("link_id"   , browser.link(:index, 5).id )
-    assert_equal("link_name" , browser.link(:index, 6).name )
     
     assert_equal("" , browser.link(:index, 6).title)
     
@@ -106,14 +90,13 @@ class TC_Links < Test::Unit::TestCase
   
   def test_link_iterator
     assert_equal(9, browser.links.length )
-    assert_equal("Link Using a name" , browser.links[6].innerText)
+    assert_equal("Link Using a name" , browser.links[6].text)
     
     index = 0
     browser.links.each do |link|
       assert_equal(browser.link(:index, index).href      , link.href )
       assert_equal(browser.link(:index, index).id        , link.id )
-      assert_equal(browser.link(:index, index).name      , link.name )
-      assert_equal(browser.link(:index, index).innerText , link.innerText )
+      assert_equal(browser.link(:index, index).text , link.text )
       index+=1
     end
   end
@@ -146,29 +129,3 @@ class TC_Frame_Links < Test::Unit::TestCase
     assert_equal( 9 , count)
   end    
 end
-
-class TC_showlinks < Test::Unit::TestCase
-  tags :fails_on_firefox
-  include CaptureIOHelper
-  
-  def test_showLinks
-    goto_page "links1.html"
-    actual = capture_stdout { browser.showLinks }
-    expected = [/^index name +id +href + text\/src$/,
-    get_path_regex(1, "links2.html", "test1"),
-    get_path_regex(2, "link_pass.html", "test1"),
-    get_path_regex(3, "pass3.html", " / file:///#{$myDir.downcase}/html/images/button.jpg"),
-    get_path_regex(4, "textarea.html", "new window"),
-    get_path_regex(5, "textarea.html", "new window"),
-    get_path_regex(6, "links1.html", "link using an id", "link_id"),
-    get_path_regex(7, "links1.html", "link using a name", "link_name"),
-    get_path_regex(8, "links1.html", "link using a title"),
-    get_path_regex(9, "pass.html", "image and a text link / file:///#{$myDir.downcase}/html/images/triangle.jpg")]
-    items = actual.split(/\n/).collect {|s| CGI.unescape(s.downcase.strip)}
-    expected.each_with_index{|regex, x| assert_match(regex, items[x])}
-  end
-  
-  def get_path_regex(idx, name, inner, nameid="")
-    Regexp.new("^#{idx} +#{nameid} +file:///#{$myDir.downcase}/html/#{name} *#{inner}$")
-  end
-end

data/unittests/lists_test.rb

@@ -15,18 +15,9 @@ class Lists_Tests < Watir::TestCase
     assert_equal('Coffee', browser.li(:index, 0).text)
   end
 
-  def test_list_item_exists_by_name
-    assert(browser.li(:name, 'x1').exists?)
-    assert ! (browser.li(:name, 'maptest02').exists?)
-  end  
-  
   def test_li_length
     assert_equal(6, browser.lis.length)
   end
   
-  def test_multiple_attributes
-    assert_equal('Phil', browser.li(:id => 'ordered1', :name => 'x1').text)
-  end
-
 end 
 

data/unittests/navigate_test.rb

@@ -29,7 +29,7 @@ class TC_Navigate < Test::Unit::TestCase
     browser.forward
     assert_equal("Test page for Check Boxes", browser.title)   
     browser.checkbox(:name, "box1").set
-    assert(browser.checkbox(:name, "box1").isSet?)   
+    assert(browser.checkbox(:name, "box1").set?)   
     
     browser.refresh
     # Not sure how we test this. Text fields and checkboxes dont get reset if you click the browser refresh button

data/unittests/nbsp_xpath_test.rb

@@ -10,7 +10,7 @@ class TC_Nbsp_Xpath < Test::Unit::TestCase
   end
   
   def test_nbsp
-  	div = browser.element_by_xpath("//div")
+  	div = browser.element(:xpath,"//div")
   	assert(div.innerText, "Hello world")
   end
 end

data/unittests/no_wait_test.rb

@@ -18,11 +18,11 @@ class TC_No_Wait_Commands < Test::Unit::TestCase
     }
   end
 
-  def test_set_no_wait_text_select_list
+  def test_select_no_wait_text_select_list
     goto_page "selectboxes1.html"
-    browser.select_list(:name,'sel1').set_no_wait(/Option 1/)
+    browser.select_list(:name,'sel1').select_no_wait(/Option 1/)
     assert_nothing_raised{
-      Watir::Wait.until {browser.select_list(:name , 'sel1').selected_options.first == 'Option 1'}
+      Watir::Wait.until {browser.select_list(:name , 'sel1').selected_options.first.text == 'Option 1'}
     }
   end
 end

data/unittests/parent_child_test.rb

@@ -24,21 +24,4 @@ class TC_Relative < Test::Unit::TestCase
     assert_not_nil catalog_entry.page_container
   end
     
-  tag_method :test_before_and_after, :fails_on_firefox
-  def test_before_and_after
-    link = browser.link(:class => 'addtocart', :index => 1)
-    assert_equal 'http://localhost:3000/store/add_to_cart/12', link.href  
-    assert(link.after?(@headline))
-    assert(@headline.before?(link))
-    assert !(link.before? @headline)
-    assert !(@headline.after? link)
-    assert !(link.after? link)
-  end   
-    
-  tag_method :test_find_after, :fails_on_firefox
-  def test_find_after
-    link = browser.link(:class => 'addtocart', :after? => @headline)
-    assert_equal 'http://localhost:3000/store/add_to_cart/12', link.href  
-  end
-    
 end

data/unittests/pre_test.rb

@@ -21,9 +21,6 @@ class TC_Pre < Test::Unit::TestCase
     assert( browser.pre( :id, /[3-9]/ ).exists? )
     assert_false( browser.pre( :id, /missing_pre/ ).exists? )
     assert_false( browser.pre( :id, 'missingPre' ).exists? )
-        
-    assert( browser.pre( :name, '3' ).exists? )
-    assert_false( browser.pre( :name, "name_missing" ).exists? )
   end
     
   def test_simple_access

data/unittests/radios_test.rb

@@ -40,44 +40,44 @@ class TC_Radios < Test::Unit::TestCase
   
   def test_onClick
     
-    assert_false(browser.radio(:name, "box5").isSet?)
+    assert_false(browser.radio(:name, "box5").set?)
     assert_false(browser.button(:value , "foo").enabled?)
     
     # first click the button is enabled and the radio is set
     browser.radio(:name => "box5", :value => 1).set
-    assert(browser.radio(:name => "box5", :value => 1).isSet?)
+    assert(browser.radio(:name => "box5", :value => 1).set?)
     assert(browser.radio(:name => "box5", :value => 1).checked?)    
     assert(browser.button(:value, "foo").enabled?)
     
     # second click the button is disabled and the radio is still set
     browser.radio(:name => "box5", :value => 1).set
-    assert(browser.radio(:name => "box5", :value => 1).isSet?)
+    assert(browser.radio(:name => "box5", :value => 1).set?)
     assert(browser.radio(:name => "box5", :value => 1).checked?)    
     assert_false(browser.button(:value, "foo").enabled?)
     
     # third click the button is enabled and the radio is still set
     browser.radio(:name => "box5", :value => 1).set
-    assert(browser.radio(:name => "box5", :value => 1).isSet?)
+    assert(browser.radio(:name => "box5", :value => 1).set?)
     assert(browser.radio(:name => "box5", :value => 1).checked?)
     assert(browser.button(:value, "foo").enabled?)
     
-    # click the radio with a value of 2 , button is disabled and the radio is still set
+    # click the radio with a value of 2 , button is disabled? and the radio is still set
     browser.radio(:name => "box5", :value => 2).set
-    assert_false(browser.radio(:name => "box5", :value => 1).isSet?)
+    assert_false(browser.radio(:name => "box5", :value => 1).set?)
     assert_false(browser.radio(:name => "box5", :value => 1).checked?)    
-    assert(browser.radio(:name => "box5", :value => 2).isSet?)
+    assert(browser.radio(:name => "box5", :value => 2).set?)
     assert(browser.radio(:name => "box5", :value => 2).checked?)    
     assert_false(browser.button(:value, "foo").enabled?)
   end
   
   def test_Radio_isSet
-    assert_raises(UnknownObjectException) { browser.radio(:name, "noName").isSet?  }  
+    assert_raises(UnknownObjectException) { browser.radio(:name, "noName").set?  }  
     
-    assert_false(browser.radio(:name, "box1").isSet?)   
-    assert( browser.radio(:name, "box3").isSet?)   
-    assert_false(browser.radio(:name, "box2").isSet?)   
-    assert( browser.radio(:name => "box4", :value => 1).isSet?)   
-    assert_false(browser.radio(:name => "box4", :value => 2).isSet?)  
+    assert_false(browser.radio(:name, "box1").set?)   
+    assert( browser.radio(:name, "box3").set?)   
+    assert_false(browser.radio(:name, "box2").set?)   
+    assert( browser.radio(:name => "box4", :value => 1).set?)   
+    assert_false(browser.radio(:name => "box4", :value => 2).set?)  
 
     assert_false(browser.radio(:name, "box1").checked?)   
     assert( browser.radio(:name, "box3").checked?)   
@@ -90,42 +90,31 @@ class TC_Radios < Test::Unit::TestCase
     assert_raises(UnknownObjectException) {   browser.radio(:name, "noName").clear  }  
     
     browser.radio(:name, "box1").clear
-    assert_false(browser.radio(:name, "box1").isSet?)   
+    assert_false(browser.radio(:name, "box1").set?)   
     
     assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   browser.radio(:name, "box2").clear  } 
-    assert_false(browser.radio(:name, "box2").isSet?)   
+    assert_false(browser.radio(:name, "box2").set?)   
     
     browser.radio(:name, "box3").clear
-    assert_false(browser.radio(:name, "box3").isSet?)   
+    assert_false(browser.radio(:name, "box3").set?)   
     
     browser.radio(:name => "box4", :value => 1).clear
-    assert_false(browser.radio(:name => "box4", :value => 1).isSet?)   
-  end
-  
-  def test_radio_getState
-    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   browser.radio(:name, "noName").getState  }  
-    
-    assert_equal( false , browser.radio(:name, "box1").getState )   
-    assert_equal( true , browser.radio(:name, "box3").getState)   
-    
-    # radioes that have the same name but different values
-    assert_equal( false , browser.radio(:name => "box4", :value => 2).getState )   
-    assert_equal( true , browser.radio(:name => "box4", :value => 1).getState)   
+    assert_false(browser.radio(:name => "box4", :value => 1).set?)   
   end
   
   def test_radio_set
     assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   browser.radio(:name, "noName").set  }  
     browser.radio(:name, "box1").set
-    assert(browser.radio(:name, "box1").isSet?)   
+    assert(browser.radio(:name, "box1").set?)   
     
     assert_raises(ObjectDisabledException, "ObjectDisabledException was supposed to be thrown" ) {   browser.radio(:name, "box2").set  }  
     
     browser.radio(:name, "box3").set
-    assert(browser.radio(:name, "box3").isSet?)   
+    assert(browser.radio(:name, "box3").set?)   
     
     # radioes that have the same name but different values
     browser.radio(:name => "box4", :value => 3).set
-    assert(browser.radio(:name => "box4", :value => 3).isSet?)   
+    assert(browser.radio(:name => "box4", :value => 3).set?)   
   end
   
   def test_radio_properties
@@ -133,7 +122,7 @@ class TC_Radios < Test::Unit::TestCase
     assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   browser.radio(:index, 199).value}  
     assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   browser.radio(:index, 199).name }  
     assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   browser.radio(:index, 199).id }  
-    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   browser.radio(:index, 199).disabled }  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   browser.radio(:index, 199).disabled? }  
     assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   browser.radio(:index, 199).type }  
     
     assert_equal("on"   ,    browser.radio(:index, 0).value)  
@@ -141,8 +130,8 @@ class TC_Radios < Test::Unit::TestCase
     assert_equal(""     ,    browser.radio(:index, 0).id )  
     assert_equal("radio",    browser.radio(:index, 0).type )  
     
-    assert_equal( false, browser.radio(:index, 0).disabled )
-    assert_equal( true,  browser.radio(:index, 2).disabled )
+    assert_equal( false, browser.radio(:index, 0).disabled? )
+    assert_equal( true,  browser.radio(:index, 2).disabled? )
     
     assert_equal("box5"  ,    browser.radio(:index, 1).id )  
     assert_equal(""      ,    browser.radio(:index, 1).name )  
@@ -154,15 +143,15 @@ class TC_Radios < Test::Unit::TestCase
   def test_radio_iterators
     assert_equal(13, browser.radios.length)
     assert_equal("box5" , browser.radios[1].id )
-    assert_equal(true ,  browser.radios[2].disabled )
-    assert_equal(false ,  browser.radios[0].disabled )
+    assert_equal(true ,  browser.radios[2].disabled? )
+    assert_equal(false ,  browser.radios[0].disabled? )
     
     index = 0
     browser.radios.each do |r|
       assert_equal( browser.radio(:index, index).name , r.name )
       assert_equal( browser.radio(:index, index).id , r.id )
       assert_equal( browser.radio(:index, index).value, r.value)
-      assert_equal( browser.radio(:index, index).disabled , r.disabled )
+      assert_equal( browser.radio(:index, index).disabled? , r.disabled? )
       index+=1
     end
     assert_equal(index, browser.radios.length)
@@ -177,15 +166,15 @@ class TC_Radios < Test::Unit::TestCase
     assert(milk.exists?)
 
     milk.set
-    assert(milk.isSet?)   
-    assert_false(tea.isSet?)   
+    assert(milk.set?)   
+    assert_false(tea.set?)   
 
     tea.set
-    assert_false(milk.isSet?)   
-    assert(tea.isSet?)   
+    assert_false(milk.set?)   
+    assert(tea.set?)   
 
     tea.clear
-    assert_false(tea.isSet?)
+    assert_false(tea.set?)
   end
 
 end