watir 1.9.1 → 1.9.2.rc1

data/CHANGES

@@ -1,4 +1,15 @@
-== Version 1.9.1 - 2011/07/
+== Version 1.9.2 - 2011/xx/xx
+
+=== IE improvements
+* Bump RAutomation dependency version to 0.6.2 to:
+ - fix/improve Watir::IE#send_keys.
+ - fix Watir::IE loading for certain Windows XP environments (http://jira.openqa.org/browse/WTR-484).
+* Restored Watir::IE#autoit method to use RAutomation's AutoIt adapter with a deprecation warning.
+* Cache IE.version result to not access registry with each execution - was causing slowness in TextField#set for example.
+* Do not raise UnknownObjectException if parent element doesn't exist when calling Element#exists?
+* Element#flash highlights elements again (http://jira.openqa.org/browse/WTR-478)
+
+== Version 1.9.1 - 2011/06/30
 
 * Bug fixes for IE9
 

data/VERSION

@@ -1 +1 @@
-1.9.1
+1.9.2.rc1

data/lib/watir/element.rb

@@ -211,25 +211,14 @@ module Watir
     def highlight(set_or_clear)
       if set_or_clear == :set
         begin
-          if IE.version_parts[0].to_i >= 9
-            @original_color ||= ole_object.style.backgroundColor
-            ole_object.style.backgroundColor = @container.activeObjectHighLightColor
-          else
-            @original_color ||= style.backgroundColor
-            style.backgroundColor = @container.activeObjectHighLightColor
-          end
+          @original_color ||= ole_object.style.backgroundColor
+          ole_object.style.backgroundColor = @container.activeObjectHighLightColor
         rescue
           @original_color = nil
         end
-      else # BUG: assumes is :clear, but could actually be anything
+      else
         begin
-          unless @original_color == nil
-            if IE.version_parts[0].to_i >= 9
-              ole_object.style.backgroundColor = @original_color
-            else
-              style.backgroundColor = @original_color
-            end
-          end
+          ole_object.style.backgroundColor = @original_color if @original_color
         rescue
           # we could be here for a number of reasons...
           # e.g. page may have reloaded and the reference is no longer valid
@@ -383,10 +372,10 @@ module Watir
     def exists?
       begin
         locate if defined?(locate)
-      rescue WIN32OLERuntimeError
+      rescue WIN32OLERuntimeError, UnknownObjectException
         @o = nil
       end
-      @o ? true: false
+      !!@o
     end
 
     alias :exist? :exists?

data/lib/watir/ie-class.rb

@@ -250,13 +250,13 @@ module Watir
     end
 
     def self.version
-      begin
-        require 'win32/registry'
-        ::Win32::Registry::HKEY_LOCAL_MACHINE.open("SOFTWARE\\Microsoft\\Internet Explorer") do |ie_key|
-          ie_key.read('Version').last
-        end
-        # OR: ::WIN32OLE.new("WScript.Shell").RegRead("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Internet Explorer\\Version")
-      end
+      @ie_version ||= begin
+                        require 'win32/registry'
+                        ::Win32::Registry::HKEY_LOCAL_MACHINE.open("SOFTWARE\\Microsoft\\Internet Explorer") do |ie_key|
+                          ie_key.read('Version').last
+                        end
+                        # OR: ::WIN32OLE.new("WScript.Shell").RegRead("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Internet Explorer\\Version")
+                      end
     end
 
     def self.version_parts
@@ -461,16 +461,18 @@ module Watir
     end
 
     def autoit
-      raise NotImplementedError, 'Watir no longer uses AutoIT. ' <<
-                                 'If you need this functionality you can downgrade to v1.8.1 ' <<
-                                 'or update your scripts to use ie.rautomation. ' <<
-                                 'Please refer to https://github.com/jarmo/RAutomation'
+      Kernel.warn "Usage of Watir::IE#autoit method is DEPRECATED! Use Watir::IE#rautomation method instead. Refer to https://github.com/jarmo/RAutomation for updating your scripts."
+      @autoit ||= ::RAutomation::Window.new(:hwnd => hwnd, :adapter => :autoit)
+      @autoit
     end
 
     # Activates the window and sends keys to it.
     #
-    # Refer to MSDN documentation at http://msdn.microsoft.com/en-us/library/dd375731(v=VS.85).aspx
-    # for the keycodes.
+    # Example:
+    #   browser.send_keys("Hello World{enter}")
+    #
+    # Refer to RAutomation::Adapter::WinFfi::KeystrokeConverter.convert_special_characters for
+    # special characters conversion.
     # @see RAutomation::Window#send_keys
     def send_keys(key_string)
       rautomation.send_keys key_string

data/unittests/element_test.rb

@@ -43,6 +43,5 @@ class TC_Elements < Test::Unit::TestCase
     assert !browser.element(:id, 'buttons1').button(:index,3).exists? 
     assert browser.element(:id, 'buttons1').button(:name,'b1').exists? 
   end
-  
 
-end
+end

data/watir.gemspec

@@ -40,7 +40,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency 'firewatir', '= ' + version
   s.add_dependency 'nokogiri'
   s.add_dependency 'ffi', '~>1.0'
-  s.add_dependency 'rautomation', '~>0.5'
+  s.add_dependency 'rautomation', '~>0.6.2'
 
   s.has_rdoc = true
   s.rdoc_options += $WATIR_RDOC_OPTIONS

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: watir
 version: !ruby/object:Gem::Version 
-  hash: 49
-  prerelease: 
+  hash: 15424183
+  prerelease: 6
   segments: 
   - 1
   - 9
+  - 2
+  - rc
   - 1
-  version: 1.9.1
+  version: 1.9.2.rc1
 platform: ruby
 authors: 
 - Bret Pettichord
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 Z
+date: 2011-07-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: win32-process
@@ -57,12 +59,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 15424183
         segments: 
         - 1
         - 9
+        - 2
+        - rc
         - 1
-        version: 1.9.1
+        version: 1.9.2.rc1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -73,12 +77,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 15424183
         segments: 
         - 1
         - 9
+        - 2
+        - rc
         - 1
-        version: 1.9.1
+        version: 1.9.2.rc1
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -118,11 +124,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
         - 0
-        - 5
-        version: "0.5"
+        - 6
+        - 2
+        version: 0.6.2
   type: :runtime
   version_requirements: *id007
 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"
@@ -352,16 +359,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - Microsoft Windows running Internet Explorer 5.5 or later.
 rubyforge_project: Watir
-rubygems_version: 1.7.2
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: Automated testing tool for web applications.