watir 1.6.5 → 1.6.6.rc1

data/lib/watir/ie-process.rb

@@ -1,40 +1,40 @@
-require 'win32/process'
-
-module Watir
-  class IE
-    class Process
-      def self.start
-        program_files = ENV['ProgramFiles'] || "c:\\Program Files"
-        startup_command = "#{program_files}\\Internet Explorer\\iexplore.exe"
-        process_info = ::Process.create('app_name' => "#{startup_command} about:blank")
-        process_id = process_info.process_id
-        new process_id
-      end
-      
-      def initialize process_id
-        @process_id = process_id
-      end
-      attr_reader :process_id
-      
-      def window
-        Waiter.wait_until do
-          IE.each do | ie |
-            window = ie.ie
-            hwnd = ie.hwnd
-            process_id = Process.process_id_from_hwnd hwnd        
-            return window if process_id == @process_id
-          end
-        end
-      end
-      
-      # Returns the process id for the specifed hWnd.
-      def self.process_id_from_hwnd hwnd
-        pid_info = ' ' * 32
-        Win32API.new('user32', 'GetWindowThreadProcessId', 'ip', 'i').
-        call(hwnd, pid_info)
-        process_id =  pid_info.unpack("L")[0]
-      end
-      
-    end
-  end
+require 'win32/process'
+
+module Watir
+  class IE
+    class Process
+      def self.start
+        program_files = ENV['ProgramFiles'] || "c:\\Program Files"
+        startup_command = "#{program_files}\\Internet Explorer\\iexplore.exe"
+        process_info = ::Process.create('app_name' => "#{startup_command} about:blank")
+        process_id = process_info.process_id
+        new process_id
+      end
+      
+      def initialize process_id
+        @process_id = process_id
+      end
+      attr_reader :process_id
+      
+      def window
+        Waiter.wait_until do
+          IE.each do | ie |
+            window = ie.ie
+            hwnd = ie.hwnd
+            process_id = Process.process_id_from_hwnd hwnd        
+            return window if process_id == @process_id
+          end
+        end
+      end
+      
+      # Returns the process id for the specifed hWnd.
+      def self.process_id_from_hwnd hwnd
+        pid_info = ' ' * 32
+        Win32API.new('user32', 'GetWindowThreadProcessId', 'ip', 'i').
+        call(hwnd, pid_info)
+        process_id =  pid_info.unpack("L")[0]
+      end
+      
+    end
+  end
 end

data/lib/watir/ie.rb

@@ -1,133 +1,70 @@
-=begin
-  license
-  ---------------------------------------------------------------------------
-  Copyright (c) 2004 - 2005, Paul Rogers and Bret Pettichord
-  Copyright (c) 2006 - 2008, Bret Pettichord
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-  3. Neither the names Paul Rogers, nor Bret Pettichord nor the names of any
-  other contributors to this software may be used to endorse or promote
-  products derived from this software without specific prior written
-  permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
-  IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  --------------------------------------------------------------------------
-  (based on BSD Open Source License)
-=end
-
-require 'watir/win32ole'
-
-require 'logger'
-require 'watir/winClicker'
-require 'watir/exceptions'
-require 'watir/utils'
-require 'watir/close_all'
-require 'watir/ie-process'
-
-require 'dl/import'
-require 'dl/struct'
-require 'Win32API'
-
-require 'watir/matches'
-
-# 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.
-# Note: this means that watir must be require'd BEFORE test/unit.
-# (Alternatively, you could require test/unit first and then put the Watir::IE
-# arguments after the '--'.)
-
-# Make Internet Explorer invisible. -b stands for background
-$HIDE_IE ||= ARGV.delete('-b')
-
-# Run fast
-$FAST_SPEED = ARGV.delete('-f')
-
-# Eat the -s command line switch (deprecated)
-ARGV.delete('-s')
-
-require 'watir/core_ext'
-require 'watir/logger'
-require 'watir/win32'
-require 'watir/container'
-require 'watir/locator'
-require 'watir/page-container'
-require 'watir/ie-class'
-require 'watir/version'
-require 'watir/popup'
-require 'watir/element'
-require 'watir/frame'
-require 'watir/modal_dialog'
-require 'watir/element_collections'
-require 'watir/form'
-require 'watir/non_control_elements'
-require 'watir/input_elements'
-require 'watir/table'
-require 'watir/image'
-require 'watir/link'
-require 'watir/collections'
-
-require 'watir'
-
-module Watir
-  include Watir::Exception
-
-  # Directory containing the watir.rb file
-  @@dir = File.expand_path(File.dirname(__FILE__))
-
-  ATTACHER = Waiter.new
-  # Like regular Ruby "until", except that a TimeOutException is raised
-  # if the timeout is exceeded. Timeout is IE.attach_timeout.
-  def self.until_with_timeout # block
-    ATTACHER.timeout = IE.attach_timeout
-    ATTACHER.wait_until { yield }
-  end
-
-  @@autoit = nil
-
-  def self.autoit
-    unless @@autoit
-      begin
-        @@autoit = WIN32OLE.new('AutoItX3.Control')
-      rescue WIN32OLERuntimeError
-        _register('AutoItX3.dll')
-        @@autoit = WIN32OLE.new('AutoItX3.Control')
-      end
-    end
-    @@autoit
-  end
-
-  def self._register(dll)
-    system("regsvr32.exe /s "    + "#{@@dir}/#{dll}".gsub('/', '\\'))
-  end
-  def self._unregister(dll)
-    system("regsvr32.exe /s /u " + "#{@@dir}/#{dll}".gsub('/', '\\'))
-  end
-end
-
-# why won't this work when placed in the module (where it properly belongs)
-def _code_that_copies_readonly_array(array, name)
-    "temp = Array.new(#{array.inspect}); #{name}.clear; temp.each {|element| #{name} << element}"
-end
-
-require 'watir/camel_case'
+=begin
+  license
+  ---------------------------------------------------------------------------
+  Copyright (c) 2004 - 2005, Paul Rogers and Bret Pettichord
+  Copyright (c) 2006 - 2008, Bret Pettichord
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+  3. Neither the names Paul Rogers, nor Bret Pettichord nor the names of any
+  other contributors to this software may be used to endorse or promote
+  products derived from this software without specific prior written
+  permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
+  IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  --------------------------------------------------------------------------
+  (based on BSD Open Source License)
+=end
+
+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.
+# Note: this means that watir must be require'd BEFORE test/unit.
+# (Alternatively, you could require test/unit first and then put the Watir::IE
+# arguments after the '--'.)
+
+# Make Internet Explorer invisible. -b stands for background
+$HIDE_IE ||= ARGV.delete('-b')
+
+# Run fast
+$FAST_SPEED = ARGV.delete('-f')
+
+# Eat the -s command line switch (deprecated)
+ARGV.delete('-s')
+
+require 'watir/win32'
+require 'watir/popup'
+require 'watir/frame'
+require 'watir/modal_dialog'
+require 'watir/collections'
+require 'watir'
+
+require 'watir/camel_case'

data/lib/watir/image.rb

@@ -1,131 +1,131 @@
-module Watir
-  
-  # This class is the means of accessing an image on a page.
-  # Normally a user would not need to create this object as it is returned by the Watir::Container#image method
-  #
-  # many of the methods available to this object are inherited from the Element class
-  #
-  class Image < Element
-    def initialize(container, how, what)
-      set_container container
-      @how = how
-      @what = what
-      super nil
-    end
-    
-    def locate
-      if @how == :xpath
-        @o = @container.element_by_xpath(@what)
-      else
-        @o = @container.locate_tagged_element('IMG', @how, @what)
-      end
-    end
-    
-    # this method produces the properties for an image as an array
-    def image_string_creator
-      n = []
-      n <<   "src:".ljust(TO_S_SIZE) + self.src.to_s
-      n <<   "file date:".ljust(TO_S_SIZE) + self.fileCreatedDate.to_s
-      n <<   "file size:".ljust(TO_S_SIZE) + self.fileSize.to_s
-      n <<   "width:".ljust(TO_S_SIZE) + self.width.to_s
-      n <<   "height:".ljust(TO_S_SIZE) + self.height.to_s
-      n <<   "alt:".ljust(TO_S_SIZE) + self.alt.to_s
-      return n
-    end
-    private :image_string_creator
-    
-    # returns a string representation of the object
-    def to_s
-      assert_exists
-      r = string_creator
-      r += image_string_creator
-      return r.join("\n")
-    end
-    
-    # this method returns the file created date of the image
-    def file_created_date
-      assert_exists
-      return @o.invoke("fileCreatedDate")
-    end
-    
-    # this method returns the filesize of the image
-    def file_size
-      assert_exists
-      return @o.invoke("fileSize").to_s
-    end
-    
-    # returns the width in pixels of the image, as a string
-    def width
-      assert_exists
-      return @o.invoke("width").to_s
-    end
-    
-    # returns the height in pixels of the image, as a string
-    def height
-      assert_exists
-      return @o.invoke("height").to_s
-    end
-    
-    # This method attempts to find out if the image was actually loaded by the web browser.
-    # If the image was not loaded, the browser is unable to determine some of the properties.
-    # We look for these missing properties to see if the image is really there or not.
-    # If the Disk cache is full (tools menu -> Internet options -> Temporary Internet Files), it may produce incorrect responses.
-    def loaded?
-      locate
-      raise UnknownObjectException, "Unable to locate image using #{@how} and #{@what}" if @o == nil
-      return false if @o.fileCreatedDate == "" and @o.fileSize.to_i == -1
-      return true
-    end
-    
-    # this method highlights the image (in fact it adds or removes a border around the image)
-    #  * set_or_clear   - symbol - :set to set the border, :clear to remove it
-    def highlight(set_or_clear)
-      if set_or_clear == :set
-        begin
-          @original_border = @o.border
-          @o.border = 1
-        rescue
-          @original_border = nil
-        end
-      else
-        begin
-          @o.border = @original_border
-          @original_border = nil
-        rescue
-          # we could be here for a number of reasons...
-        ensure
-          @original_border = nil
-        end
-      end
-    end
-    private :highlight
-    
-    # This method saves the image to the file path that is given.  The
-    # path must be in windows format (c:\\dirname\\somename.gif).  This method
-    # 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)
-        @container.document.execCommand("SaveAs")
-        thrd.join(5)
-      ensure
-        @container.back
-      end
-    end
-    
-    def fill_save_image_dialog(path)
-      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\"")
-      end
-    end
-    private :fill_save_image_dialog
-  end
-  
+module Watir
+  
+  # This class is the means of accessing an image on a page.
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#image method
+  #
+  # many of the methods available to this object are inherited from the Element class
+  #
+  class Image < Element
+    def initialize(container, how, what)
+      set_container container
+      @how = how
+      @what = what
+      super nil
+    end
+    
+    def locate
+      if @how == :xpath
+        @o = @container.element_by_xpath(@what)
+      else
+        @o = @container.locate_tagged_element('IMG', @how, @what)
+      end
+    end
+    
+    # this method produces the properties for an image as an array
+    def image_string_creator
+      n = []
+      n <<   "src:".ljust(TO_S_SIZE) + self.src.to_s
+      n <<   "file date:".ljust(TO_S_SIZE) + self.fileCreatedDate.to_s
+      n <<   "file size:".ljust(TO_S_SIZE) + self.fileSize.to_s
+      n <<   "width:".ljust(TO_S_SIZE) + self.width.to_s
+      n <<   "height:".ljust(TO_S_SIZE) + self.height.to_s
+      n <<   "alt:".ljust(TO_S_SIZE) + self.alt.to_s
+      return n
+    end
+    private :image_string_creator
+    
+    # returns a string representation of the object
+    def to_s
+      assert_exists
+      r = string_creator
+      r += image_string_creator
+      return r.join("\n")
+    end
+    
+    # this method returns the file created date of the image
+    def file_created_date
+      assert_exists
+      return @o.invoke("fileCreatedDate")
+    end
+    
+    # this method returns the filesize of the image
+    def file_size
+      assert_exists
+      return @o.invoke("fileSize").to_s
+    end
+    
+    # returns the width in pixels of the image, as a string
+    def width
+      assert_exists
+      return @o.invoke("width").to_s
+    end
+    
+    # returns the height in pixels of the image, as a string
+    def height
+      assert_exists
+      return @o.invoke("height").to_s
+    end
+    
+    # This method attempts to find out if the image was actually loaded by the web browser.
+    # If the image was not loaded, the browser is unable to determine some of the properties.
+    # We look for these missing properties to see if the image is really there or not.
+    # If the Disk cache is full (tools menu -> Internet options -> Temporary Internet Files), it may produce incorrect responses.
+    def loaded?
+      locate
+      raise UnknownObjectException, "Unable to locate image using #{@how} and #{@what}" if @o == nil
+      return false if @o.fileCreatedDate == "" and @o.fileSize.to_i == -1
+      return true
+    end
+    
+    # this method highlights the image (in fact it adds or removes a border around the image)
+    #  * set_or_clear   - symbol - :set to set the border, :clear to remove it
+    def highlight(set_or_clear)
+      if set_or_clear == :set
+        begin
+          @original_border = @o.border
+          @o.border = 1
+        rescue
+          @original_border = nil
+        end
+      else
+        begin
+          @o.border = @original_border
+          @original_border = nil
+        rescue
+          # we could be here for a number of reasons...
+        ensure
+          @original_border = nil
+        end
+      end
+    end
+    private :highlight
+    
+    # This method saves the image to the file path that is given.  The
+    # path must be in windows format (c:\\dirname\\somename.gif).  This method
+    # 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)
+        @container.document.execCommand("SaveAs")
+        thrd.join(5)
+      ensure
+        @container.back
+      end
+    end
+    
+    def fill_save_image_dialog(path)
+      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\"")
+      end
+    end
+    private :fill_save_image_dialog
+  end
+  
 end