watir 1.6.5 → 1.6.6.rc1

data/lib/watir/logger.rb

@@ -1,19 +1,19 @@
-module Watir
-  class WatirLogger < Logger
-    def initialize(filName, logsToKeep, maxLogSize)
-      super(filName, logsToKeep, maxLogSize)
-      self.level = Logger::DEBUG
-      self.datetime_format = "%d-%b-%Y %H:%M:%S"
-      self.debug("Watir starting")
-    end
-  end
-  
-  class DefaultLogger < Logger
-    def initialize
-      super(STDERR)
-      self.level = Logger::WARN
-      self.datetime_format = "%d-%b-%Y %H:%M:%S"
-      self.info "Log started"
-    end
-  end
-end
+module Watir
+  class WatirLogger < Logger
+    def initialize(filName, logsToKeep, maxLogSize)
+      super(filName, logsToKeep, maxLogSize)
+      self.level = Logger::DEBUG
+      self.datetime_format = "%d-%b-%Y %H:%M:%S"
+      self.debug("Watir starting")
+    end
+  end
+  
+  class DefaultLogger < Logger
+    def initialize
+      super(STDERR)
+      self.level = Logger::WARN
+      self.datetime_format = "%d-%b-%Y %H:%M:%S"
+      self.info "Log started"
+    end
+  end
+end

data/lib/watir/modal_dialog.rb

@@ -1,123 +1,123 @@
-module Watir
-  class ModalDialog
-    include Container
-    include PageContainer
-    include Win32
-
-    # Return the current window handle
-    attr_reader :hwnd
-
-    def find_modal_from_window
-      # Use handle of our parent window to see if we have any currently
-      # enabled popup.
-      hwnd = @container.hwnd
-      hwnd_modal = 0
-      begin
-        Watir::until_with_timeout do
-          hwnd_modal, arr = GetWindow.call(hwnd, GW_ENABLEDPOPUP) # GW_ENABLEDPOPUP = 6
-          hwnd_modal > 0
-        end
-      rescue TimeOutException
-        return nil
-      end
-      if hwnd_modal == hwnd || hwnd_modal == 0
-        hwnd_modal = nil
-      end
-      @hwnd = hwnd_modal
-    end
-    private :find_modal_from_window
-
-    def locate
-      how = @how
-      what = @what
-
-      case how
-      when nil
-        unless find_modal_from_window
-          raise NoMatchingWindowFoundException, 
-            "Modal Dialog not found. Timeout = #{Watir::IE.attach_timeout}"
-        end
-      when :title
-        case what.class.to_s
-        # TODO: re-write like WET's so we can select on regular expressions too.
-        when "String"
-          begin
-            Watir::until_with_timeout do
-              title = "#{what} -- Web Page Dialog"
-              @hwnd, arr = FindWindowEx.call(0, 0, nil, title)
-              @hwnd > 0
-            end
-          rescue TimeOutException
-            raise NoMatchingWindowFoundException, 
-              "Modal Dialog with title #{what} not found. Timeout = #{Watir::IE.attach_timeout}"
-          end
-        else
-          raise ArgumentError, "Title value must be String"
-        end
-      else
-        raise ArgumentError, "Only null and :title methods are supported"
-      end
-
-      intUnknown = 0
-      begin
-        Watir::until_with_timeout do
-          intPointer = " " * 4 # will contain the int value of the IUnknown*
-          GetUnknown.call(@hwnd, intPointer)
-          intArray = intPointer.unpack('L')
-          intUnknown = intArray.first
-          intUnknown > 0
-        end
-      rescue TimeOutException => e        
-        raise NoMatchingWindowFoundException, 
-          "Unable to attach to Modal Window #{what.inspect} after #{e.duration} seconds."
-      end
-      
-      copy_test_config @parent_container
-      @document = WIN32OLE.connect_unknown(intUnknown)
-    end
-
-    def initialize(container, how, what=nil)
-      set_container container
-      @how = how
-      @what = what
-      @parent_container = container
-      # locate our modal dialog's Document object and save it
-      begin
-        locate
-      rescue NoMethodError => e
-        message = 
-          "IE#modal_dialog not supported with the current version of Ruby (#{RUBY_VERSION}).\n" + 
-          "See http://jira.openqa.org/browse/WTR-2 for details.\n" +
-            e.message
-        raise NoMethodError.new(message)
-      end
-    end
-
-    def document
-      @document
-    end
-    
-    # Return the title of the document
-    def title
-      document.title
-    end
-
-    def close
-      document.parentWindow.close
-    end
-
-    def attach_command
-      "Watir::IE.find(:hwnd, #{@container.hwnd}).modal_dialog"
-    end
-      
-    def wait(no_sleep=false)
-    end
-    
-    # Return true if the modal exists. Mostly this is useful for testing whether
-    # a modal has closed.
-    def exists?
-      Watir::Win32::window_exists? @hwnd
-    end
-    alias :exist? :exists?
-  end
+module Watir
+  class ModalDialog
+    include Container
+    include PageContainer
+    include Win32
+
+    # Return the current window handle
+    attr_reader :hwnd
+
+    def find_modal_from_window
+      # Use handle of our parent window to see if we have any currently
+      # enabled popup.
+      hwnd = @container.hwnd
+      hwnd_modal = 0
+      begin
+        Watir::until_with_timeout do
+          hwnd_modal, arr = GetWindow.call(hwnd, GW_ENABLEDPOPUP) # GW_ENABLEDPOPUP = 6
+          hwnd_modal > 0
+        end
+      rescue TimeOutException
+        return nil
+      end
+      if hwnd_modal == hwnd || hwnd_modal == 0
+        hwnd_modal = nil
+      end
+      @hwnd = hwnd_modal
+    end
+    private :find_modal_from_window
+
+    def locate
+      how = @how
+      what = @what
+
+      case how
+      when nil
+        unless find_modal_from_window
+          raise NoMatchingWindowFoundException, 
+            "Modal Dialog not found. Timeout = #{Watir::IE.attach_timeout}"
+        end
+      when :title
+        case what.class.to_s
+        # TODO: re-write like WET's so we can select on regular expressions too.
+        when "String"
+          begin
+            Watir::until_with_timeout do
+              title = "#{what} -- Web Page Dialog"
+              @hwnd, arr = FindWindowEx.call(0, 0, nil, title)
+              @hwnd > 0
+            end
+          rescue TimeOutException
+            raise NoMatchingWindowFoundException, 
+              "Modal Dialog with title #{what} not found. Timeout = #{Watir::IE.attach_timeout}"
+          end
+        else
+          raise ArgumentError, "Title value must be String"
+        end
+      else
+        raise ArgumentError, "Only null and :title methods are supported"
+      end
+
+      intUnknown = 0
+      begin
+        Watir::until_with_timeout do
+          intPointer = " " * 4 # will contain the int value of the IUnknown*
+          GetUnknown.call(@hwnd, intPointer)
+          intArray = intPointer.unpack('L')
+          intUnknown = intArray.first
+          intUnknown > 0
+        end
+      rescue TimeOutException => e        
+        raise NoMatchingWindowFoundException, 
+          "Unable to attach to Modal Window #{what.inspect} after #{e.duration} seconds."
+      end
+      
+      copy_test_config @parent_container
+      @document = WIN32OLE.connect_unknown(intUnknown)
+    end
+
+    def initialize(container, how, what=nil)
+      set_container container
+      @how = how
+      @what = what
+      @parent_container = container
+      # locate our modal dialog's Document object and save it
+      begin
+        locate
+      rescue NoMethodError => e
+        message = 
+          "IE#modal_dialog not supported with the current version of Ruby (#{RUBY_VERSION}).\n" + 
+          "See http://jira.openqa.org/browse/WTR-2 for details.\n" +
+            e.message
+        raise NoMethodError.new(message)
+      end
+    end
+
+    def document
+      @document
+    end
+    
+    # Return the title of the document
+    def title
+      document.title
+    end
+
+    def close
+      document.parentWindow.close
+    end
+
+    def attach_command
+      "Watir::IE.find(:hwnd, #{@container.hwnd}).modal_dialog"
+    end
+      
+    def wait(no_sleep=false)
+    end
+    
+    # Return true if the modal exists. Mostly this is useful for testing whether
+    # a modal has closed.
+    def exists?
+      Watir::Win32::window_exists? @hwnd
+    end
+    alias :exist? :exists?
+  end
 end

data/lib/watir/module.rb

@@ -0,0 +1,37 @@
+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

data/lib/watir/non_control_elements.rb

@@ -1,146 +1,146 @@
-module Watir
-
-  # this class contains items that are common between the span, div, and pre objects
-  # it would not normally be used directly
-  #
-  # many of the methods available to this object are inherited from the Element class
-  #
-  class NonControlElement < Element
-
-    def self.inherited subclass
-      class_name = subclass.to_s.demodulize
-      method_name = class_name.underscore
-      Watir::Container.module_eval <<-RUBY
-        def #{method_name}(how, what=nil)
-          return #{class_name}.new(self, how, what)
-        end
-      RUBY
-    end
-    include Watir::Exception
-
-    def locate
-      if @how == :xpath
-        @o = @container.element_by_xpath(@what)
-      else
-        @o = @container.locate_tagged_element(self.class::TAG, @how, @what)
-      end
-    end
-
-    def initialize(container, how, what)
-      set_container container
-      @how = how
-      @what = what
-      super nil
-    end
-
-    # this method is used to populate the properties in the to_s method
-    def span_div_string_creator
-      n = []
-      n <<   "class:".ljust(TO_S_SIZE) + self.class_name
-      n <<   "text:".ljust(TO_S_SIZE) + self.text
-      return n
-    end
-    private :span_div_string_creator
-
-    # returns the properties of the object in a string
-    # raises an ObjectNotFound exception if the object cannot be found
-    def to_s
-      assert_exists
-      r = string_creator
-      r += span_div_string_creator
-      return r.join("\n")
-    end
-  end
-
-
-  class Pre < NonControlElement
-    TAG = 'PRE'
-  end
-
-  class P < NonControlElement
-    TAG = 'P'
-  end
-
-  # this class is used to deal with Div tags in the html page. http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/div.asp?frame=true
-  # It would not normally be created by users
-  class Div < NonControlElement
-    TAG = 'DIV'
-  end
-
-  # this class is used to deal with Span tags in the html page. It would not normally be created by users
-  class Span < NonControlElement
-    TAG = 'SPAN'
-  end
-
-  class Map < NonControlElement
-    TAG = 'MAP'
-  end
-
-  class Area < NonControlElement
-    TAG = 'AREA'
-  end
-
-  # Accesses Label element on the html page - http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/label.asp?frame=true
-  class Label < NonControlElement
-    TAG = 'LABEL'
-
-    # this method is used to populate the properties in the to_s method
-    def label_string_creator
-      n = []
-      n <<   "for:".ljust(TO_S_SIZE) + self.for
-      n <<   "text:".ljust(TO_S_SIZE) + self.text
-      return n
-    end
-    private :label_string_creator
-
-    # returns the properties of the object in a string
-    # raises an ObjectNotFound exception if the object cannot be found
-    def to_s
-      assert_exists
-      r = string_creator
-      r += label_string_creator
-      return r.join("\n")
-    end
-  end
-
-  class Li < NonControlElement
-    TAG = 'LI'
-  end
-  class Ul < NonControlElement
-    TAG = 'UL'
-  end
-  class H1 < NonControlElement
-    TAG = 'H1'
-  end
-  class H2 < NonControlElement
-    TAG = 'H2'
-  end
-  class H3 < NonControlElement
-    TAG = 'H3'
-  end
-  class H4 < NonControlElement
-    TAG = 'H4'
-  end
-  class H5 < NonControlElement
-    TAG = 'H5'
-  end
-  class H6 < NonControlElement
-    TAG = 'H6'
-  end
-  class Dl < NonControlElement
-    TAG = 'DL'
-  end
-  class Dt < NonControlElement
-    TAG = 'DT'
-  end
-  class Dd < NonControlElement
-    TAG = 'DD'
-  end
-  class Strong < NonControlElement
-    TAG = 'STRONG'
-  end
-  class Em < NonControlElement
-    TAG = 'EM'
-  end
-
+module Watir
+
+  # this class contains items that are common between the span, div, and pre objects
+  # it would not normally be used directly
+  #
+  # many of the methods available to this object are inherited from the Element class
+  #
+  class NonControlElement < Element
+
+    def self.inherited subclass
+      class_name = subclass.to_s.demodulize
+      method_name = class_name.underscore
+      Watir::Container.module_eval <<-RUBY
+        def #{method_name}(how, what=nil)
+          return #{class_name}.new(self, how, what)
+        end
+      RUBY
+    end
+    include Watir::Exception
+
+    def locate
+      if @how == :xpath
+        @o = @container.element_by_xpath(@what)
+      else
+        @o = @container.locate_tagged_element(self.class::TAG, @how, @what)
+      end
+    end
+
+    def initialize(container, how, what)
+      set_container container
+      @how = how
+      @what = what
+      super nil
+    end
+
+    # this method is used to populate the properties in the to_s method
+    def span_div_string_creator
+      n = []
+      n <<   "class:".ljust(TO_S_SIZE) + self.class_name
+      n <<   "text:".ljust(TO_S_SIZE) + self.text
+      return n
+    end
+    private :span_div_string_creator
+
+    # returns the properties of the object in a string
+    # raises an ObjectNotFound exception if the object cannot be found
+    def to_s
+      assert_exists
+      r = string_creator
+      r += span_div_string_creator
+      return r.join("\n")
+    end
+  end
+
+
+  class Pre < NonControlElement
+    TAG = 'PRE'
+  end
+
+  class P < NonControlElement
+    TAG = 'P'
+  end
+
+  # this class is used to deal with Div tags in the html page. http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/div.asp?frame=true
+  # It would not normally be created by users
+  class Div < NonControlElement
+    TAG = 'DIV'
+  end
+
+  # this class is used to deal with Span tags in the html page. It would not normally be created by users
+  class Span < NonControlElement
+    TAG = 'SPAN'
+  end
+
+  class Map < NonControlElement
+    TAG = 'MAP'
+  end
+
+  class Area < NonControlElement
+    TAG = 'AREA'
+  end
+
+  # Accesses Label element on the html page - http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/label.asp?frame=true
+  class Label < NonControlElement
+    TAG = 'LABEL'
+
+    # this method is used to populate the properties in the to_s method
+    def label_string_creator
+      n = []
+      n <<   "for:".ljust(TO_S_SIZE) + self.for
+      n <<   "text:".ljust(TO_S_SIZE) + self.text
+      return n
+    end
+    private :label_string_creator
+
+    # returns the properties of the object in a string
+    # raises an ObjectNotFound exception if the object cannot be found
+    def to_s
+      assert_exists
+      r = string_creator
+      r += label_string_creator
+      return r.join("\n")
+    end
+  end
+
+  class Li < NonControlElement
+    TAG = 'LI'
+  end
+  class Ul < NonControlElement
+    TAG = 'UL'
+  end
+  class H1 < NonControlElement
+    TAG = 'H1'
+  end
+  class H2 < NonControlElement
+    TAG = 'H2'
+  end
+  class H3 < NonControlElement
+    TAG = 'H3'
+  end
+  class H4 < NonControlElement
+    TAG = 'H4'
+  end
+  class H5 < NonControlElement
+    TAG = 'H5'
+  end
+  class H6 < NonControlElement
+    TAG = 'H6'
+  end
+  class Dl < NonControlElement
+    TAG = 'DL'
+  end
+  class Dt < NonControlElement
+    TAG = 'DT'
+  end
+  class Dd < NonControlElement
+    TAG = 'DD'
+  end
+  class Strong < NonControlElement
+    TAG = 'STRONG'
+  end
+  class Em < NonControlElement
+    TAG = 'EM'
+  end
+
 end