watir 1.5.6 → 1.6.2

data/unittests/links_xpath_test.rb

@@ -1,7 +1,7 @@
 # feature tests for Links
-# 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_Links_XPath < Test::Unit::TestCase
@@ -11,28 +11,28 @@ class TC_Links_XPath < Test::Unit::TestCase
   end
   
   def test_link_exists
-    assert($ie.link(:xpath, "//a[contains(.,'test1')]/").exists?)
-    assert($ie.link(:xpath, "//a[contains(., /TEST/i)]/").exists?)   
-    assert(!$ie.link(:xpath, "//a[contains(.,'missing')]/").exists?)
+    assert(browser.link(:xpath, "//a[contains(.,'test1')]/").exists?)
+    assert(browser.link(:xpath, "//a[contains(., /TEST/i)]/").exists?)   
+    assert_false(browser.link(:xpath, "//a[contains(.,'missing')]/").exists?)
     
-    assert(!$ie.link(:xpath, "//a[@url='alsomissing.html']/").exists?)
+    assert_false(browser.link(:xpath, "//a[@url='alsomissing.html']/").exists?)
     
-    assert($ie.link(:xpath, "//a[@id='link_id']/").exists?)
-    assert(!$ie.link(:xpath, "//a[@id='alsomissing']/").exists?)
+    assert(browser.link(:xpath, "//a[@id='link_id']/").exists?)
+    assert_false(browser.link(:xpath, "//a[@id='alsomissing']/").exists?)
     
-    assert($ie.link(:xpath, "//a[@name='link_name']/").exists?)
-    assert(!$ie.link(:xpath, "//a[@name='alsomissing']/").exists?)
-    assert($ie.link(:xpath, "//a[@title='link_title']/").exists?)
+    assert(browser.link(:xpath, "//a[@name='link_name']/").exists?)
+    assert_false(browser.link(:xpath, "//a[@name='alsomissing']/").exists?)
+    assert(browser.link(:xpath, "//a[@title='link_title']/").exists?)
   end
   
   def test_link_click
-    $ie.link(:xpath, "//a[contains(.,'test1')]/").click
-    assert($ie.text.include?("Links2-Pass"))
+    browser.link(:xpath, "//a[contains(.,'test1')]/").click
+    assert(browser.text.include?("Links2-Pass"))
   end
   
   def test_link_with_text_call
-    $ie.link(:xpath, "//a[text()='test1']").click
-    assert($ie.text.include?("Links2-Pass"))
+    browser.link(:xpath, "//a[text()='test1']").click
+    assert(browser.text.include?("Links2-Pass"))
   end
   
 end

data/unittests/lists_test.rb

@@ -1,4 +1,4 @@
-$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 Lists_Tests < Watir::TestCase
@@ -8,24 +8,24 @@ class Lists_Tests < Watir::TestCase
   end        
 
   def test_list_items_exist
-    assert($ie.li(:id, 'list1').exists?)
-    assert($ie.li(:id, 'list2').exists?)
-    assert($ie.li(:id, 'list3').exists?)    
-    assert($ie.li(:id, 'ordered1').exists?)    
-    assert_equal('Coffee', $ie.li(:index, 1).text)
+    assert(browser.li(:id, 'list1').exists?)
+    assert(browser.li(:id, 'list2').exists?)
+    assert(browser.li(:id, 'list3').exists?)    
+    assert(browser.li(:id, 'ordered1').exists?)    
+    assert_equal('Coffee', browser.li(:index, 1).text)
   end
 
   def test_list_item_exists_by_name
-    assert($ie.li(:name, 'x1').exists?)
-    assert ! ($ie.li(:name, 'maptest02').exists?)
+    assert(browser.li(:name, 'x1').exists?)
+    assert ! (browser.li(:name, 'maptest02').exists?)
   end  
   
   def test_li_length
-    assert_equal(6, $ie.lis.length)
+    assert_equal(6, browser.lis.length)
   end
   
   def test_multiple_attributes
-    assert_equal('Phil', $ie.li(:id => 'ordered1', :name => 'x1').text)
+    assert_equal('Phil', browser.li(:id => 'ordered1', :name => 'x1').text)
   end
 
 end 

data/unittests/map_test.rb

@@ -1,97 +1,97 @@
-$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 Map_Tests < Watir::TestCase
   
   def setup
     goto_page 'map_test.html'
   end        
-
+  
   def test_01
     assert_contains_text "Test Page for Map Tests"
   end
-    
+  
   def test_map_exists_by_name
-    assert($ie.map(:name, 'maptest01').exists?)
-    assert ! ($ie.map(:name, 'maptest03').exists?)
+    assert(browser.map(:name, 'maptest01').exists?)
+    assert ! (browser.map(:name, 'maptest03').exists?)
   end  
   
   def test_map_exists_by_id
-    assert($ie.map(:id, 'maptestid01').exists?)
-    assert ! ($ie.map(:id, 'maptestid03').exists?)
+    assert(browser.map(:id, 'maptestid01').exists?)
+    assert ! (browser.map(:id, 'maptestid03').exists?)
   end  
-
+  
   def test_map_area_exists_by_href
-    assert($ie.area(:url, /pass.html/).exists?)
-    assert($ie.area(:url, /simple_table_buttons.html/).exists?)
-    assert($ie.area(:url, /images1.html/).exists?)
-    assert ! ($ie.area(:url, /blobs.html/).exists?)
-    assert($ie.map(:name, 'maptest01').area(:url, /pass.html/).exists?)
-    assert($ie.map(:id, 'maptestid01').area(:url, /images1.html/).exists?)
+    assert(browser.area(:url, /pass.html/).exists?)
+    assert(browser.area(:url, /simple_table_buttons.html/).exists?)
+    assert(browser.area(:url, /images1.html/).exists?)
+    assert ! (browser.area(:url, /blobs.html/).exists?)
+    assert(browser.map(:name, 'maptest01').area(:url, /pass.html/).exists?)
+    assert(browser.map(:id, 'maptestid01').area(:url, /images1.html/).exists?)
   end
   
   def test_map_area_exists_by_alt
-    assert($ie.area(:alt, 'Pass').exists?)
-    assert($ie.area(:alt, 'Table Buttons').exists?)
-    assert($ie.area(:alt, 'Images').exists?)
-    assert ! ($ie.area(:alt, 'Blobs').exists?)
-    assert($ie.map(:name, 'maptest01').area(:alt, 'Pass').exists?)
-    assert($ie.map(:id, 'maptestid01').area(:alt, 'Table Buttons').exists?)
+    assert(browser.area(:alt, 'Pass').exists?)
+    assert(browser.area(:alt, 'Table Buttons').exists?)
+    assert(browser.area(:alt, 'Images').exists?)
+    assert ! (browser.area(:alt, 'Blobs').exists?)
+    assert(browser.map(:name, 'maptest01').area(:alt, 'Pass').exists?)
+    assert(browser.map(:id, 'maptestid01').area(:alt, 'Table Buttons').exists?)
   end
-
+  
   def test_map_area_click
-    $ie.area(:alt, 'Table Buttons').click
-	assert_contains_text "This table has 3 images"
-    $ie.back
-	assert_contains_text "Test Page for Map Tests"
-    $ie.area(:alt, 'Pass').click
-	assert_contains_text "PASS"
-    $ie.back
-	assert_contains_text "Test Page for Map Tests"
-    $ie.area(:alt, 'Images').click
-	assert_contains_text "The triangle only has"
-    $ie.back  
-	assert_contains_text "Test Page for Map Tests"
-    $ie.area(:url, /simple_table_buttons.html/).click
-	assert_contains_text "This table has 3 images"
-    $ie.back
-	assert_contains_text "Test Page for Map Tests"
-    $ie.area(:url, /pass.html/).click
-	assert_contains_text "PASS"
-    $ie.back
-	assert_contains_text "Test Page for Map Tests"
-    $ie.area(:url, /images1.html/).click
-	assert_contains_text "The triangle only has"
-    $ie.back  
-	assert_contains_text "Test Page for Map Tests"
-    $ie.map(:name, 'maptest01').area(:alt, 'Table Buttons').click
-	assert_contains_text "This table has 3 images"
-    $ie.back
-	assert_contains_text "Test Page for Map Tests"
-    $ie.map(:id, 'maptestid01').area(:alt, 'Pass').click
-	assert_contains_text "PASS"
-    $ie.back
-	assert_contains_text "Test Page for Map Tests"
-    $ie.map(:name, 'maptest01').area(:url, /pass.html/).click
-	assert_contains_text "PASS"
-    $ie.back
-	assert_contains_text "Test Page for Map Tests"
-    $ie.map(:id, 'maptestid01').area(:url, /images1.html/).click
-	assert_contains_text "The triangle only has"
-    $ie.back  
-	assert_contains_text "Test Page for Map Tests"
+    browser.area(:alt, 'Table Buttons').click
+    assert_contains_text "This table has 3 images"
+    browser.back
+    assert_contains_text "Test Page for Map Tests"
+    browser.area(:alt, 'Pass').click
+    assert_contains_text "PASS"
+    browser.back
+    assert_contains_text "Test Page for Map Tests"
+    browser.area(:alt, 'Images').click
+    assert_contains_text "The triangle only has"
+    browser.back  
+    assert_contains_text "Test Page for Map Tests"
+    browser.area(:url, /simple_table_buttons.html/).click
+    assert_contains_text "This table has 3 images"
+    browser.back
+    assert_contains_text "Test Page for Map Tests"
+    browser.area(:url, /pass.html/).click
+    assert_contains_text "PASS"
+    browser.back
+    assert_contains_text "Test Page for Map Tests"
+    browser.area(:url, /images1.html/).click
+    assert_contains_text "The triangle only has"
+    browser.back  
+    assert_contains_text "Test Page for Map Tests"
+    browser.map(:name, 'maptest01').area(:alt, 'Table Buttons').click
+    assert_contains_text "This table has 3 images"
+    browser.back
+    assert_contains_text "Test Page for Map Tests"
+    browser.map(:id, 'maptestid01').area(:alt, 'Pass').click
+    assert_contains_text "PASS"
+    browser.back
+    assert_contains_text "Test Page for Map Tests"
+    browser.map(:name, 'maptest01').area(:url, /pass.html/).click
+    assert_contains_text "PASS"
+    browser.back
+    assert_contains_text "Test Page for Map Tests"
+    browser.map(:id, 'maptestid01').area(:url, /images1.html/).click
+    assert_contains_text "The triangle only has"
+    browser.back  
+    assert_contains_text "Test Page for Map Tests"
   end
   
   def test_maps
-    assert_equal(2, $ie.maps.length)
+    assert_equal(2, browser.maps.length)
   end
   
   def test_areas
-    assert_equal(3, $ie.map(:index, 2).areas.length)
+    assert_equal(3, browser.map(:index, 2).areas.length)
   end
   
   def assert_contains_text text
-    assert($ie.contains_text(text))
+    assert(browser.contains_text(text))
   end
   
 end # class Map_Tests

data/unittests/minmax_test.rb

@@ -1,29 +1,30 @@
 # feature tests for minimizing and maximizing IE windows
-# revision: $Revision: 1348 $
+# revision: $Revision: 1431 $
 
-$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_MinMax< Test::Unit::TestCase
+  tags :must_be_visible
   def setup
     goto_page 'pass.html'
   end        
   def teardown
-    $ie.restore
+    browser.restore
   end
   def test_minimimum
-    $ie.minimize
+    browser.minimize
   end
   def test_maximum
-    $ie.maximize
+    browser.maximize
   end
   def test_front
-    assert $ie.front?
+    assert browser.front?
     ie2 = Watir::IE.start($htmlRoot + 'blankpage.html')
     assert ie2.front?
-    assert ! $ie.front?
-    $ie.bring_to_front
-    assert $ie.front?
+    assert ! browser.front?
+    browser.bring_to_front
+    assert browser.front?
     ie2.close
   end
 end

data/unittests/navigate_test.rb

@@ -1,42 +1,38 @@
 # feature tests for navigation
-# revision: $Revision: 1348 $
+# revision: $Revision: 1470 $
 
-$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'
 require 'cgi'
 
 class TC_Navigate < Test::Unit::TestCase
-  
+  tags :fails_on_firefox
   def test_navigation
-    $ie.clear_url_list
+    browser.clear_url_list
     goto_page 'buttons1.html'
-    url = $ie.url.downcase
-    url = CGI::unescape url 
-    assert_equal(($htmlRoot + 'buttons1.html').downcase, url)  # sometimes we get capital drive letters 
+    assert_equal(($htmlRoot + 'buttons1.html').gsub(" ","%20").downcase, browser.url.downcase)  
 
-    assert_equal(1, $ie.url_list.length)
-    assert_equal(url, $ie.url_list[0].downcase)
+    assert_equal(1, browser.url_list.length)
+    assert_equal(browser.url, browser.url_list[0])
     
     goto_page 'checkboxes1.html'
-    url = $ie.url.downcase   
-    url = CGI::unescape url 
-    assert_equal("Test page for Check Boxes", $ie.title) 
+    assert_equal("Test page for Check Boxes", browser.title) 
 
-    assert_equal(2, $ie.url_list.length)
-    assert_equal(url, $ie.url_list[1].downcase)
+    assert_equal(2, browser.url_list.length)
+    assert_equal(browser.url, browser.url_list[1])
     
-    $ie.clear_url_list
-    assert_equal(0, $ie.url_list.length )
+    browser.clear_url_list
+    assert_equal(0, browser.url_list.length )
     
-    $ie.back
-    assert_equal("Test page for buttons", $ie.title)   
+    browser.back
+    assert_equal("Test page for buttons", browser.title)   
     
-    $ie.forward
-    assert_equal("Test page for Check Boxes", $ie.title)   
-    $ie.checkbox(:name, "box1").set
-    assert($ie.checkbox(:name, "box1").isSet?)   
+    browser.forward
+    assert_equal("Test page for Check Boxes", browser.title)   
+    browser.checkbox(:name, "box1").set
+    assert(browser.checkbox(:name, "box1").isSet?)   
     
-    $ie.refresh
+    browser.refresh
     # Not sure how we test this. Text fields and checkboxes dont get reset if you click the browser refresh button
     # -- this could be tested with the add-row page.
   end

data/unittests/nbsp_xpath_test.rb

@@ -1,7 +1,7 @@
 # feature tests for Tables
 # revision: $Revision: 1076 $
 
-$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_Nbsp_Xpath < Test::Unit::TestCase
@@ -11,7 +11,7 @@ class TC_Nbsp_Xpath < Test::Unit::TestCase
   end
   
   def test_nbsp
-  	div = $ie.element_by_xpath("//div")
+  	div = browser.element_by_xpath("//div")
   	assert(div.innerText, "Hello world")
   end
 end

data/unittests/non_core_tests.rb

@@ -4,6 +4,9 @@ $LOAD_PATH.unshift TOPDIR
 require 'unittests/setup.rb'
 
 Dir.chdir TOPDIR
-$non_core_tests.each {|x| require x}
-
+$all_tests.each {|x| require x}
 
+Watir::UnitTest.filter = proc do |test|
+  test.class.to_s !~ /xpath/i &&
+  test.class.tags.include?(:must_be_visible) 
+end

data/unittests/other/WindowLogonExample.rb

@@ -1,4 +1,4 @@
-$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'
 require 'watir/WindowHelper'
 
@@ -6,7 +6,7 @@ class TC_Logon_Test < Test::Unit::TestCase
   include Watir
   
   def goto_windows_login_page
-    $ie.goto('http://clio.lyris.com/')
+    browser.goto('http://clio.lyris.com/')
   end
   
   

data/unittests/other/WindowLogonExtra.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 
 require 'watir/WindowHelper'
 

data/unittests/other/navigate_exception_test.rb

@@ -1,14 +1,25 @@
 # feature tests for navigation errors
 # revision: $Revision: 958 $
 
-$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'
+require 'watir/contrib/page_checker' 
+#  To add checkers, call the ie.add_checker method
+#
+#  ie.
 
 class TC_NavigateException < Test::Unit::TestCase
   include Watir
   
+  def setup
+    browser.add_checker(PageCheckers::NAVIGATION_CHECKER)
+  end
+  def teardown
+    browser.disable_checker(PageCheckers::NAVIGATION_CHECKER)
+  end
+  
   def test_http_errors
-    assert_raises(NavigationException) { $ie.goto('http://localhost:3001') }        # Cannot find server or DNS Error
-    assert_raises(NavigationException) { $ie.goto('http://www.fxruby.org/dfdf' ) }  # HTTP 404 - File not found
+    assert_raises(NavigationException) { browser.goto('http://localhost:3001') }        # Cannot find server or DNS Error
+    assert_raises(NavigationException) { browser.goto('http://www.fxruby.org/dfdf' ) }  # HTTP 404 - File not found
   end
 end

data/unittests/other/screen_capture_test.rb

@@ -1,17 +1,18 @@
 # feature tests for screen capture
 # revision: $Revision:1338 $
 
-$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'
 require 'watir/screen_capture'
 
 class TC_Capture< Test::Unit::TestCase
+  tags :must_be_visible
   include Watir
   include Watir::ScreenCapture
   
   def setup
     delete_captured_files( [ 'jpeg1.jpg' , 'jpeg2.jpg' , 'bmp1.bmp', 'bmp2.bmp' ] )
-    $ie.goto($htmlRoot + 'buttons1.html' )
+    browser.goto($htmlRoot + 'buttons1.html' )
     @file_list = []       
   end