watir-classic 3.5.0 → 3.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjFhN2FkNjA3OWY3Y2NjM2ZiM2UwNGU3OWRhNWJmY2ViYThjMDc1Ng==
-  data.tar.gz: !binary |-
-    OTU2NmYzOWZkZmY2NGM5ZDgxOWVjZDUxZWZjYzhhYWU5MTZlN2VjNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZTg1ODg2NjFjZTUyYzM2MGQxODhmYjY1NzkwOTVkNTRkNzY2MDNjYzUwYTRj
-    ZjI4ZGJmNDA0MWFhMjk1YTI2ZDljNDkzMjVhNjUwMGQyOGJiODkwZWZiOWJl
-    N2EyOWY4NTIzN2Q0OWJiYWEyY2MzNjcyNDU5Yjc4YjUzOTI2ZWQ=
-  data.tar.gz: !binary |-
-    OTYyNWQ2YjVkYjA4NWQyMjFlZWQwYWNiNDNjYjA2MWFhYWQ0M2VmNDE4YTI0
-    ZTdhNzBlNGQ2MjY1MGE5ZTNhYmFmNjJmMTlkMDJjMjE4MjI1NzgwNjhjNTFi
-    MjJmY2NlNzk0OTVlY2Y4YWQ5OTcyMDZjZTdlZWYzZmFjYmVjMDg=
+SHA1:
+  metadata.gz: 3fade9f7ab5eddd5282759d5e6fad042ba20505a
+  data.tar.gz: b5877f740e2e7cba0702f02a6b168e3bbecc98f1
+SHA512:
+  metadata.gz: 1556009c313738b71cfdeacfe325ebb5eb1a2a84eb29cf8a919f2852007118e2fd522657a7c3cfc4646571e481117df3aa3b9d349f1746f6f15ecdd2bd86d15d
+  data.tar.gz: 8ce619e8d51e9f190fdf58a0afaa51bbb366a461c88172e0a320dae9b240790ee7f22e900f745fc13b7702503354fa421e0a633c456f7b8830ea4f2d9d9e834d

data/CHANGES

@@ -1,3 +1,11 @@
+== 3.6.0 - 2013/03/16
+
+* Add full support for Ruby 2.0 and IE10.
+* Add support for modal dialogs on Ruby 2.0.
+* Bump up nokogiri dependency for Ruby 2.0 support.
+* Fix Browser#version for IE10.
+* SelectList#select and SelectList#select_value return empty string when value is removed after selection.
+
 == 3.5.0 - 2013/03/10
 
 * Browser#name returns :internet_explorer instead of :ie.

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    watir-classic (3.4.0)
+    watir-classic (3.5.0)
       ffi (~> 1.0)
       multi_json
-      nokogiri
+      nokogiri (= 1.5.7.rc3)
       rautomation (~> 0.7)
       user-choices
       win32-process (>= 0.5.5)
@@ -25,8 +25,7 @@ GEM
     mini_magick (3.5.0)
       subexec (~> 0.2.1)
     multi_json (1.6.1)
-    nokogiri (1.5.6)
-    nokogiri (1.5.6-x86-mingw32)
+    nokogiri (1.5.7.rc3-x86-mingw32)
     rack (1.5.2)
     rack-protection (1.4.0)
       rack
@@ -54,7 +53,6 @@ GEM
       builder (>= 2.1.2)
       s4t-utils (>= 1.0.3)
       xml-simple (>= 1.0.11)
-    win32-api (1.4.8)
     win32-api (1.4.8-x86-mingw32)
     win32-process (0.7.1)
       ffi (>= 1.0.0)

data/README.rdoc

@@ -69,3 +69,11 @@ Checking for text in a page
 Checking the title of a page
 
   puts browser.title == "Thanks!"
+
+== Supported Platforms
+
+Watir-Classic is supported on Ruby 1.8.7, 1.9.3 and 2.0.0. It should work on Internet Explorer 8, 9 and 10.
+
+Let us know at {Watir's Mailing List}[https://groups.google.com/forum/?fromgroups#!forum/watir-general] or
+through {Issues}[https://github.com/watir-classic-issues] if there's any problems.
+

data/VERSION

@@ -1 +1 @@
-3.5.0
+3.6.0

data/lib/watir-classic/ie-class.rb

@@ -130,9 +130,12 @@ module Watir
         @ie_version ||= begin
                           require 'win32/registry'
                           ::Win32::Registry::HKEY_LOCAL_MACHINE.open("SOFTWARE\\Microsoft\\Internet Explorer") do |ie_key|
-                            ie_key.read('Version').last
+                            begin
+                              ie_key['svcVersion']
+                            rescue ::Win32::Registry::Error
+                              ie_key['Version']
+                            end
                           end
-                          # OR: ::WIN32OLE.new("WScript.Shell").RegRead("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Internet Explorer\\Version")
                         end
       end
 

data/lib/watir-classic/input_elements.rb

@@ -45,7 +45,7 @@ module Watir
         raise NoValueFoundException, "No option with :text, :label or :value of #{item.inspect} in this select element" if matching_options.empty?
         matching_options.each(&:select)
       end
-      matching_options.first.text
+      first_present_option_value matching_options, :text
     end
 
     # Select an item or items in a select box by option's value.
@@ -58,7 +58,7 @@ module Watir
       matching_options = matching_items_in_select_list(:value, item)
       raise NoValueFoundException, "No option with :value of #{item.inspect} in this select element" if matching_options.empty?
       matching_options.each(&:select)
-      matching_options.first.value
+      first_present_option_value matching_options, :value
     end
 
     # @example Retrieve selected options as a text:
@@ -100,6 +100,11 @@ module Watir
         end
       end
     end
+
+    def first_present_option_value(matching_options, field_to_return)
+      first_matching_option = matching_options.first
+      first_matching_option.present? ? first_matching_option.send(field_to_return) : ""
+    end
   end
 
   # Returned by {Container#option}.

data/lib/watir-classic/win32ole.rb

@@ -3,9 +3,11 @@
 # Use our modified win32ole library
 
 if RUBY_VERSION =~ /^1\.8/
-  $LOAD_PATH.unshift  File.expand_path(File.join(File.dirname(__FILE__), '..', 'watir-classic', 'win32ole', '1.8.7'))
+  $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'watir-classic', 'win32ole', '1.8.7'))
 elsif RUBY_VERSION =~ /^1\.9/
-  $LOAD_PATH.unshift  File.expand_path(File.join(File.dirname(__FILE__), '..', 'watir-classic', 'win32ole', '1.9.3'))
+  $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'watir-classic', 'win32ole', '1.9.3'))
+elsif RUBY_VERSION =~ /^2\.0/
+  $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'watir-classic', 'win32ole', '2.0.0'))
 else
   # loading win32ole from stdlib
 end

data/lib/watir-classic/win32ole/2.0.0/win32ole.patch

@@ -0,0 +1,50 @@
+--- win32ole.c	2013-01-25 12:17:59 +0200
++++ win32ole.c.patched	2013-03-14 22:51:33 +0200
+@@ -9076,6 +9076,39 @@
+     st_free_table(enc2cp_table);
+ }
+ 
++/*
++ * WIN32OLE.connect_unknown( pUnknown ) --> aWIN32OLE
++ * ----
++ * Returns running OLE Automation object or WIN32OLE object from an IUnknown pointer
++ * the IUnknown pointer is passed in as a FIXNUM
++ */
++static VALUE
++fole_s_connect_unknown(VALUE self, VALUE iUnknown)
++{
++    HRESULT hr;
++    IDispatch *pDispatch;
++    IUnknown *pUnknown;
++
++    /* initialize to use OLE */
++    ole_initialize();
++
++    //cast from int to IUnknown*
++    pUnknown = (IUnknown*)FIX2INT(iUnknown);
++
++    hr = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IDispatch,
++                                              (void **)&pDispatch);
++    if(FAILED(hr)) {
++        OLE_RELEASE(pUnknown);
++        ole_raise(hr, eWIN32OLERuntimeError,
++                  "Failed to connect to WIN32OLE server `%d'",
++                  FIX2INT(iUnknown));
++    }
++
++    OLE_RELEASE(pUnknown);
++
++    return create_win32ole_object(self, pDispatch, 0,0);
++}
++
+ void
+ Init_win32ole(void)
+ {
+@@ -9109,6 +9142,7 @@
+     rb_define_method(cWIN32OLE, "initialize", fole_initialize, -1);
+ 
+     rb_define_singleton_method(cWIN32OLE, "connect", fole_s_connect, -1);
++    rb_define_singleton_method(cWIN32OLE, "connect_unknown", fole_s_connect_unknown, 1);
+     rb_define_singleton_method(cWIN32OLE, "const_load", fole_s_const_load, -1);
+ 
+     rb_define_singleton_method(cWIN32OLE, "ole_free", fole_s_free, 1);

data/lib/watir-classic/win32ole/build_notes.txt

@@ -5,7 +5,7 @@ Compiling win32ole (Ruby 1.8.7 +)
 (2) Download and install the Ruby DevKit: https://github.com/oneclick/rubyinstaller/wiki/Development-Kit
 (3) Check out the source code: http://www.ruby-lang.org/en/community/ruby-core/
 (4) Go to the directory where you installded the DevKit and run devkitvars.bat
-(5) Go into the ruby source tree: ruby/etc/win32ole
+(5) Go into the ruby source tree: ext/win32ole
 (6) Make sure you can build without the patch
   (a) Run: 'ruby extconf.rb'
   (b) Run: 'make'

data/spec/implementation.rb

@@ -4,7 +4,7 @@ require "watir-classic"
 WatirSpec.implementation do |imp|
   imp.name = :watir_classic
 
-  WatirSpec.persistent_browser = false
+  WatirSpec.persistent_browser = true
   imp.browser_class = Watir::IE
   browser = :internet_explorer
   browser_version = "#{browser}#{imp.browser_class.version.to_i}".to_sym

data/watir-classic.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'win32-process', '>= 0.5.5'
   s.add_dependency 'windows-pr', '>= 0.6.6'
-  s.add_dependency 'nokogiri'
+  s.add_dependency 'nokogiri', ">= 1.5.7.rc3"
   s.add_dependency 'ffi', '~>1.0'
   s.add_dependency 'rautomation', '~>0.7'
   s.add_dependency 'user-choices'

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: watir-classic
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Bret Pettichord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-process
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: windows-pr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.7.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.7.rc3
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -84,42 +84,42 @@ dependencies:
   name: user-choices
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: win32screenshot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -140,66 +140,68 @@ dependencies:
   name: syntax
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-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"
+description: |2
+      WATIR is "Web Application Testing in Ruby". Watir (pronounced water) is a free,
+      open-source functional testing tool for automating browser-based tests of web applications.
+      It works with applications written in any language.
+      Watir drives the Internet Explorer browser the same way an end user would.
+      It clicks links, fills in forms, presses buttons.
+      Watir also checks results, such as whether expected text appears on the
+      page, or whether a control is enabled.
+      Watir can test web applications written in any language.
+      Watir is a Ruby library that works with Internet Explorer on Windows.
 email: watir-general@groups.google.com
 executables: []
 extensions: []
@@ -267,6 +269,8 @@ files:
 - lib/watir-classic/win32ole/1.8.7/win32ole.so
 - lib/watir-classic/win32ole/1.9.3/win32ole.patch
 - lib/watir-classic/win32ole/1.9.3/win32ole.so
+- lib/watir-classic/win32ole/2.0.0/win32ole.patch
+- lib/watir-classic/win32ole/2.0.0/win32ole.so
 - lib/watir-classic/win32ole/build_notes.txt
 - lib/watir-classic/win32ole/history.txt
 - lib/watir-classic/window.rb
@@ -289,18 +293,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - Microsoft Windows running Internet Explorer 5.5 or later.
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Automated testing tool for web applications.