watir 3.0.0.rc2 → 3.0.0.rc3

data/unittests/windows/frame_links_test.rb

@@ -10,14 +10,14 @@ class TC_Frame_Links < Test::Unit::TestCase
   end
   
   def test_click_in_a_frame
-    browser.frame('linkFrame').link(:text, 'test1').click
-    assert(browser.frame('linkFrame').text.include?('Links2-Pass'))
+    browser.frame(:name, 'linkFrame').link(:text, 'test1').click
+    assert(browser.frame(:name, 'linkFrame').text.include?('Links2-Pass'))
   end
   
   def test_click_no_wait_in_a_frame
-    browser.frame('linkFrame').link(:text, 'test1').click_no_wait
-    Wait.until(10){browser.frame('linkFrame').text.include?('Links2-Pass')}
-    assert(browser.frame('linkFrame').text.include?('Links2-Pass'))
+    browser.frame(:name, 'linkFrame').link(:text, 'test1').click_no_wait
+    Watir::Wait.until(10){browser.frame(:name, 'linkFrame').text.include?('Links2-Pass')}
+    assert(browser.frame(:name, 'linkFrame').text.include?('Links2-Pass'))
   end  
   
 end

data/unittests/windows/ie-each_test.rb

@@ -41,6 +41,6 @@ class TC_IE_Each < Test::Unit::TestCase
   
   def teardown
     @ie.each {|ie| ie.close }
-    Wait.until {Watir::IE.process_count == 0}
+    Watir::Wait.until {Watir::IE.process_count == 0}
   end
 end

data/unittests/windows/modal_dialog_test.rb

@@ -25,7 +25,7 @@ class TC_ModalDialog < Watir::TestCase
 
   def test_modal_simple_use_case
     browser.button(:value, 'Launch Dialog').click_no_wait
-    modal = browser.modal_dialog(:title, 'Modal Dialog')
+    modal = browser.modal_dialog
 
     assert(modal.text.include?('Enter some text:'))
     modal.text_field(:name, 'modal_text').set('hello')
@@ -35,7 +35,7 @@ class TC_ModalDialog < Watir::TestCase
 
   def test_wait_should_not_block
     browser.button(:value, 'Launch Dialog').click_no_wait
-    modal = browser.modal_dialog(:title, 'Modal Dialog')
+    modal = browser.modal_dialog
 
     modal.text_field(:name, 'modal_text').set('hello')
     modal.wait

data/watir.gemspec

@@ -1,10 +1,10 @@
-require 'watir-rdoc'
+require './watir-rdoc'
 
 $__watir_source_patterns = [
     'CHANGES', 'rakefile.rb', 'VERSION', "README.rdoc", 'watir.gemspec', 'watir-rdoc.rb', 'LICENSE',
     'lib/watir/*.rb', 'lib/watir/dialogs/*.rb', 'unittests/*.rb', 'unittests/html/*.html', 'unittests/html/images/*.*',
     'unittests/other/*.rb', 'unittests/testcase/*.rb', 'unittests/windows/*.rb',
-    'lib/watir/IEDialog/Release/IEDialog.dll', 'lib/watir/win32ole/1.8.7/win32ole.so',
+    'lib/watir/IEDialog/Release/IEDialog.dll', 'lib/watir/win32ole/1.8.7/win32ole.so','lib/watir/win32ole/1.9.3/win32ole.so',
     'lib/watir/contrib/*.rb'] +
     $WATIR_EXTRA_RDOC_FILES
 
@@ -39,7 +39,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency 'commonwatir', '= ' + version
   s.add_dependency 'nokogiri'
   s.add_dependency 'ffi', '~>1.0'
-  s.add_dependency 'rautomation', '~>0.6.3'
+  s.add_dependency 'rautomation', '~>0.7.2'
 
   s.rdoc_options += $WATIR_RDOC_OPTIONS
   s.extra_rdoc_files = $WATIR_EXTRA_RDOC_FILES

metadata

@@ -1,128 +1,97 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: watir
-version: !ruby/object:Gem::Version 
-  hash: 15424113
+version: !ruby/object:Gem::Version
+  version: 3.0.0.rc3
   prerelease: 6
-  segments: 
-  - 3
-  - 0
-  - 0
-  - rc
-  - 2
-  version: 3.0.0.rc2
 platform: ruby
-authors: 
+authors:
 - Bret Pettichord
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: win32-process
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &19223712 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: windows-pr
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *19223712
+- !ruby/object:Gem::Dependency
+  name: windows-pr
+  requirement: &19223376 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 6
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.6
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: commonwatir
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *19223376
+- !ruby/object:Gem::Dependency
+  name: commonwatir
+  requirement: &19222968 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15424113
-        segments: 
-        - 3
-        - 0
-        - 0
-        - rc
-        - 2
-        version: 3.0.0.rc2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.0.0.rc3
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *19222968
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &19222680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: ffi
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *19222680
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: &19222164 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rautomation
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *19222164
+- !ruby/object:Gem::Dependency
+  name: rautomation
+  requirement: &19221684 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 6
-        - 3
-        version: 0.6.3
+      - !ruby/object:Gem::Version
+        version: 0.7.2
   type: :runtime
-  version_requirements: *id006
-description: "    WATIR is \"Web Application Testing in Ruby\". Watir (pronounced water) is a free,\n    open-source functional testing tool for automating browser-based tests of web applications.\n    It works with applications written in any language.\n    Watir drives the Internet Explorer browser the same way an end user would.\n    It clicks links, fills in forms, presses buttons.\n    Watir also checks results, such as whether expected text appears on the\n    page, or whether a control is enabled.\n    Watir can test web applications written in any language.\n    Watir is a Ruby library that works with Internet Explorer on Windows.\n"
+  prerelease: false
+  version_requirements: *19221684
+description: ! "    WATIR is \"Web Application Testing in Ruby\". Watir (pronounced
+  water) is a free,\n    open-source functional testing tool for automating browser-based
+  tests of web applications.\n    It works with applications written in any language.\n
+  \   Watir drives the Internet Explorer browser the same way an end user would.\n
+  \   It clicks links, fills in forms, presses buttons.\n    Watir also checks results,
+  such as whether expected text appears on the\n    page, or whether a control is
+  enabled.\n    Watir can test web applications written in any language.\n    Watir
+  is a Ruby library that works with Internet Explorer on Windows.\n"
 email: watir-general@groups.google.com
-executables: 
+executables:
 - watir-console
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - CHANGES
 - rakefile.rb
 - VERSION
@@ -130,17 +99,15 @@ files:
 - watir.gemspec
 - watir-rdoc.rb
 - LICENSE
-- lib/watir/camel_case.rb
 - lib/watir/close_all.rb
-- lib/watir/collections.rb
 - lib/watir/container.rb
-- lib/watir/cookiemanager.rb
+- lib/watir/cookies.rb
 - lib/watir/core.rb
+- lib/watir/drag_and_drop_helper.rb
 - lib/watir/element.rb
-- lib/watir/element_collections.rb
+- lib/watir/element_collection.rb
 - lib/watir/form.rb
 - lib/watir/frame.rb
-- lib/watir/html_element.rb
 - lib/watir/ie-class.rb
 - lib/watir/ie-process.rb
 - lib/watir/ie.rb
@@ -156,10 +123,12 @@ files:
 - lib/watir/page-container.rb
 - lib/watir/process.rb
 - lib/watir/screen_capture.rb
+- lib/watir/supported_elements.rb
 - lib/watir/table.rb
 - lib/watir/win32.rb
 - lib/watir/win32ole.rb
 - lib/watir/window.rb
+- lib/watir/xpath_locator.rb
 - lib/watir/dialogs/file_field.rb
 - lib/watir/dialogs/javascript.rb
 - unittests/all_tests.rb
@@ -171,7 +140,6 @@ files:
 - unittests/core_tests.rb
 - unittests/css_selector_test.rb
 - unittests/css_test.rb
-- unittests/defer_test.rb
 - unittests/dialog_test.rb
 - unittests/div2_xpath_test.rb
 - unittests/div_test.rb
@@ -200,7 +168,6 @@ files:
 - unittests/lists_test.rb
 - unittests/map_test.rb
 - unittests/minmax_test.rb
-- unittests/multiple_specifiers_test.rb
 - unittests/navigate_test.rb
 - unittests/nbsp_xpath_test.rb
 - unittests/non_core_tests.rb
@@ -216,7 +183,6 @@ files:
 - unittests/selectbox_xpath_test.rb
 - unittests/setup.rb
 - unittests/speed_settings_test.rb
-- unittests/table_and_tablerow_to_a_test.rb
 - unittests/table_cell_using_xpath_test.rb
 - unittests/table_test.rb
 - unittests/table_xpath_test.rb
@@ -313,7 +279,6 @@ files:
 - unittests/windows/close_window_test.rb
 - unittests/windows/frame_links_test.rb
 - unittests/windows/ie-each_test.rb
-- unittests/windows/iedialog_test.rb
 - unittests/windows/modal_dialog_test.rb
 - unittests/windows/new_process_test.rb
 - unittests/windows/new_test.rb
@@ -321,15 +286,16 @@ files:
 - unittests/windows/send_keys_test.rb
 - lib/watir/IEDialog/Release/IEDialog.dll
 - lib/watir/win32ole/1.8.7/win32ole.so
+- lib/watir/win32ole/1.9.3/win32ole.so
 - lib/watir/contrib/enabled_popup.rb
 - lib/watir/contrib/ie-new-process.rb
 - lib/watir/contrib/page_checker.rb
-- bin/watir-console
+- !binary |-
+  YmluL3dhdGlyLWNvbnNvbGU=
 homepage: http://www.watir.com/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - Watir API Reference
 - --accessor
@@ -338,36 +304,25 @@ rdoc_options:
 - README.rdoc
 - --exclude
 - unittests|camel_case.rb
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
-requirements: 
+requirements:
 - Microsoft Windows running Internet Explorer 5.5 or later.
 rubyforge_project: Watir
-rubygems_version: 1.8.4
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Automated testing tool for web applications.
 test_files: []
-

data/lib/watir/camel_case.rb

@@ -1,67 +0,0 @@
-# These are provided for backwards compatability with Watir 1.1
-
-module Watir
-    module Container
-        alias waitForIE wait
-        alias fileField file_field
-        alias textField text_field
-        alias selectBox select_list
-        alias checkBox checkbox
-    end
-    class IE
-        alias getStatus status
-        alias getDocument document
-        alias pageContainsText contains_text
-        alias waitForIE wait
-        alias getHTML html
-        alias getText text
-        alias showFrames show_frames
-        alias showForms show_forms
-        alias showImages show_images
-        alias showLinks show_links
-        alias showActive show_active
-        alias showAllObjects show_all_objects
-        def   getIE; @ie; end
-        
-    end
-    class Element
-        alias getOLEObject ole_object 
-        alias fireEvent fire_event        
-        alias innerText text
-        alias afterText after_text
-        alias beforeText before_text
-    end    
-    class Frame        
-        alias getDocument document
-        alias waitForIE wait
-    end
-    class Form        
-        alias waitForIE wait 
-    end
-
-
-    class Image
-      alias fileCreatedDate file_created_date
-      alias fileSize file_size
-      alias hasLoaded? loaded?
-    end
-    
-    class RadioCheckCommon
-      alias getState set?
-      alias isSet?   set?
-    end
-    
-    class TextField
-        alias readOnly? :readonly?
-        alias getContents value
-        alias maxLength maxlength
-        alias dragContentsTo drag_contents_to
-    end 
-    
-    class SelectList
-        alias getAllContents options
-        alias getSelectedItems selected_options
-        alias clearSelection clear
-        alias includes? include?
-    end   
-end