watir 1.6.2 → 1.6.5

data/unittests/selectbox_xpath_test.rb

@@ -1,113 +1,113 @@
-# feature tests for Select Boxes
-# revision: $Revision: 1544 $
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
-require 'unittests/setup'
-
-class TC_Selectbox_XPath < Test::Unit::TestCase
-  include Watir::Exception
-  
-  def setup
-    goto_page "selectboxes1.html"
-  end
-  
-  def test_textBox_Exists
-    assert(browser.select_list(:xpath, "//select[@name='sel1']/").exists?)   
-    assert_false(browser.select_list(:xpath, "//select[@name='missing']/").exists?)   
-    assert_false(browser.select_list(:xpath, "//select[@id='missing']/").exists?)   
-  end
-  
-  def test_select_list_enabled
-    assert(browser.select_list(:xpath, "//select[@name='sel1']/").enabled?)   
-    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").enabled? }  
-  end
-  
-  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)   
-  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)   
-    assert_equal( ["Option 3" , "Option 6" ] , 
-    browser.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
-  end
-  
-  def test_clearSelection
-    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").clearSelection }  
-    browser.select_list(:xpath, "//select[@name='sel1']/").clearSelection
-    
-    # the box sel1 has no ability to have a de-selected item
-    assert_equal( ["Option 3" ] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
-    
-    browser.select_list(:xpath, "//select[@name='sel2']/").clearSelection
-    assert_equal( [ ] , browser.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
-  end
-  
-  def test_select_list_select
-    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
-    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)   
-    
-    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)   
-    
-    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)   
-    
-    # these are to test the onchange event
-    # the event shouldnt get fired, as this is the selected item
-    browser.select_list(:xpath, "//select[@name='sel3']/").select( /3/ )
-    assert_false(browser.text.include?("Pass") )
-  end
-  
-  def test_select_list_select2
-    # the event should get fired
-    browser.select_list(:xpath, "//select[@name='sel3']/").select( /2/ )
-    assert(browser.text.include?("PASS") )
-  end
-  
-  def test_select_list_select_using_value
-    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
-    assert_raises(NoValueFoundException) { browser.select_list(:xpath, "//select[@name='sel1']/").select_value("missing item") }  
-    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)   
-    
-    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)   
-    
-    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)   
-    
-    # these are to test the onchange event
-    # the event shouldnt get fired, as this is the selected item
-    browser.select_list(:xpath, "//select[@name='sel3']/").select_value( /3/ )
-    assert_false(browser.text.include?("Pass") )
-  end
-  
-  def test_select_list_select_using_value2
-    # the event should get fired
-    browser.select_list(:xpath, "//select[@name='sel3']/").select_value( /2/ )
-    assert(browser.text.include?("PASS") )
-  end
-  
-end
+# feature tests for Select Boxes
+# revision: $Revision$
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_Selectbox_XPath < Test::Unit::TestCase
+  include Watir::Exception
+  
+  def setup
+    goto_page "selectboxes1.html"
+  end
+  
+  def test_textBox_Exists
+    assert(browser.select_list(:xpath, "//select[@name='sel1']/").exists?)   
+    assert_false(browser.select_list(:xpath, "//select[@name='missing']/").exists?)   
+    assert_false(browser.select_list(:xpath, "//select[@id='missing']/").exists?)   
+  end
+  
+  def test_select_list_enabled
+    assert(browser.select_list(:xpath, "//select[@name='sel1']/").enabled?)   
+    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").enabled? }  
+  end
+  
+  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)   
+  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)   
+    assert_equal( ["Option 3" , "Option 6" ] , 
+    browser.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
+  end
+  
+  def test_clearSelection
+    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").clearSelection }  
+    browser.select_list(:xpath, "//select[@name='sel1']/").clearSelection
+    
+    # the box sel1 has no ability to have a de-selected item
+    assert_equal( ["Option 3" ] , browser.select_list(:xpath, "//select[@name='sel1']/").getSelectedItems)   
+    
+    browser.select_list(:xpath, "//select[@name='sel2']/").clearSelection
+    assert_equal( [ ] , browser.select_list(:xpath, "//select[@name='sel2']/").getSelectedItems)   
+  end
+  
+  def test_select_list_select
+    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
+    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)   
+    
+    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)   
+    
+    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)   
+    
+    # these are to test the onchange event
+    # the event shouldnt get fired, as this is the selected item
+    browser.select_list(:xpath, "//select[@name='sel3']/").select( /3/ )
+    assert_false(browser.text.include?("Pass") )
+  end
+  
+  def test_select_list_select2
+    # the event should get fired
+    browser.select_list(:xpath, "//select[@name='sel3']/").select( /2/ )
+    assert(browser.text.include?("PASS") )
+  end
+  
+  def test_select_list_select_using_value
+    assert_raises(UnknownObjectException) { browser.select_list(:xpath, "//select[@name='NoName']/").getSelectedItems }  
+    assert_raises(NoValueFoundException) { browser.select_list(:xpath, "//select[@name='sel1']/").select_value("missing item") }  
+    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)   
+    
+    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)   
+    
+    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)   
+    
+    # these are to test the onchange event
+    # the event shouldnt get fired, as this is the selected item
+    browser.select_list(:xpath, "//select[@name='sel3']/").select_value( /3/ )
+    assert_false(browser.text.include?("Pass") )
+  end
+  
+  def test_select_list_select_using_value2
+    # the event should get fired
+    browser.select_list(:xpath, "//select[@name='sel3']/").select_value( /2/ )
+    assert(browser.text.include?("PASS") )
+  end
+  
+end

data/unittests/setup.rb

@@ -1,75 +1,77 @@
-# watir/unittests/setup.rb
-$SETUP_LOADED = true
-
-$myDir = File.expand_path(File.dirname(__FILE__))
-
-def append_to_load_path path
-  $LOAD_PATH.unshift File.expand_path(path)
-end
-
-# use local development versions of watir, firewatir, watir-common if available
-topdir = File.join(File.dirname(__FILE__), '..')
-$firewatir_dev_lib = File.join(topdir, '..', 'firewatir', 'lib')
-$watir_dev_lib = File.join(topdir, 'lib')
-libs = []
-libs << File.join(topdir, '..', 'watir-common', 'lib')
-libs << File.join(topdir, '..', 'watir-common') # for the unit tests
-libs.each { |lib| append_to_load_path(lib) }
-
-require 'watir/browser'
-Watir::Browser.default = 'ie'
-require 'unittests/setup/lib'
-require 'watir/testcase'
-
-# Standard Tags
-# :must_be_visible
-# :creates_windows
-# :unreliable (test fails intermittently)
-
-=begin
-Test Suites
-* all_tests -- all the tests in the unittests directory (omits "other")
-* window_tests -- window intensive tests
-=end
-
-tiptopdir = File.join topdir, '..'
-commondir = File.join topdir, '..', 'watir-common'
-append_to_load_path tiptopdir
-$all_tests = []
-Dir.chdir tiptopdir do
-  $all_tests += Dir["watir/unittests/*_test.rb"]
-end
-Dir.chdir tiptopdir do
-  $all_tests += Dir["watir-common/unittests/*_test.rb"]
-end
-
-# These tests won't load unless Watir is in the path
-$watir_only_tests = [
-  "images_xpath_test.rb",
-  "images_test.rb",
-  "dialog_test.rb",
-  "ie_test.rb"
-].map {|file| "watir/unittests/#{file}"}
-
-if Watir::UnitTest.options[:browser] != 'ie'
-  $all_tests -= $watir_only_tests
-end
-
-
-# not in all tests!
-$window_tests =
-    [
-     'attach_to_existing_window', # could actually run robustly as part of the core suite!
-     'attach_to_new_window', # creates new window
-     'close_window', # creates new window
-     'frame_links', # visible
-     'iedialog', # visible
-     #ie-each
-     'js_events', # is always visible
-     'jscript',
-     'modal_dialog', # modal is visible
-     #new 
-     'open_close',
-     'send_keys', # visible
-    ].collect {|x| "unittests/windows/#{x}_test.rb"}
-
+# watir/unittests/setup.rb
+$SETUP_LOADED = true
+
+$myDir = File.expand_path(File.dirname(__FILE__))
+
+def append_to_load_path path
+  $LOAD_PATH.unshift File.expand_path(path)
+end
+
+# use local development versions of watir, firewatir, commonwatir if available
+topdir = File.join(File.dirname(__FILE__), '..')
+$firewatir_dev_lib = File.join(topdir, '..', 'firewatir', 'lib')
+$watir_dev_lib = File.join(topdir, 'lib')
+libs = []
+libs << File.join(topdir, '..', 'commonwatir', 'lib')
+libs << File.join(topdir, '..', 'commonwatir') # for the unit tests
+libs.each { |lib| append_to_load_path(lib) }
+
+require 'watir/browser'
+Watir::Browser.default = 'ie'
+require 'unittests/setup/lib'
+require 'watir/testcase'
+
+# Standard Tags
+# :must_be_visible
+# :creates_windows
+# :unreliable (test fails intermittently)
+
+=begin
+Test Suites
+* all_tests -- all the tests in the unittests directory (omits "other")
+* window_tests -- window intensive tests
+=end
+
+tiptopdir = File.join topdir, '..'
+commondir = File.join topdir, '..', 'commonwatir'
+append_to_load_path tiptopdir
+$all_tests = []
+Dir.chdir tiptopdir do
+  $all_tests += Dir["watir/unittests/*_test.rb"]
+end
+Dir.chdir tiptopdir do
+  $all_tests += Dir["commonwatir/unittests/*_test.rb"]
+end
+
+# These tests won't load unless Watir is in the path
+$watir_only_tests = [
+  "images_xpath_test.rb",
+  "images_test.rb",
+  "dialog_test.rb",
+  "ie_test.rb"
+].map {|file| "watir/unittests/#{file}"}
+
+if Watir::UnitTest.options[:browser] != 'ie'
+  $all_tests -= $watir_only_tests
+end
+
+
+=begin
+     'attach_to_existing_window', # could actually run robustly as part of the core suite!
+     'attach_to_new_window', # creates new window
+     'close_window', # creates new window
+     'frame_links', # visible
+     'iedialog', # visible
+     #ie-each
+     'js_events', # is always visible
+     'jscript',
+     'modal_dialog', # modal is visible
+     #new 
+     'open_close',
+     'send_keys', # visible
+=end
+Dir.chdir tiptopdir do
+  $window_tests = Dir["watir/unittests/windows/*_test.rb"] - ["watir/unittests/windows/ie-each_test.rb"]
+end
+
+

data/unittests/speed_settings_test.rb

@@ -1,66 +1,68 @@
-# tests for ability to set defaults for Watir
-# revision: $Revision: 1552 $
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
-require 'unittests/setup'
-
-class TC_instance_options < Test::Unit::TestCase
-  tags :fails_on_firefox
-  
-  def setup
-    @ie4 = Watir::IE.new    
-  end
-  
-  def test_using_default
-    @ie4.speed = :fast
-    assert_equal(:fast, @ie4.speed)
-    @ie4.speed = :slow
-    assert_equal(:slow, @ie4.speed)
-    @ie4.speed = :zippy
-    assert_equal(:zippy, @ie4.speed)
-   
-    assert_raise(ArgumentError){@ie4.speed = :fubar}
-  end
-
-  def teardown
-    @ie4.close if @ie4.exists?
-  end
-end
-
-class TC_class_options < Test::Unit::TestCase
-  tags :fails_on_firefox
-	include Watir
-	@@hide_ie = $HIDE_IE
-	def setup
-		@previous = IE.options
-	end
-	def test_class_defaults
-		assert_equal({:speed => IE.speed, :visible => IE.visible}, IE.options)
-	end
-	def test_change_defaults
-		IE.set_options(:speed => :fast)
-		assert_equal(:fast, IE.speed)
-		IE.set_options(:visible => false)
-		assert_equal(false, IE.visible)
-		IE.set_options(:speed => :slow)
-		assert_equal(:slow, IE.speed)
-		IE.set_options(:visible => true)
-		assert_equal(true, IE.visible)
-	end
-	def test_defaults_affect_on_instance
-		IE.set_options(:speed => :fast)
-		@ie1 = IE.new
-		assert_equal(:fast, @ie1.speed)
-		IE.set_options(:speed => :slow)
-		@ie2 = IE.new
-		assert_equal(:slow, @ie2.speed)
-    IE.set_options(:speed => :zippy)
-    @ie3 = IE.new
-    assert_equal(:zippy, @ie3.speed)
-	end
-	def teardown
-		IE.set_options @previous
-		@ie1.close if @ie1
-		@ie2.close if @ie2
-    @ie3.close if @ie3
-	end
+# tests for ability to set defaults for Watir
+# revision: $Revision$
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_instance_options < Test::Unit::TestCase
+  tags :fails_on_firefox
+  
+  def setup
+    @ie4 = Watir::IE.new    
+  end
+  
+  def test_using_default
+    @ie4.speed = :fast
+    assert_equal(:fast, @ie4.speed)
+    @ie4.speed = :slow
+    assert_equal(:slow, @ie4.speed)
+    @ie4.speed = :zippy
+    assert_equal(:zippy, @ie4.speed)
+   
+    assert_raise(ArgumentError){@ie4.speed = :fubar}
+  end
+
+  def teardown
+    @ie4.close if @ie4.exists?
+  end
+end
+
+class TC_class_options < Test::Unit::TestCase
+  tags :fails_on_firefox
+	include Watir
+	@@hide_ie = $HIDE_IE
+	def setup
+		@previous = IE.options
+	end
+	def test_class_defaults
+		assert_equal({:speed => IE.speed, :visible => IE.visible, :attach_timeout => IE.attach_timeout}, IE.options)
+	end
+	def test_change_defaults
+		IE.set_options(:speed => :fast)
+		assert_equal(:fast, IE.speed)
+		IE.set_options(:visible => false)
+		assert_equal(false, IE.visible)
+		IE.set_options(:speed => :slow)
+		assert_equal(:slow, IE.speed)
+		IE.set_options(:visible => true)
+		assert_equal(true, IE.visible)
+    IE.set_options(:attach_timeout => 22.0)
+    assert_equal(22.0, IE.attach_timeout)
+	end
+	def test_defaults_affect_on_instance
+		IE.set_options(:speed => :fast)
+		@ie1 = IE.new
+		assert_equal(:fast, @ie1.speed)
+		IE.set_options(:speed => :slow)
+		@ie2 = IE.new
+		assert_equal(:slow, @ie2.speed)
+    IE.set_options(:speed => :zippy)
+    @ie3 = IE.new
+    assert_equal(:zippy, @ie3.speed)
+	end
+	def teardown
+		IE.set_options @previous
+		@ie1.close if @ie1
+		@ie2.close if @ie2
+    @ie3.close if @ie3
+	end
 end