watir 1.6.2 → 1.6.5

data/unittests/non_core_tests.rb

@@ -1,12 +1,12 @@
-TOPDIR = File.join(File.dirname(__FILE__), '..')
-$LOAD_PATH.unshift TOPDIR
-
-require 'unittests/setup.rb'
-
-Dir.chdir TOPDIR
-$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
+TOPDIR = File.join(File.dirname(__FILE__), '..')
+$LOAD_PATH.unshift TOPDIR
+
+require 'unittests/setup.rb'
+
+Dir.chdir TOPDIR
+$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,28 +1,28 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
-require 'unittests/setup'
-require 'watir/WindowHelper'
-
-class TC_Logon_Test < Test::Unit::TestCase
-  include Watir
-  
-  def goto_windows_login_page
-    browser.goto('http://clio.lyris.com/')
-  end
-  
-  
-  def test_window_logon
-    
-    a = Thread.new {
-      system('ruby WindowLogonExtra.rb')
-      
-    }
-    b = Thread.new { 
-      goto_windows_login_page
-    }
-    a.join
-    b.join
-  end
-  
-  
-  
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+require 'watir/WindowHelper'
+
+class TC_Logon_Test < Test::Unit::TestCase
+  include Watir
+  
+  def goto_windows_login_page
+    browser.goto('http://clio.lyris.com/')
+  end
+  
+  
+  def test_window_logon
+    
+    a = Thread.new {
+      system('ruby WindowLogonExtra.rb')
+      
+    }
+    b = Thread.new { 
+      goto_windows_login_page
+    }
+    a.join
+    b.join
+  end
+  
+  
+  
 end

data/unittests/other/WindowLogonExtra.rb

@@ -1,7 +1,7 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
-
-require 'watir/WindowHelper'
-
-
-helper = WindowHelper.new
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+
+require 'watir/WindowHelper'
+
+
+helper = WindowHelper.new
 helper.logon('Connect to clio.lyris.com')

data/unittests/other/all_tests_concurrent.rb

@@ -1,57 +1,57 @@
-# This is an UNFINISHED attempt to run the unit tests currently.
-# The work on the harness is complete. 
-# The problem remaining is that the tests are not thread-safe.
-# It's an open question whether getting this to work would actually save any execution time.
-
-TOPDIR = File.join(File.dirname(__FILE__), '..')
-$LOAD_PATH.unshift TOPDIR
-Dir.chdir TOPDIR
-#(Dir["unittests/*_test.rb"] - ["unittests/popups_test.rb"]).each {|x| require x}
-
-require 'unittests/buttons_test'
-require 'unittests/checkbox_test'
-
-require 'test/unit/testsuite'
-require 'thread'
-class ConcurrentTestSuite < Test::Unit::TestSuite
-  
-  # Runs the tests and/or suites contained in this TestSuite.
-  def run(result, &progress_block)
-    yield(STARTED, name)
-    threads = []
-    @tests.each do |test|
-      threads << Thread.new do
-        test.run(result, &progress_block)
-      end
-    end
-    threads.each {|t| t.join}
-    yield(FINISHED, name)
-  end
-end
-
-# create a suite
-require 'test/unit/collector/objectspace'
-
-require 'test/unit/collector'
-include Test::Unit::Collector
-
-
-@filters = []
-suite = ConcurrentTestSuite.new('super suite')
-sub_suites = []
-::ObjectSpace.each_object(Class) do |klass|
-  if(Test::Unit::TestCase > klass)
-    puts sub_suites, klass.suite
-    add_suite(sub_suites, klass.suite)
-  end
-end
-sort(sub_suites).each{|s| suite << s}
-
-
-
-# select a runner
-require 'test/unit/ui/console/testrunner'
-Test::Unit::UI::Console::TestRunner.run(suite)
-
-
-# then subclass Test::Unit::TestSuite and override the run method to be multithreaded
+# This is an UNFINISHED attempt to run the unit tests currently.
+# The work on the harness is complete. 
+# The problem remaining is that the tests are not thread-safe.
+# It's an open question whether getting this to work would actually save any execution time.
+
+TOPDIR = File.join(File.dirname(__FILE__), '..')
+$LOAD_PATH.unshift TOPDIR
+Dir.chdir TOPDIR
+#(Dir["unittests/*_test.rb"] - ["unittests/popups_test.rb"]).each {|x| require x}
+
+require 'unittests/buttons_test'
+require 'unittests/checkbox_test'
+
+require 'test/unit/testsuite'
+require 'thread'
+class ConcurrentTestSuite < Test::Unit::TestSuite
+  
+  # Runs the tests and/or suites contained in this TestSuite.
+  def run(result, &progress_block)
+    yield(STARTED, name)
+    threads = []
+    @tests.each do |test|
+      threads << Thread.new do
+        test.run(result, &progress_block)
+      end
+    end
+    threads.each {|t| t.join}
+    yield(FINISHED, name)
+  end
+end
+
+# create a suite
+require 'test/unit/collector/objectspace'
+
+require 'test/unit/collector'
+include Test::Unit::Collector
+
+
+@filters = []
+suite = ConcurrentTestSuite.new('super suite')
+sub_suites = []
+::ObjectSpace.each_object(Class) do |klass|
+  if(Test::Unit::TestCase > klass)
+    puts sub_suites, klass.suite
+    add_suite(sub_suites, klass.suite)
+  end
+end
+sort(sub_suites).each{|s| suite << s}
+
+
+
+# select a runner
+require 'test/unit/ui/console/testrunner'
+Test::Unit::UI::Console::TestRunner.run(suite)
+
+
+# then subclass Test::Unit::TestSuite and override the run method to be multithreaded

data/unittests/{windows → other}/jscriptExtraAlert.rb

@@ -1,7 +1,7 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib') 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'watir-common', 'lib') 
-
-require 'watir/WindowHelper'
-
-helper = WindowHelper.new
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib') 
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'commonwatir', 'lib') 
+
+require 'watir/WindowHelper'
+
+helper = WindowHelper.new
 helper.push_alert_button

data/unittests/{windows → other}/jscriptExtraConfirmCancel.rb

@@ -1,7 +1,7 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
-
-require 'watir/WindowHelper'
-
-
-helper = WindowHelper.new
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
+
+require 'watir/WindowHelper'
+
+
+helper = WindowHelper.new
 helper.push_confirm_button_cancel

data/unittests/{windows → other}/jscriptExtraConfirmOk.rb

@@ -1,7 +1,7 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
-
-require 'watir/WindowHelper'
-
-
-helper = WindowHelper.new
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
+
+require 'watir/WindowHelper'
+
+
+helper = WindowHelper.new
 helper.push_confirm_button_ok

data/unittests/{windows → other}/jscriptPushButton.rb

@@ -1,6 +1,6 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib') 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'watir-common', 'lib') 
-require 'watir'
-
-ie = Watir::IE.attach(:title, 'Alert Test')
-ie.button(:id, 'btnAlert').click
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib') 
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'commonwatir', 'lib') 
+require 'watir'
+
+ie = Watir::IE.attach(:title, 'Alert Test')
+ie.button(:id, 'btnAlert').click

data/unittests/{windows → other}/jscript_test.rb

@@ -1,64 +1,64 @@
-# feature tests for AutoIt wrapper
-# revision: $Revision: 1544 $
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
-require 'unittests/setup'
-require 'watir/WindowHelper'
-require 'watir/process'
-
-$mydir = File.expand_path(File.dirname(__FILE__)).gsub('/', '\\')
-
-class TC_JavaScript_Test < Test::Unit::TestCase
-  @@javascript_page = $htmlRoot  + 'JavascriptClick.html'
-  
-  def ruby_process_count
-    Watir::Process::count('rubyw.exe')
-  end
-  
-  def teardown
-    assert_equal @background_ruby_process_count, ruby_process_count
-  end
-  
-  def setup
-    @background_ruby_process_count = ruby_process_count
-    begin
-      WindowHelper.check_autoit_installed
-    rescue
-      raise "There is a Problem with Autoit - is it installed?"
-    end
-  end
-  
-  def check_dialog(extra_file, expected_result, &block)
-    browser.goto(@@javascript_page)
-    Thread.new { system("rubyw \"#{$mydir}\\#{extra_file}.rb\"") }
-    
-    block.call
-    testResult = browser.text_field(:id, "testResult").value
-    assert_match( expected_result, testResult )  
-  end
-  
-  def test_alert_button
-    check_dialog('jscriptExtraAlert', /Alert button!/) do
-      browser.button(:id, 'btnAlert').click
-    end
-    
-  end
-  def test_alert_button2
-    check_dialog('jscriptPushButton', /Alert button!/) do
-      sleep 1
-      WindowHelper.new.push_alert_button 
-      sleep 1
-    end
-  end
-  def test_confirm_button_ok
-    check_dialog('jscriptExtraConfirmOk', /Confirm and OK button!/) do 
-      browser.button(:id, 'btnConfirm').click
-    end
-  end
-  def test_confirm_button_Cancel
-    check_dialog('jscriptExtraConfirmCancel', /Confirm and Cancel button!/) do
-      browser.button(:id, 'btnConfirm').click
-    end
-  end
-  
+# feature tests for AutoIt wrapper
+# revision: $Revision$
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..') unless $SETUP_LOADED
+require 'unittests/setup'
+require 'watir/WindowHelper'
+require 'watir/process'
+
+$mydir = File.expand_path(File.dirname(__FILE__)).gsub('/', '\\')
+
+class TC_JavaScript_Test < Test::Unit::TestCase
+  @@javascript_page = $htmlRoot  + 'JavascriptClick.html'
+  
+  def ruby_process_count
+    Watir::Process::count('rubyw.exe')
+  end
+  
+  def teardown
+    assert_equal @background_ruby_process_count, ruby_process_count
+  end
+  
+  def setup
+    @background_ruby_process_count = ruby_process_count
+    begin
+      WindowHelper.check_autoit_installed
+    rescue
+      raise "There is a Problem with Autoit - is it installed?"
+    end
+  end
+  
+  def check_dialog(extra_file, expected_result, &block)
+    browser.goto(@@javascript_page)
+    Thread.new { system("rubyw \"#{$mydir}\\#{extra_file}.rb\"") }
+    
+    block.call
+    testResult = browser.text_field(:id, "testResult").value
+    assert_match( expected_result, testResult )  
+  end
+  
+  def test_alert_button
+    check_dialog('jscriptExtraAlert', /Alert button!/) do
+      browser.button(:id, 'btnAlert').click
+    end
+    
+  end
+  def test_alert_button2
+    check_dialog('jscriptPushButton', /Alert button!/) do
+      sleep 1
+      WindowHelper.new.push_alert_button 
+      sleep 1
+    end
+  end
+  def test_confirm_button_ok
+    check_dialog('jscriptExtraConfirmOk', /Confirm and OK button!/) do 
+      browser.button(:id, 'btnConfirm').click
+    end
+  end
+  def test_confirm_button_Cancel
+    check_dialog('jscriptExtraConfirmCancel', /Confirm and Cancel button!/) do
+      browser.button(:id, 'btnConfirm').click
+    end
+  end
+  
 end

data/unittests/other/navigate_exception_test.rb

@@ -1,25 +1,25 @@
-# feature tests for navigation errors
-# revision: $Revision: 958 $
-
-$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) { 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
+# feature tests for navigation errors
+# revision: $Revision: 958 $
+
+$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) { 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/rexml_unit_test.rb

@@ -1,24 +1,27 @@
-require 'test/unit'
-require "rexml/document"
-
-class RexmlTest < Test::Unit::TestCase
-  def setup
-    file = File.open( "xpath_bug.xml" )
-    @doc = REXML::Document.new file
-  end
-  def fixture xpath
-    matches = []
-    @doc.elements.each(xpath) do |element|
-      matches << element                  
-      assert_equal('Add', element.text)    
-      assert_equal('ButtonText', element.attributes['class'])
-    end
-    assert_equal(1, matches.length)
-  end  
-  def test_text
-    fixture "//div[text()='Add' and @class='ButtonText']"
-  end
-  def test_contains
-    fixture "//div[contains(.,'Add') and @class='ButtonText']"
-  end
-end
+require 'test/unit'
+require 'nokogiri'
+
+class XPathTest < Test::Unit::TestCase
+  def setup
+    file = File.open( "xpath_bug.xml" )
+    @doc = Nokogiri::HTML::Document.read_io(file, nil, nil, 2145)
+  end
+  def fixture xpath
+    matches = []
+    
+    @doc.xpath(xpath).each() do |node|
+    	matches << node
+    	assert_equal('Add', node.text)
+    	assert_equal('ButtonText', node['class'])
+    end
+    
+    assert_equal(1, matches.length)
+  end  
+  def test_text
+    fixture "//div[text()='Add' and @class='ButtonText']"
+  end
+  def test_contains
+    fixture "//div[contains(.,'Add') and @class='ButtonText']"
+  end
+end
+