watir 1.6.5 → 1.6.6.rc1

data/unittests/setup.rb

@@ -1,77 +1,87 @@
-# 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
-
-
+# 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
+
+# load development libs also in #click_no_wait processes
+Watir::PageContainer.class_eval do
+  alias_method :__spawned_click_no_wait_command, :spawned_click_no_wait_command
+
+  def spawned_click_no_wait_command(command)
+    # make it actually wait in tests for easier testing
+    #
+    # please note that this implementation of click_no_wait takes considerably more time than
+    # in real situation due to the loading of setup.rb!
+    "ruby -r#{File.expand_path(File.join(File.dirname(__FILE__), "setup.rb"))} -e #{command.inspect}"
+  end
+end

data/unittests/speed_settings_test.rb

@@ -1,68 +1,68 @@
-# 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
+# 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

data/unittests/table_and_tablerow_to_a_test.rb

@@ -0,0 +1,117 @@
+# feature tests for Watir::Table#to_a and Watir::TableRow#to_a
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_Table_TableRow_to_a < Test::Unit::TestCase
+
+  def setup
+    goto_page "table_and_tablerow_to_a.html"
+  end
+
+  def test_table_to_a_works_with_regular_table
+    expected_table = [
+            ["1", "2", "3"],
+            ["4", "5", "6"],
+            ["7", "8", "9"]
+    ]
+    assert_equal(expected_table, browser.table(:id => "normal").to_a)
+  end
+
+  def test_table_to_a_works_with_table_with_headers
+    expected_table = [
+            ["1", "2", "3", "4"],
+            ["5", "6", "7", "8"],
+            ["9", "10", "11", "12"]
+    ]
+    assert_equal(expected_table, browser.table(:id => "headers").to_a)
+  end
+
+  def test_table_to_a_works_with_nested_tables
+    expected_table =
+            [
+                    ["1", "2"],
+                    [[["11", "12"],
+                      ["13", "14"]], "3"]
+            ]
+    assert_equal(expected_table, browser.table(:id => "nested").to_a(2))
+  end
+
+  def test_table_to_a_works_with_nested_table_with_non_direct_child
+    expected_table =
+            [
+                    ["1", "2"],
+                    [[["11", "12"],
+                      ["13", "14"]], "3"]
+            ]
+
+    assert_equal(expected_table, browser.table(:id => "nestednondirectchild").to_a(2))
+  end
+
+  def test_table_to_a_works_with_deep_nested_tables
+    expected_table =
+            [
+                    ["1", "2"],
+                    [[["11", "12"],
+                      [[["404", "405"],
+                        ["406", "407"]], "14"]], "3"]
+            ]
+    assert_equal(expected_table, browser.table(:id => "deepnested").to_a(3))
+  end
+
+  def test_table_to_a_works_with_colspan
+    expected_table =
+            [
+                    ["1", "2"],
+                    ["3"]
+            ]
+    assert_equal(expected_table, browser.table(:id => "colspan").to_a)
+  end
+
+  def test_table_to_a_works_with_rowspan
+    expected_table =
+            [
+                    ["1", "2"],
+                    ["3", "4"],
+                    ["5"]
+            ]
+    assert_equal(expected_table, browser.table(:id => "rowspan").to_a)
+  end
+
+  def test_tablerow_to_a_works_with_regular_row
+    first_row = browser.table(:id => "normal")[1]
+    assert_equal(["1", "2", "3"], first_row.to_a)
+  end
+
+  def test_tablerow_to_a_works_with_headers_in_row
+    first_row = browser.table(:id => "headers")[1]
+    assert_equal(["1", "2", "3", "4"], first_row.to_a)
+  end
+
+  def test_tablerow_to_a_works_with_nested_tables
+    second_row = browser.table(:id => "nested")[2]
+    assert_equal([[["11", "12"], ["13", "14"]], "3"], second_row.to_a(2))
+  end
+
+  def test_tablerow_to_a_works_with_deep_nested_tables
+    second_row = browser.table(:id => "deepnested")[2]
+    expected_row = [[["11", "12"],
+                     [[["404", "405"], ["406", "407"]], "14"]], "3"]
+    assert_equal(expected_row, second_row.to_a(3))
+  end
+
+  def test_tablerow_to_a_works_with_colspan
+    second_row = browser.table(:id => "colspan")[2]
+    assert_equal(["3"], second_row.to_a)
+  end
+
+  def test_tablerow_to_a_works_with_rowspan
+    t = browser.table(:id => "rowspan")
+    second_row = t[2]
+    assert_equal(["3", "4"], second_row.to_a)
+
+    third_row = t[3]
+    assert_equal(["5"], third_row.to_a)
+  end
+end
+

data/unittests/table_cell_using_xpath_test.rb

@@ -1,35 +1,35 @@
-# feature tests for xpath table cells
-# revision: $Revision$
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
-require 'unittests/setup'
-
-class TC_TableCell_XPath < Test::Unit::TestCase
-  
-  def setup
-    goto_page "tableCell_using_xpath.html"
-  end
-  
-  def testCellExists
-    # There is no <image> with @src='rectangle.jpg'. So image will not be there.
-    assert_false( browser.cell(:xpath , "//img[@src='images\/rectangle.jpg']/../").exists?  )
-    # Select the parent element of image with src='square.jpg' which is a tablecell.
-    assert(       browser.cell(:xpath , "//img[@src='images\/square.jpg']/../").exists?  )
-    assert(       browser.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").exists?  )
-    puts "Selected table cell with text 'Table Cell with image of triangle.'"
-    puts browser.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").to_s
-  end
-  
-  def testCell_properties
-    assert_equal(1 , browser.cell(:xpath , "//img[@src='images\/square.jpg']/../").colspan) 
-    assert_equal(2 , browser.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").colspan) 
-    assert_equal(3 , browser.cell(:xpath , "//img[@src='images\/circle.jpg']/../").colspan) 
-    assert_equal(4 , browser.cell(:xpath , "//img[@src='images\/button.jpg']/../").colspan) 
-    
-    # to string tests -- output should be verified!
-    puts browser.cell(:xpath , "//img[@src='images\/square.jpg']/../").to_s
-    puts browser.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").to_s
-  end
-  
-end
-
+# feature tests for xpath table cells
+# revision: $Revision$
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_TableCell_XPath < Test::Unit::TestCase
+  
+  def setup
+    goto_page "tableCell_using_xpath.html"
+  end
+  
+  def testCellExists
+    # There is no <image> with @src='rectangle.jpg'. So image will not be there.
+    assert_false( browser.cell(:xpath , "//img[@src='images\/rectangle.jpg']/../").exists?  )
+    # Select the parent element of image with src='square.jpg' which is a tablecell.
+    assert(       browser.cell(:xpath , "//img[@src='images\/square.jpg']/../").exists?  )
+    assert(       browser.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").exists?  )
+    puts "Selected table cell with text 'Table Cell with image of triangle.'"
+    puts browser.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").to_s
+  end
+  
+  def testCell_properties
+    assert_equal(1 , browser.cell(:xpath , "//img[@src='images\/square.jpg']/../").colspan) 
+    assert_equal(2 , browser.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").colspan) 
+    assert_equal(3 , browser.cell(:xpath , "//img[@src='images\/circle.jpg']/../").colspan) 
+    assert_equal(4 , browser.cell(:xpath , "//img[@src='images\/button.jpg']/../").colspan) 
+    
+    # to string tests -- output should be verified!
+    puts browser.cell(:xpath , "//img[@src='images\/square.jpg']/../").to_s
+    puts browser.cell(:xpath , "//img[@src='images\/triangle.jpg']/../").to_s
+  end
+  
+end
+