watir 1.8.1 → 1.9.0.rc1

data/CHANGES

@@ -1,3 +1,13 @@
+== Version 1.9.0 -2011//
+
+* Added support for IE9
+* Updated watir/ie for Ruby 1.8.7 and are no longer supporting Ruby 1.8.6.
+  * Using RAutomation instead of Autoit, WinClicker and the WindowHelper
+  * New implementation of ie.file_field
+  * Replaced ie.dialog with ie.javascript_dialog
+  * Recompiled win32ole for 1.8.7 mingw and removed win32ole for 1.8.6
+
+
 == Version 1.8.1 - 2011/04/08
 
 === IE improvements

data/VERSION

@@ -1 +1 @@
-1.8.1
+1.9.0.rc1

data/lib/watir/container.rb

@@ -269,9 +269,14 @@ module Watir
     #    browser.file_field(:index, 2)                         # access the second file upload on the page (1 based, so the first field is accessed with :index,1)
     #
     def file_field(how, what=nil)
-      FileField.new(self, how, what)
+      FileUpload.new(self, how, what)
     end
-    
+
+    def javascript_dialog(opts={})
+      JavascriptDialog.new(opts)
+    end
+    alias :dialog :javascript_dialog
+
     # this is the main method for accessing the file_fields iterator. It returns a FileFields object
     #
     # Typical usage:

data/lib/watir/core.rb

@@ -29,3 +29,7 @@ require 'watir/link'
 require 'watir/html_element'
 
 require 'watir/module'
+
+require 'rautomation'
+require 'watir/dialogs/file_upload'
+require 'watir/dialogs/javascript'

data/lib/watir/dialogs/file_upload.rb

@@ -0,0 +1,36 @@
+module Watir
+  class FileUpload < InputElement
+    #:stopdoc:
+    INPUT_TYPES = ["file"]
+    #:startdoc:
+
+    def set(file_path)
+      assert_file_exists(file_path)
+      assert_exists
+      click_no_wait
+      set_file_name file_path
+      open_button.click
+    end
+
+    def assert_file_exists(file_path)
+      raise WatirException, "#{file_path} has to exist to set!" unless File.exists?(file_path)
+    end
+
+    def set_file_name(path_to_file)
+      file_upload_window.text_field(:class => 'Edit', :index => 0).set path_to_file
+    end
+
+    def open_button
+      file_upload_window.button(:value => '&Open')
+    end
+
+    def cancel_button
+      file_upload_window.button(:value => 'Cancel')
+    end
+
+    def file_upload_window
+      @window ||= RAutomation::Window.new(:title => /^choose file( to upload)?$/i)
+    end
+
+  end
+end

data/lib/watir/dialogs/javascript.rb

@@ -0,0 +1,47 @@
+module Watir
+
+  class JavascriptDialog
+    WINDOW_TITLES = ['Message from webpage', 'Windows Internet Explorer','Microsoft Internet Explorer']
+
+    attr_accessor :timeout
+
+    def initialize(opts={})
+      @opts = opts
+      @timeout = 30
+    end
+
+    def exists?
+      javascript_dialog_window.exists?
+    end
+
+    def button(value)
+      javascript_dialog_window.button(:value => value)
+    end
+
+    def close
+      javascript_dialog_window.close
+    end
+
+    def text
+      javascript_dialog_window.text
+    end
+
+    def javascript_dialog_window
+      return @window if @window
+      begin
+        original_timeout = RAutomation::Window.wait_timeout
+        RAutomation::Window.wait_timeout = @timeout
+        ::RAutomation::Window.new(:title => @opts[:title] || /^(#{WINDOW_TITLES.join('|')})$/)
+      ensure
+        RAutomation::Window.wait_timeout = original_timeout
+      end
+      @window
+    end
+
+  end
+end
+
+
+
+
+

data/lib/watir/element.rb

@@ -251,7 +251,7 @@ module Watir
     def generate_ruby_code(element, method_name, *args)
       element = "#{self.class}.new(#{@page_container.attach_command}, :unique_number, #{self.unique_number})"
       method = build_method(method_name, *args)
-      ruby_code = "$:.unshift(#{$LOAD_PATH.grep(%r{watir(-.*?)?/lib}).map {|p| "'#{p}'" }.join(").unshift(")});" <<
+      ruby_code = "$:.unshift(#{$LOAD_PATH.map {|p| "'#{p}'" }.join(").unshift(")});" <<
                     "require '#{File.expand_path(File.dirname(__FILE__))}/core';#{element}.#{method};"
       return ruby_code
     end
@@ -276,7 +276,10 @@ module Watir
       assert_enabled
 
       highlight(:set)
-      ole_object.click
+      # Not sure why but in IE9 Document mode, passing a parameter
+      # to click seems to work. Firing the onClick event breaks other tests
+      # so this seems to be the safest change and also works fine in IE8
+      ole_object.click(0)
       highlight(:clear)
     end
 
@@ -300,13 +303,50 @@ module Watir
     def fire_event(event)
       assert_exists
       assert_enabled
-
       highlight(:set)
-      ole_object.fireEvent(event)
+      dispatch_event(event)
       @container.wait
       highlight(:clear)
     end
 
+    def dispatch_event(event)
+      if IE.version_parts.first.to_i >= 8 && @container.page_container.document.respond_to?(:createEvent)
+        # we're in IE9 document standards mode
+        ole_object.dispatchEvent(create_event(event))
+      else
+        ole_object.fireEvent(event)
+      end
+    end
+
+    def create_event(event)
+       event =~ /on(.*)/i
+       event = $1 if $1
+       event.downcase!
+
+       # See http://www.howtocreate.co.uk/tutorials/javascript/domevents
+       case event
+         when 'abort', 'blur', 'change', 'error', 'focus', 'load',
+              'reset', 'resize', 'scroll', 'select', 'submit', 'unload'
+           dom_event_type = 'HTMLEvents'
+           dom_event_init = "initEvent(\"#{event}\", true, true)"
+         when 'keydown', 'keypress', 'keyup'
+           dom_event_type = 'KeyEvents'
+           #   'type', bubbles, cancelable, windowObject, ctrlKey, altKey, shiftKey, metaKey, keyCode, charCode
+           dom_event_init = "initKeyEvent(\"#{event}\", true, true, #{@container.page_container.window}, false, false, false, false, 0, 0)"
+         when 'click', 'dblclick', 'mousedown', 'mousemove', 'mouseout', 'mouseover',
+                       'mouseup'
+           dom_event_type = 'MouseEvents'
+           #   'type', bubbles, cancelable, windowObject, detail, screenX, screenY, clientX, clientY, ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget
+           dom_event_init = "initMouseEvent(\"#{event}\", true, true, #{@container.page_container.window}, 1, 0, 0, 0, 0, false, false, false, false, 0, null)"
+         else
+           dom_event_type = 'HTMLEvents'
+           dom_event_init = "initEvents(\"#{event}\", true, true)"
+         end
+        event = @container.page_container.document.createEvent("HTMLEvents")
+        event.initEvent("change", true, true)
+       event
+     end
+
     # This method sets focus on the active element.
     #   raises: UnknownObjectException  if the object is not found
     #           ObjectDisabledException if the object is currently disabled

data/lib/watir/frame.rb

@@ -17,7 +17,16 @@ module Watir
           located_frame, document = locator.locate
           unless (located_frame.nil? && document.nil?)
             @o = located_frame
-            @document = document.document
+            begin
+              @document = document.document
+            rescue WIN32OLERuntimeError => e
+              if e.message =~ /Access is denied/
+                # This frame's content is not directly accessible but let the
+                # user continue so they can access the frame properties
+              else
+                raise e
+              end
+            end
             break
           end
         end
@@ -38,7 +47,11 @@ module Watir
     
     def document
       assert_exists
-      @document
+      if @document
+        @document
+      else
+        raise FrameAccessDeniedException, "IE will not allow access to this frame for security reasons. You can work around this with ie.goto(frame.src)"
+      end
     end
 
     def attach_command

data/lib/watir/ie-class.rb

@@ -249,7 +249,21 @@ module Watir
       end
     end
 
-    # return internet explorer instance as specified. if none is found, 
+    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
+    end
+
+    def self.version_parts
+      version.split('.')
+    end
+
+    # return internet explorer instance as specified. if none is found,
     # return nil.
     # arguments:
     #   :url, url -- the URL of the IE browser window
@@ -413,43 +427,53 @@ module Watir
 
     # Maximize the window (expands to fill the screen)
     def maximize
-      set_window_state :SW_MAXIMIZE
+      rautomation.maximize
     end
 
     # Minimize the window (appears as icon on taskbar)
     def minimize
-      set_window_state :SW_MINIMIZE
+      rautomation.minimize
+    end
+
+    def minimized?
+      rautomation.minimized?
     end
 
     # Restore the window (after minimizing or maximizing)
     def restore
-      set_window_state :SW_RESTORE
+      rautomation.restore
     end
 
     # Make the window come to the front
-    def bring_to_front
-      autoit.WinActivate title, ''
+    def activate
+      rautomation.activate
     end
+    alias :bring_to_front :activate
 
-    def front?
-      1 == autoit.WinActive(title, '')
+    def active?
+      rautomation.active?
     end
+    alias :front? :active?
 
-    private
-    def set_window_state(state)
-      autoit.WinSetState title, '', autoit.send(state)
+    def rautomation
+      @rautomation ||= ::RAutomation::Window.new(:hwnd => hwnd)
+      @rautomation
     end
+
     def autoit
-      Watir::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'
     end
-    public
 
-    # Send key events to IE window.
-    # See http://www.autoitscript.com/autoit3/docs/appendix/SendKeys.htm
-    # for complete documentation on keys supported and syntax.
+    # 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.
+    # @see RAutomation::Window#send_keys
     def send_keys(key_string)
-      autoit.WinActivate title
-      autoit.Send key_string
+      rautomation.send_keys key_string
     end
 
     def dir

data/lib/watir/ie.rb

@@ -1,13 +1,8 @@
 require 'watir'
 require 'watir/core'
-require 'watir/winClicker'
 require 'watir/close_all'
 require 'watir/ie-process'
 
-require 'dl/import'
-require 'dl/struct'
-require 'Win32API'
-
 # these switches need to be deleted from ARGV to enable the Test::Unit
 # functionality that grabs
 # the remaining ARGV as a filter on what tests to run.
@@ -25,8 +20,10 @@ $FAST_SPEED = ARGV.delete('-f')
 ARGV.delete('-s')
 
 require 'watir/win32'
-require 'watir/popup'
 require 'watir/modal_dialog'
 require 'watir/collections'
 
 require 'watir/camel_case'
+
+
+

data/lib/watir/image.rb

@@ -107,11 +107,8 @@ module Watir
     # will not overwrite a previously existing image.  If an image already
     # exists at the given path then a dialog will be displayed prompting
     # for overwrite.
-    # Raises a WatirException if AutoIt is not correctly installed
     # path - directory path and file name of where image should be saved
     def save(path)
-      require 'watir/windowhelper'
-      WindowHelper.check_autoit_installed
       @container.goto(src)
       begin
         thrd = fill_save_image_dialog(path)
@@ -123,8 +120,12 @@ module Watir
     end
     
     def fill_save_image_dialog(path)
+      command = "require 'rautomation';" <<
+                "window=::RAutomation::Window.new(:title => 'Save Picture');" <<
+                "window.text_field(:class => 'Edit', :index => 0).set('#{path}');" <<
+                "window.button(:value => '&Save').click"
       Thread.new do
-        system("ruby -e \"require 'win32ole'; @autoit=WIN32OLE.new('AutoItX3.Control'); waitresult=@autoit.WinWait 'Save Picture', '', 15; if waitresult == 1\" -e \"@autoit.ControlSetText 'Save Picture', '', '1148', '#{path}'; @autoit.ControlSend 'Save Picture', '', '1', '{ENTER}';\" -e \"end\"")
+        system("ruby -e \"#{command}\"")
       end
     end
     private :fill_save_image_dialog

data/lib/watir/input_elements.rb

@@ -40,14 +40,14 @@ module Watir
       highlight(:clear)
     end
 
-    
+
     # This method selects an item, or items in a select box, by text.
     # Raises NoValueFoundException   if the specified value is not found.
     #  * item   - the thing to select, string or reg exp
     def select(item)
       select_item_in_select_list(:text, item)
     end
-    alias :set :select 
+    alias :set :select
        
     # Selects an item, or items in a select box, by value.
     # Raises NoValueFoundException   if the specified value is not found.
@@ -75,7 +75,7 @@ module Watir
             break
           else
             option.selected = true
-            @o.fireEvent("onChange")
+            dispatch_event("onChange")
             @container.wait
             found = true
             break
@@ -88,7 +88,7 @@ module Watir
       end
       highlight(:clear)
     end
-    
+
     # Returns array of all text items displayed in a select box
     # An empty array is returned if the select box has no contents.
     # Raises UnknownObjectException if the select box is not found
@@ -308,14 +308,14 @@ module Watir
       @o.select
       value = self.value
       
-      @o.fireEvent("onSelect")
-      @o.fireEvent("ondragstart")
-      @o.fireEvent("ondrag")
-      destination.fireEvent("onDragEnter")
-      destination.fireEvent("onDragOver")
-      destination.fireEvent("ondrop")
+      dispatch_event("onSelect")
+      dispatch_event("ondragstart")
+      dispatch_event("ondrag")
+      destination.dispatch_event("onDragEnter")
+      destination.dispatch_event("onDragOver")
+      destination.dispatch_event("ondrop")
       
-      @o.fireEvent("ondragend")
+      dispatch_event("ondragend")
       destination.value = destination.value + value.to_s
       self.value = ""
     end
@@ -334,10 +334,10 @@ module Watir
       @o.scrollIntoView
       @o.focus
       @o.select
-      @o.fireEvent("onSelect")
+      dispatch_event("onSelect")
       @o.value = ""
-      @o.fireEvent("onKeyPress")
-      @o.fireEvent("onChange")
+      dispatch_event("onKeyPress")
+      dispatch_event("onChange")
       @container.wait
       highlight(:clear)
     end
@@ -366,33 +366,33 @@ module Watir
       assert_exists
       assert_enabled
       assert_not_readonly
-      
+
       highlight(:set)
       @o.scrollIntoView
       if type_keys
 	      @o.focus
 	      @o.select
-	      @o.fireEvent("onSelect")
-	      @o.fireEvent("onKeyPress")
+	      dispatch_event("onSelect")
+	      dispatch_event("onKeyPress")
 	      @o.value = ""
 	      type_by_character(value)
-	      @o.fireEvent("onChange")
-	      @o.fireEvent("onBlur")
+	      dispatch_event("onChange")
+	      dispatch_event("onBlur")
 	    else
 				@o.value = limit_to_maxlength(value)
 	    end
       highlight(:clear)
     end
-    
-    # Sets the value of the text field directly. 
-    # It causes no events to be fired or exceptions to be raised, 
+
+    # Sets the value of the text field directly.
+    # It causes no events to be fired or exceptions to be raised,
     # so generally shouldn't be used.
     # It is preffered to use the set method.
     def value=(v)
       assert_exists
       @o.value = v.to_s
     end
-    
+
     def requires_typing #:nodoc:
     	@type_keys = true
     	self
@@ -403,7 +403,7 @@ module Watir
     end
 
     private
-    
+
     # Type the characters in the specified string (value) one by one.
     # It should not be used externally.
     #   * value - string - The string to enter into the text field
@@ -411,10 +411,10 @@ module Watir
       value = limit_to_maxlength(value)
       characters_in(value) do |c|
         sleep @container.typingspeed
-        @o.value = @o.value.to_s + c   
-        @o.fireEvent("onKeyDown")
-        @o.fireEvent("onKeyPress")
-        @o.fireEvent("onKeyUp")
+        @o.value = @o.value.to_s + c
+        dispatch_event("onKeyDown")
+        dispatch_event("onKeyPress")
+        dispatch_event("onKeyUp")
       end
     end
     
@@ -476,51 +476,7 @@ module Watir
     end
     
   end
-  
-  # For fields that accept file uploads
-  # Windows dialog is opened and handled in this case by autoit 
-  # launching into a new process.
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#file_field method
-  class FileField < InputElement
-    #:stopdoc:
-    INPUT_TYPES = ["file"]
-    POPUP_TITLES = ['Choose file', 'Choose File to Upload']
-    #:startdoc:
-    
-    # set the file location in the Choose file dialog in a new process
-    # will raise a WatirException if AutoIt is not correctly installed
-    def set(path_to_file)
-      assert_exists
-      require 'watir/windowhelper'
-      WindowHelper.check_autoit_installed
-      begin
-        Thread.new do
-          sleep 1 # it takes some time for popup to appear
-
-          system %{ruby -e '
-              require "win32ole"
-
-              @autoit = WIN32OLE.new("AutoItX3.Control")
-              time    = Time.now
 
-              while (Time.now - time) < 15 # the loop will wait up to 15 seconds for popup to appear
-                #{POPUP_TITLES.inspect}.each do |popup_title|
-                  next unless @autoit.WinWait(popup_title, "", 1) == 1
-
-                  @autoit.ControlSetText(popup_title, "", "Edit1", #{path_to_file.inspect})
-                  @autoit.ControlSend(popup_title, "", "Button2", "{ENTER}")
-                  exit
-                end # each
-              end # while
-          '}
-        end.join(1)
-      rescue
-        raise Watir::Exception::WatirException, "Problem accessing Choose file dialog"
-      end
-      click
-    end
-  end
-  
   # This class contains common methods to both radio buttons and check boxes.
   # Normally a user would not need to create this object as it is returned by the Watir::Container#checkbox or by Watir::Container#radio methods
   #--
@@ -547,15 +503,7 @@ module Watir
     end
     alias checked? set?
     
-    # This method is the common code for setting or clearing checkboxes and radio.
-    def set_clear_item(set)
-      @o.checked = set
-      @o.fireEvent("onClick")
-      @container.wait
-    end
-    private :set_clear_item
-    
-  end
+   end
   
   #--
   #  this class makes the docs better
@@ -572,7 +520,8 @@ module Watir
       assert_exists
       assert_enabled
       highlight(:set)
-      set_clear_item(false)
+      @o.checked = false
+      highlight(:clear)
       highlight(:clear)
     end
     
@@ -584,12 +533,13 @@ module Watir
       assert_enabled
       highlight(:set)
       @o.scrollIntoView
-      set_clear_item(true)
+      @o.checked = true
+      click
       highlight(:clear)
     end
-    
+
   end
-  
+
   # This class is the watir representation of a check box.
   # Normally a user would not need to create this object as it is returned by the Watir::Container#checkbox method
   class CheckBox < RadioCheckCommon
@@ -603,8 +553,9 @@ module Watir
       assert_exists
       assert_enabled
       highlight :set
-      unless @o.checked == value
-        set_clear_item value
+      current_value = @o.checked
+      unless value == current_value
+        click
       end
       highlight :clear
     end
@@ -615,7 +566,7 @@ module Watir
     def clear
       set false
     end
-        
+
   end
-  
+
 end