watir 1.5.4 → 1.5.5

data/unittests/links_xpath_test.rb

@@ -1,14 +1,13 @@
 # feature tests for Links
-# revision: $Revision: 975 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Links_XPath < Test::Unit::TestCase
-  include Watir
   
   def setup
-    $ie.goto($htmlRoot + "links1.html")
+    goto_page "links1.html"
   end
   
   def test_link_exists

data/unittests/lists_test.rb

@@ -2,10 +2,9 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
   
 class Lists_Tests < Watir::TestCase
-  include Watir
   
   def setup
-    $ie.goto($htmlRoot + 'lists.html')
+    goto_page 'lists.html'
   end        
 
   def test_list_items_exist
@@ -17,13 +16,17 @@ class Lists_Tests < Watir::TestCase
   end
 
   def test_list_item_exists_by_name
-    assert($ie.li(:name, 'l1').exists?)
+    assert($ie.li(:name, 'x1').exists?)
     assert ! ($ie.li(:name, 'maptest02').exists?)
   end  
   
   def test_li_length
     assert_equal(6, $ie.lis.length)
   end
+  
+  def test_multiple_attributes
+    assert_equal('Phil', $ie.li(:id => 'ordered1', :name => 'x1').text)
+  end
 
 end 
 

data/unittests/map_test.rb

@@ -2,10 +2,9 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
   
 class Map_Tests < Watir::TestCase
-  include Watir
   
   def setup
-    $ie.goto($htmlRoot + 'map_test.html')
+    goto_page 'map_test.html'
   end        
 
   def test_01

data/unittests/minmax_test.rb

@@ -1,13 +1,12 @@
 # feature tests for minimizing and maximizing IE windows
-# revision: $Revision: 958 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_MinMax< Test::Unit::TestCase
-  include Watir
   def setup
-    $ie.goto($htmlRoot + 'pass.html')
+    goto_page 'pass.html'
   end        
   def teardown
     $ie.restore
@@ -20,9 +19,9 @@ class TC_MinMax< Test::Unit::TestCase
   end
   def test_front
     assert $ie.front?
-    ie2 = IE.start($htmlRoot + 'blankpage.html')
+    ie2 = Watir::IE.start($htmlRoot + 'blankpage.html')
     assert ie2.front?
-    assert_false $ie.front?
+    assert ! $ie.front?
     $ie.bring_to_front
     assert $ie.front?
     ie2.close

data/unittests/navigate_test.rb

@@ -1,48 +1,43 @@
 # feature tests for navigation
-# revision: $Revision: 1277 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 require 'cgi'
 
 class TC_Navigate < Test::Unit::TestCase
-  include Watir
-  
-  def goto_page(a)
-    $ie.goto($htmlRoot + a)
-  end
   
   def test_navigation
     $ie.clear_url_list
-    goto_page('buttons1.html')
-    url = $ie.url.downcase.gsub('///' , '//') # no idea why this happens - we get 3 / after file:
-    url = CGI::unescape(url)    # url is encoded so we need to 
-    assert_equal(url.downcase, ($htmlRoot + 'buttons1.html' ).downcase )  # sometimes we get capital drive letters 
-    
+    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(1, $ie.url_list.length)
-    assert_equal(url, $ie.url_list[0].gsub('\\', '/').downcase)
+    assert_equal(url, $ie.url_list[0].downcase)
     
-    goto_page('checkboxes1.html')
-    url = $ie.url.downcase.gsub('///' , '//')   # no idea why this happens - we get 3 / after file:
-    url = CGI::unescape(url)    # url is encoded so we need to 
-    
-    assert_equal($ie.title, "Test page for Check Boxes") 
+    goto_page 'checkboxes1.html'
+    url = $ie.url.downcase   
+    url = CGI::unescape url 
+    assert_equal("Test page for Check Boxes", $ie.title) 
+
     assert_equal(2, $ie.url_list.length)
-    assert_equal(url, $ie.url_list[1].gsub('\\', '/').downcase)
+    assert_equal(url, $ie.url_list[1].downcase)
     
     $ie.clear_url_list
     assert_equal(0, $ie.url_list.length )
     
     $ie.back
-    assert_equal($ie.title , "Test page for buttons")   
+    assert_equal("Test page for buttons", $ie.title)   
     
     $ie.forward
-    assert_equal($ie.title , "Test page for Check Boxes")   
-    
-    $ie.checkBox(:name, "box1").set
-    assert($ie.checkBox(:name, "box1").isSet?)   
+    assert_equal("Test page for Check Boxes", $ie.title)   
+    $ie.checkbox(:name, "box1").set
+    assert($ie.checkbox(:name, "box1").isSet?)   
     
     $ie.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
 end

data/unittests/nbsp_xpath_test.rb

@@ -4,15 +4,14 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
-class TC_Tables < Test::Unit::TestCase
-  include Watir
+class TC_Nbsp_Xpath < Test::Unit::TestCase
   
   def setup
-    $ie.goto($htmlRoot + "xpath_nbsp.html")
+    goto_page "xpath_nbsp.html"
   end
   
   def test_nbsp
-	div = $ie.element_by_xpath("//div")
-	assert(div.innerText, "Hello world")
+  	div = $ie.element_by_xpath("//div")
+  	assert(div.innerText, "Hello world")
   end
 end

data/unittests/{screen_capture_test.rb → other/screen_capture_test.rb}

@@ -1,5 +1,5 @@
 # feature tests for screen capture
-# revision: $Revision: 958 $
+# revision: $Revision:1338 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'

data/unittests/pagecontainstext_test.rb

@@ -1,14 +1,13 @@
 # feature tests for IE::contains_text
-# revision: $Revision: 1100 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_contains_text < Test::Unit::TestCase
-  include Watir
   
   def setup
-    $ie.goto($htmlRoot + "textsearch.html")
+    goto_page "textsearch.html"
   end        
   
   def test_text_found
@@ -60,7 +59,7 @@ end
 
 class TC_contains_text_in_frame < Test::Unit::TestCase
   def setup
-    $ie.goto($htmlRoot + "frame_links.html")
+    goto_page "frame_links.html"
   end        
   def test_in_frame
     assert $ie.frame('linkFrame').contains_text('The button is really a link')

data/unittests/parent_child_test.rb

@@ -6,7 +6,7 @@ require 'unittests/setup'
 class TC_Relative < Test::Unit::TestCase
   
   def setup
-    $ie.goto($htmlRoot + "depot_store.html")
+    goto_page "depot_store.html"
     @headline = $ie.h3(:text, 'Pragmatic Version Control')
   end
   

data/unittests/pre_test.rb

@@ -1,14 +1,13 @@
 # feature tests for Pre
-# revision: $Revision: 962 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Pre < Test::Unit::TestCase
-  include Watir
   
   def setup
-    $ie.goto($htmlRoot + "pre.html")
+    goto_page "pre.html"
   end
   
   def test_Pre_Count

data/unittests/radios_test.rb

@@ -1,14 +1,14 @@
 # feature tests for Radio Buttons
-# revision: $Revision: 1164 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Radios < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "radioButtons1.html")
+    goto_page "radioButtons1.html"
   end
   
   def test_Radio_Exists
@@ -23,15 +23,12 @@ class TC_Radios < Test::Unit::TestCase
     assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").class_name }  
     assert_equal("radio_style" , $ie.radio(:name, "box1").class_name)   
     assert_equal("" , $ie.radio(:id, "box5").class_name)   
-    
-    
-    
   end
   
   def test_Radio_Enabled
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").enabled?  }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:id, "noName").enabled?  }  
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "box4" , 6).enabled?  }  
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").enabled?  }  
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:id, "noName").enabled?  }  
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "box4" , 6).enabled?  }  
     
     assert(!$ie.radio(:name, "box2").enabled?)   
     assert($ie.radio(:id, "box5").enabled?)   
@@ -107,7 +104,7 @@ class TC_Radios < Test::Unit::TestCase
   end
   
   def test_radio_getState
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").getState  }  
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").getState  }  
     
     assert_equal( false , $ie.radio(:name, "box1").getState )   
     assert_equal( true , $ie.radio(:name, "box3").getState)   
@@ -118,7 +115,7 @@ class TC_Radios < Test::Unit::TestCase
   end
   
   def test_radio_set
-    assert_raises(UnknownObjectException , "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").set  }  
+    assert_raises(UnknownObjectException, "UnknownObjectException was supposed to be thrown" ) {   $ie.radio(:name, "noName").set  }  
     $ie.radio(:name, "box1").set
     assert($ie.radio(:name, "box1").isSet?)   
     
@@ -134,11 +131,11 @@ class TC_Radios < Test::Unit::TestCase
   
   def test_radio_properties
     
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).value}  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).name }  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).id }  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).disabled }  
-    assert_raises(UnknownObjectException  , "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).type }  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).value}  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).name }  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).id }  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).disabled }  
+    assert_raises(UnknownObjectException, "UnknownObjectException  was supposed to be thrown" ) {   $ie.radio(:index, 199).type }  
     
     assert_equal("on"   ,    $ie.radio(:index, 1).value)  
     assert_equal("box1" ,    $ie.radio(:index, 1).name )  
@@ -190,6 +187,5 @@ class TC_Radios < Test::Unit::TestCase
     assert(!$ie.radio(:name, "box6" , 'Tea').isSet?)   
   end
   
-  
 end
 

data/unittests/radios_xpath_test.rb

@@ -1,14 +1,14 @@
 # feature tests for Radio Buttons
-# revision: $Revision: 962 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Radios_XPath < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "radioButtons1.html")
+    goto_page "radioButtons1.html"
   end
   
   def test_Radio_Exists

data/unittests/selectbox_test.rb

@@ -1,14 +1,14 @@
 # feature tests for Select Boxes
-# revision: $Revision: 1111 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_SelectList < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "selectboxes1.html")
+    goto_page "selectboxes1.html"
   end
   
   def test_SelectList_exists
@@ -29,8 +29,6 @@ class TC_SelectList < Test::Unit::TestCase
     assert_equal("" , $ie.selectBox(:name, "sel2").class_name  )
   end
   
-  
-  
   def test_Option_text_select
     assert_raises(UnknownObjectException) { $ie.select_list(:name, "sel1").option(:text, "missing item").select }  
     assert_raises(UnknownObjectException) { $ie.select_list(:name, "sel1").option(:text, /missing/).select }  
@@ -42,14 +40,11 @@ class TC_SelectList < Test::Unit::TestCase
     assert_equal( ["Option 1" ] , $ie.select_list(:name, "sel1").getSelectedItems)   
   end    
   
-  
   def xtest_option_class_name
-    
     # the option object doesnt inherit from element, so this doesnt work
     assert_raises(UnknownObjectException) { $ie.select_list(:name, "sel1").option(:text, "missing item").class_name }  
     assert_equal("list_style" , $ie.select_list(:name, "sel2").option(:value , 'o2').class_name)   
     assert_equal("" , $ie.select_list(:name, "sel2").option(:value , 'o1').class_name)   
-    
   end
   
   def test_includes
@@ -71,10 +66,10 @@ end
 
 # Tests for the old interface
 class TC_Selectbox < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "selectboxes1.html")
+    goto_page "selectboxes1.html"
   end
   
   def test_selectBox_Exists
@@ -88,14 +83,12 @@ class TC_Selectbox < Test::Unit::TestCase
     assert_raises(UnknownObjectException) { $ie.selectBox(:name, "NoName").enabled? }  
   end
   
-  
   def test_SelectList_class_name
     assert_raises(UnknownObjectException) { $ie.select_list(:name, "missing").class_name }  
     assert_equal("list_style" , $ie.select_list(:name, "sel1").class_name)   
     assert_equal("" , $ie.selectBox(:name, "sel2").class_name  )
   end
   
-  
   def test_selectBox_getAllContents
     assert_raises(UnknownObjectException) { $ie.selectBox(:name, "NoName").getAllContents }  
     assert_equal( ["Option 1" ,"Option 2" , "Option 3" , "Option 4"] , 
@@ -225,10 +218,9 @@ class TC_Selectbox < Test::Unit::TestCase
 end
 
 class TC_Select_Options < Test::Unit::TestCase
-  include Watir
   
   def setup
-    $ie.goto($htmlRoot + "select_tealeaf.html")
+    goto_page "select_tealeaf.html"
   end
   
   def test_options_text

data/unittests/selectbox_xpath_test.rb

@@ -1,14 +1,14 @@
 # feature tests for Select Boxes
-# revision: $Revision: 962 $
+# revision: $Revision: 1348 $
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
 
 class TC_Selectbox_XPath < Test::Unit::TestCase
-  include Watir
+  include Watir::Exception
   
   def setup
-    $ie.goto($htmlRoot + "selectboxes1.html")
+    goto_page "selectboxes1.html"
   end
   
   def test_textBox_Exists

data/unittests/setup.rb

@@ -3,10 +3,27 @@ require 'watir'
 END {$ie.close if $ie && $ie.exists?; Watir::IE.quit} # close ie at completion of the tests
 
 require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-require 'watir/testUnitAddons'
 require 'watir/testcase'
 
+# rename goto_page to be goto_page
+
+# Better would be to add this to a module that was included in all the tests.
+class Test::Unit::TestCase
+  # navigate the browser to the specified page in unittests/html
+  def goto_page page
+    new_url = $htmlRoot + page
+    browser.goto new_url
+  end
+  # navigate the browser to the specified page in unittests/html IF the browser is not already on that page.
+  def uses_page page
+    new_url = $htmlRoot + page
+    browser.goto new_url unless browser.url == new_url
+  end
+  def browser
+    $ie
+  end
+end
+
 topdir = File.join(File.dirname(__FILE__), '..')
 Dir.chdir topdir do
   $all_tests = Dir["unittests/*_test.rb"]
@@ -14,16 +31,19 @@ Dir.chdir topdir do
 end
 
 $window_tests =
-    ['js_events', # is always visible
-     'modal_dialog', # modal is visible
+    [
      'attach_to_existing_window', # could actually run robustly as part of the core suite!
      'attach_to_new_window', # creates new window
-     'jscript',
-     'send_keys', # visible
-     'iedialog', # visible
      'close_window', # creates new window
      'frame_links', # visible
+     'iedialog', # visible
+     #ie-each
+     'js_events', # is always visible
+     'jscript',
+     'modal_dialog', # modal is visible
+     #new (named oddly)
      'open_close',
+     'send_keys', # visible
     ].collect {|x| "unittests/windows/#{x}_test.rb"}
 
 $non_core_tests = 
@@ -32,7 +52,7 @@ $non_core_tests =
                # will be revised to use autoit 
                # takes 15 seconds to run
      'images', # save file must must be visible
-     'screen_capture', # is always visible; takes 25 seconds
+#     'screen_capture', # is always visible; takes 25 seconds
      'filefield', # is always visible; takes 40 seconds 
      'minmax', # becomes visible
      'dialog' # visible
@@ -45,7 +65,7 @@ $ie.speed = :fast
 
 $myDir = File.expand_path(File.dirname(__FILE__))
 $myDir.sub!( %r{/cygdrive/(\w)/}, '\1:/' ) # convert from cygwin to dos
-# if you run the unit tests form a local file system use this line
-$htmlRoot =  "file://#{$myDir}/html/" 
+# if you run the unit tests from a local file system use this line
+$htmlRoot =  "file:///#{$myDir}/html/" 
 # if you run the unit tests from a web server use this line
 #   $htmlRoot =  "http://localhost:8080/watir/html/"