watir 1.5.6 → 1.6.2

data/unittests/windows/modal_dialog_test.rb

@@ -1,21 +1,21 @@
 # feature tests for modal web dialog support
-# 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'
 require 'watir/close_all'
 
-if VERSION == '1.8.2'
 class TC_ModalDialog < Watir::TestCase
   include Watir
   
   def setup
     goto_page 'modal_dialog_launcher.html'
+    Watir::IE.attach_timeout = 5.0
   end
 
   def teardown 
-    if $ie 
-      while $ie.close_modal do; end
+    if browser 
+      while browser.close_modal do; end
     end
     sleep 0.1
   end
@@ -24,7 +24,7 @@ class TC_ModalDialog < Watir::TestCase
     IE.attach_timeout = 0.2 
     begin
       assert_raises(NoMatchingWindowFoundException) do
-        $ie.modal_dialog
+        browser.modal_dialog
       end
     ensure
       IE.reset_attach_timeout
@@ -32,18 +32,18 @@ class TC_ModalDialog < Watir::TestCase
   end 
      
   def test_modal_simple_use_case
-    $ie.button(:value, 'Launch Dialog').click_no_wait
-    modal = $ie.modal_dialog(:title, 'Modal Dialog')
+    browser.button(:value, 'Launch Dialog').click_no_wait
+    modal = browser.modal_dialog(:title, 'Modal Dialog')
 
     assert(modal.text.include?('Enter some text:'))
     modal.text_field(:name, 'modal_text').set('hello')
     modal.button(:value, 'Close').click
-    assert_equal('hello', $ie.text_field(:name, 'modaloutput').value)
+    assert_equal('hello', browser.text_field(:name, 'modaloutput').value)
   end
 
   def test_wait_should_not_block
-    $ie.button(:value, 'Launch Dialog').click_no_wait
-    modal = $ie.modal_dialog(:title, 'Modal Dialog')
+    browser.button(:value, 'Launch Dialog').click_no_wait
+    modal = browser.modal_dialog(:title, 'Modal Dialog')
 
     modal.text_field(:name, 'modal_text').set('hello')
     modal.wait
@@ -52,14 +52,14 @@ class TC_ModalDialog < Watir::TestCase
   end
 
   def test_modal_dialog_use_case_default
-    $ie.button(:value, 'Launch Dialog').click_no_wait
+    browser.button(:value, 'Launch Dialog').click_no_wait
 
-    modal = $ie.modal_dialog
+    modal = browser.modal_dialog
     assert_not_nil modal
 
     # Make sure that we have attached to modal and that the hwnd method
     # is working properly to show the HWND of our parent.
-    assert_not_equal($ie.hwnd, modal.hwnd)
+    assert_not_equal(browser.hwnd, modal.hwnd)
 
     # Once attached just treat the modal_dialog like any IE or Frame
     # object.
@@ -68,15 +68,15 @@ class TC_ModalDialog < Watir::TestCase
     modal.button(:value, 'Close').click
 
     assert_no_modals
-    assert_equal('hello', $ie.text_field(:name, 'modaloutput').value)
+    assert_equal('hello', browser.text_field(:name, 'modaloutput').value)
   end
 
   # Now explicitly supply the :title parameter.
   def test_modal_dialog_use_case_title
-    $ie.button(:value, 'Launch Dialog').click_no_wait
+    browser.button(:value, 'Launch Dialog').click_no_wait
 
-    modal = $ie.modal_dialog(:title, 'Modal Dialog')
-    assert_not_equal($ie.hwnd, modal.hwnd)
+    modal = browser.modal_dialog(:title, 'Modal Dialog')
+    assert_not_equal(browser.hwnd, modal.hwnd)
 
     assert_equal('Modal Dialog', modal.title)
 
@@ -86,17 +86,17 @@ class TC_ModalDialog < Watir::TestCase
 
   # Now explicitly supply the :title parameter with regexp match
   def test_modal_dialog_use_case_title_regexp
-    assert_raises(ArgumentError){$ie.modal_dialog(:title, /dal Dia/)}
+    assert_raises(ArgumentError){browser.modal_dialog(:title, /dal Dia/)}
   end
 
   # Now explicitly supply an invalid "how" value
   def test_modal_dialog_use_case_invalid
-    assert_raise(ArgumentError) { $ie.modal_dialog(:esp) }
+    assert_raise(ArgumentError) { browser.modal_dialog(:esp) }
   end
 
   def test_double_modal
-    $ie.button(:value, 'Launch Dialog').click_no_wait
-    modal1 = $ie.modal_dialog
+    browser.button(:value, 'Launch Dialog').click_no_wait
+    modal1 = browser.modal_dialog
     modal1.button(:text, 'Another Modal').click_no_wait
     modal2 = modal1.modal_dialog
     assert_equal modal2.title, 'Pass Page'
@@ -105,10 +105,10 @@ class TC_ModalDialog < Watir::TestCase
   end
   
   def xtest_modal_with_frames
-    $ie.button(:value, 'Launch Dialog').click_no_wait
-    modal1 = $ie.modal_dialog
+    browser.button(:value, 'Launch Dialog').click_no_wait
+    modal1 = browser.modal_dialog
     modal1.button(:value, 'Modal with Frames').click_no_wait
-    modal2 = $ie.modal_dialog
+    modal2 = browser.modal_dialog
     modal2.frame('buttonFrame').button(:value, 'Click Me').click
     assert(modal2.frame('buttonFrame').text.include?('PASS'))    
     modal2.frame('buttonFrame').button(:value, 'Close Window').click
@@ -116,12 +116,11 @@ class TC_ModalDialog < Watir::TestCase
   end
   
   def test_modal_exists
-    $ie.button(:value, 'Launch Dialog').click_no_wait
-    modal = $ie.modal_dialog(:title, 'Modal Dialog')
+    browser.button(:value, 'Launch Dialog').click_no_wait
+    modal = browser.modal_dialog(:title, 'Modal Dialog')
     assert(modal.exists?)
     modal.button(:value, 'Close').click
-    assert(!modal.exists?)
+    assert_false(modal.exists?)
   end
         
-end
 end

data/unittests/windows/{new.rb → new_test.rb}

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '../..') if $0 == __FILE__
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '../..') unless $SETUP_LOADED
 
 require 'unittests/setup'
 require 'watir/contrib/ie-new-process'

data/unittests/windows/open_close_test.rb

@@ -1,15 +1,12 @@
 # rapidly open and close IE windows
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'watir-common', 'lib')
 require 'test/unit'
-require 'watir'
+require 'watir/ie'
 require 'watir/contrib/ie-new-process'
 
 class ZZ_OpenClose < Test::Unit::TestCase
-  def setup
-    if $ie
-      $ie.close 
-      $ie = nil 
-    end
-  end
   20.times do | i |
     define_method "test_#{i}" do
       sleep 0.05

data/unittests/windows/send_keys_test.rb

@@ -1,7 +1,7 @@
 # feature tests for IE#send_keys
-# 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_Fields < Test::Unit::TestCase
@@ -10,23 +10,23 @@ class TC_Fields < Test::Unit::TestCase
   end
   
   def test_tabbing
-    $ie.text_field(:name, 'text1').focus
-    $ie.send_keys('{tab}')
-    $ie.send_keys('Scooby')
-    assert('Scooby', $ie.text_field(:name, 'beforetest').value)
+    browser.text_field(:name, 'text1').focus
+    browser.send_keys('{tab}')
+    browser.send_keys('Scooby')
+    assert('Scooby', browser.text_field(:name, 'beforetest').value)
   end
   
   def test_enter
-    $ie.text_field(:name, 'text1').focus
-    $ie.send_keys('{tab}{tab}{tab}{tab}{tab}')
-    $ie.send_keys('Dooby{enter}')
+    browser.text_field(:name, 'text1').focus
+    browser.send_keys('{tab}{tab}{tab}{tab}{tab}')
+    browser.send_keys('Dooby{enter}')
     sleep 0.2
-    assert($ie.text.include?('PASS'))
+    assert(browser.text.include?('PASS'))
   end
   
   def test_autoregistration
     Watir::_unregister('AutoItX3.dll')
     assert_raises(WIN32OLERuntimeError) { WIN32OLE.new('AutoItX3.Control') }
-    assert_nothing_raised { $ie.send_keys('{tab}') }
+    assert_nothing_raised { browser.send_keys('{tab}') }
   end    
 end

data/unittests/xpath_tests.rb

@@ -4,7 +4,8 @@ $LOAD_PATH.unshift TOPDIR
 require 'unittests/setup.rb'
 
 Dir.chdir TOPDIR
-$xpath_tests.each {|x| require x }
-
-
+$all_tests.each {|x| require x }
 
+Watir::UnitTest.filter_out do |t|
+  t.class.to_s !~ /xpath/i
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: watir
 version: !ruby/object:Gem::Version 
-  version: 1.5.6
+  version: 1.6.2
 platform: ruby
 authors: 
 - Bret Pettichord
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-10 00:00:00 -05:00
+date: 2008-11-06 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: win32-process
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: windows-pr
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,27 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: commonwatir
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.6.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: firewatir
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -48,48 +71,45 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- watir.rb
-- watir/assertions.rb
-- watir/camel_case.rb
-- watir/clickJSDialog.rb
-- watir/close_all.rb
-- watir/collections.rb
-- watir/container.rb
-- watir/cookiemanager.rb
-- watir/datahandler.rb
-- watir/dialog.rb
-- watir/element.rb
-- watir/element_collections.rb
-- watir/exceptions.rb
-- watir/form.rb
-- watir/frame.rb
-- watir/ie-process.rb
-- watir/ie.rb
-- watir/image.rb
-- watir/input_elements.rb
-- watir/irb-history.rb
-- watir/link.rb
-- watir/locator.rb
-- watir/logger.rb
-- watir/modal_dialog.rb
-- watir/non_control_elements.rb
-- watir/page-container.rb
-- watir/popup.rb
-- watir/process.rb
-- watir/screen_capture.rb
-- watir/setFileDialog.rb
-- watir/table.rb
-- watir/testcase.rb
-- watir/utils.rb
-- watir/waiter.rb
-- watir/watir_simple.rb
-- watir/win32.rb
-- watir/win32ole.rb
-- watir/winClicker.rb
-- watir/WindowHelper.rb
-- watir/AutoItX3.dll
+- CHANGES
+- lib/watir/camel_case.rb
+- lib/watir/clickJSDialog.rb
+- lib/watir/close_all.rb
+- lib/watir/collections.rb
+- lib/watir/container.rb
+- lib/watir/cookiemanager.rb
+- lib/watir/datahandler.rb
+- lib/watir/dialog.rb
+- lib/watir/element.rb
+- lib/watir/element_collections.rb
+- lib/watir/form.rb
+- lib/watir/frame.rb
+- lib/watir/ie-class.rb
+- lib/watir/ie-process.rb
+- lib/watir/ie.rb
+- lib/watir/image.rb
+- lib/watir/input_elements.rb
+- lib/watir/irb-history.rb
+- lib/watir/link.rb
+- lib/watir/locator.rb
+- lib/watir/logger.rb
+- lib/watir/modal_dialog.rb
+- lib/watir/non_control_elements.rb
+- lib/watir/page-container.rb
+- lib/watir/popup.rb
+- lib/watir/process.rb
+- lib/watir/screen_capture.rb
+- lib/watir/setFileDialog.rb
+- lib/watir/table.rb
+- lib/watir/utils.rb
+- lib/watir/version.rb
+- lib/watir/watir_simple.rb
+- lib/watir/win32.rb
+- lib/watir/win32ole.rb
+- lib/watir/winClicker.rb
+- lib/watir/WindowHelper.rb
+- lib/watir/AutoItX3.dll
 - unittests/all_tests.rb
-- unittests/buttons_test.rb
 - unittests/buttons_xpath_test.rb
 - unittests/checkbox_test.rb
 - unittests/checkbox_xpath_test.rb
@@ -125,10 +145,12 @@ files:
 - unittests/non_core_tests.rb
 - unittests/pagecontainstext_test.rb
 - unittests/parent_child_test.rb
+- unittests/perf_test.rb
 - unittests/popups_test.rb
 - unittests/pre_test.rb
 - unittests/radios_test.rb
 - unittests/radios_xpath_test.rb
+- unittests/security_setting_test.rb
 - unittests/selectbox_test.rb
 - unittests/selectbox_xpath_test.rb
 - unittests/setup.rb
@@ -136,6 +158,7 @@ files:
 - unittests/table_cell_using_xpath_test.rb
 - unittests/table_test.rb
 - unittests/table_xpath_test.rb
+- unittests/test_tests.rb
 - unittests/textarea_test.rb
 - unittests/textarea_xpath_test.rb
 - unittests/textfields_test.rb
@@ -191,6 +214,7 @@ files:
 - unittests/html/textarea.html
 - unittests/html/textfields1.html
 - unittests/html/textsearch.html
+- unittests/html/wallofcheckboxes.html
 - unittests/html/xpath_nbsp.html
 - unittests/html/images/1.gif
 - unittests/html/images/2.GIF
@@ -226,18 +250,18 @@ files:
 - unittests/windows/jscript_test.rb
 - unittests/windows/js_events_test.rb
 - unittests/windows/modal_dialog_test.rb
-- unittests/windows/new.rb
+- unittests/windows/new_test.rb
 - unittests/windows/open_close_test.rb
 - unittests/windows/send_keys_test.rb
-- watir/IEDialog/Release/IEDialog.dll
-- watir/win32ole/win32ole.so
-- watir/contrib/enabled_popup.rb
-- watir/contrib/ie-new-process.rb
-- watir/contrib/page_checker.rb
-- watir/contrib/visible.rb
-- readme.rb
-- changes.rb
-- license.rb
+- lib/watir/IEDialog/Release/IEDialog.dll
+- lib/watir/win32ole/win32ole.so
+- lib/watir/contrib/enabled_popup.rb
+- lib/watir/contrib/ie-new-process.rb
+- lib/watir/contrib/page_checker.rb
+- lib/watir/contrib/visible.rb
+- lib/readme.rb
+- lib/changes.rb
+- lib/license.rb
 has_rdoc: true
 homepage: http://wtr.rubyforge.org/
 post_install_message: 
@@ -249,9 +273,9 @@ rdoc_options:
 - --main
 - Watir::IE
 - --exclude
-- unittests|camel_case.rb|testUnitAddons.rb
+- unittests|camel_case.rb
 require_paths: 
-- .
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -267,9 +291,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - Microsoft Windows running Internet Explorer 5.5 or later.
 rubyforge_project: Watir
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Automated testing tool for web applications.
-test_files: 
-- unittests/core_tests.rb
+test_files: []
+