watir 3.0.0.rc1 → 3.0.0.rc2

data/CHANGES

@@ -1,4 +1,12 @@
-== 3.0.0 - 2012/01/13 - more conformance with WatirSpec
+== 3.0.0.rc2 - 2012/02/04
+
+* Browser#textarea(s) method for searching <textarea> elements
+* Element#focus works with IE9
+* Element#focused? returns the state of focus on that element
+* Element#to_subtype returns Element if non-supported tag found instead of crashing
+* searching by :class will match now partially like other tools behave (e.g. jQuery)
+
+== 3.0.0.rc1 - 2012/01/13 - more conformance with WatirSpec
 
 * Button#text returns value if exists instead of text
 * Browser#goto prepends url automatically with http:// if scheme is missing

data/VERSION

@@ -1 +1 @@
-3.0.0.rc1
+3.0.0.rc2

data/lib/watir/collections.rb

@@ -23,7 +23,7 @@ module Watir
     def element_tag; 'SELECT'; end
   end  
 
-  %w[Button FileField Radio TextField Hidden].each do |element|
+  %w[Button FileField Radio TextField TextArea Hidden].each do |element|
     module_eval %Q{
       class #{element}s < InputElementCollections; end
     }

data/lib/watir/element.rb

@@ -56,20 +56,24 @@ module Watir
     private
     def self.def_wrap(method_name, ole_method_name=nil)
       class_eval "def #{method_name}
-                          assert_exists
-                          ole_object.invoke('#{ole_method_name || method_name}')
-                        end"
+                    assert_exists
+                    ole_object.invoke('#{ole_method_name || method_name}')
+                  end"
     end
 
     def self.def_wrap_guard(method_name, ole_method_name = nil)
       class_eval "def #{method_name}
-                          assert_exists
-                          begin
-                            ole_object.invoke('#{ole_method_name || method_name}')
-                          rescue
-                            ''
-                          end
-                        end"
+                    assert_exists
+                    begin
+                      ole_object.invoke('#{ole_method_name || method_name}')
+                    rescue
+                      begin
+                        ole_object.getAttribute('#{ole_method_name || method_name}') || ''
+                      rescue
+                        ''
+                      end
+                    end
+                  end"
     end
 
 
@@ -151,8 +155,10 @@ module Watir
         self.send(ole_object.invoke('type'), :ole_object, ole_object)
       elsif tag == "select"
         self.select_list(:ole_object, ole_object)
-      else
+      elsif self.respond_to?(tag.downcase)
         self.send(tag.downcase, :ole_object, ole_object)
+      else
+        self
       end
     end
 
@@ -416,6 +422,10 @@ module Watir
          event_name = :initEvent
          event_type = 'HTMLEvents'
          event_args = [event, true, true]
+       when 'select'
+         event_name = :initUIEvent
+         event_type = 'UIEvent'
+         event_args = [event, true, true, @container.page_container.document.parentWindow.window,0]
        when 'keydown', 'keypress', 'keyup'
          event_name = :initKeyboardEvent
          event_type = 'KeyboardEvent'
@@ -442,7 +452,13 @@ module Watir
       assert_exists
       assert_enabled
       @page_container.focus
-      ole_object.focus
+      ole_object.focus(0)
+    end
+
+    def focused?
+      assert_exists
+      assert_enabled
+      @page_container.document.activeElement.uniqueNumber == unique_number
     end
 
     # Returns whether this element actually exists.

data/lib/watir/form.rb

@@ -41,7 +41,7 @@ module Watir
     # Submit the data -- equivalent to pressing Enter or Return to submit a form.
     def submit 
       assert_exists
-      @o.submit if dispatch_event "onSubmit"
+      @o.submit(0) if dispatch_event "onSubmit"
       @container.wait
     end
     

data/lib/watir/frame.rb

@@ -55,9 +55,7 @@ module Watir
       wrapper = "_watir_helper_div_#{Time.now.to_i}"
       cmd = "var e = document.createElement('DIV'); e.style.display = 'none'; e.id='#{wrapper}'; e.innerHTML = eval('#{escaped_src}'); document.body.appendChild(e);"
       document.parentWindow.execScript(cmd)
-      wrapper_obj = document.getElementById(wrapper)
-      result_value = wrapper_obj.innerHTML
-      result_value
+      document.getElementById(wrapper).wrapper_obj.innerHTML
     end
 
   end

data/lib/watir/ie-class.rb

@@ -417,12 +417,9 @@ module Watir
     rescue WIN32OLERuntimeError, NoMethodError #if eval fails we need to use execScript(source.to_s) which does not return a value, hence the workaround
       escaped_src = source.to_s.gsub(/[\r\n']/) {|m| "\\#{m}"}
       wrapper = "_watir_helper_div_#{rand(100000)}"
-      cmd = "var e = document.createElement('DIV'); e.id='#{wrapper}'; e.innerHTML = eval('#{escaped_src}'); document.body.appendChild(e);"
+      cmd = "var e = document.createElement('DIV'); e.style.display='none'; e.id='#{wrapper}'; e.innerHTML = eval('#{escaped_src}'); document.body.appendChild(e);"
       document.parentWindow.execScript(cmd)
-      wrapper_obj = document.getElementById(wrapper)
-      result_value = wrapper_obj.innerHTML
-      wrapper_obj.style.display = 'none'
-      result_value
+      document.getElementById(wrapper).innerHTML
     end
 
     # clear the list of urls that we have visited

data/lib/watir/ie-process.rb

@@ -6,7 +6,8 @@ module Watir
       def self.start
         program_files = ENV['ProgramFiles'] || "c:\\Program Files"
         startup_command = "#{program_files}\\Internet Explorer\\iexplore.exe"
-        startup_command << " -nomerge" if IE.version_parts.first.to_i >= 8
+        startup_command << " -nomerge" if IE.version_parts.first.to_i == 8
+        startup_command << " -noframemerging" if IE.version_parts.first.to_i >= 9
         process_info = ::Process.create('app_name' => "#{startup_command} about:blank")
         process_id = process_info.process_id
         new process_id

data/lib/watir/input_elements.rb

@@ -237,8 +237,8 @@ module Watir
         raise UnknownObjectException, "Unable to locate destination using #{destination_how } and #{destination_what } "
       end
       
-      @o.focus
-      @o.select
+      @o.focus(0)
+      @o.select(0)
       value = self.value
       
       dispatch_event("onSelect")
@@ -265,8 +265,8 @@ module Watir
       highlight(:set)
       
       @o.scrollIntoView
-      @o.focus
-      @o.select
+      @o.focus(0)
+      @o.select(0)
       dispatch_event("onSelect")
       @o.value = ""
       dispatch_event("onKeyPress")
@@ -286,7 +286,7 @@ module Watir
       
       highlight(:set)
       @o.scrollIntoView
-      @o.focus
+      @o.focus(0)
       type_by_character(value)
       highlight(:clear)
     end
@@ -303,8 +303,8 @@ module Watir
       highlight(:set)
       @o.scrollIntoView
       if type_keys
-	      @o.focus
-	      @o.select
+	      @o.focus(0)
+	      @o.select(0)
 	      dispatch_event("onSelect")
 	      dispatch_event("onKeyPress")
 	      @o.value = ""
@@ -335,6 +335,10 @@ module Watir
     	self
     end
 
+    def label
+      @container.label(:for => name).text
+    end
+
     private
 
     # Type the characters in the specified string (value) one by one.
@@ -375,8 +379,19 @@ module Watir
       value
     end
 
-    def label
-      @container.label(:for => name).text
+  end
+
+  class TextArea < TextField
+    INPUT_TYPES = ["textarea"]
+
+    Watir::Container.module_eval do
+      def textareas(how={}, what=nil)
+        TextAreas.new(self, how, what)
+      end
+
+      def textarea(how={}, what=nil)
+        TextArea.new(self, how, what)
+      end
     end
   end
   

data/lib/watir/locator.rb

@@ -54,11 +54,28 @@ module Watir
       return true if has_excluding_specifiers?
       @specifiers.all? do |how, what|
         how == :index || 
-          (how.to_s =~ /^data_.*/ && element.send(how) == what) || 
-           match?(element, how, what)
+          (how == :class_name && match_class?(element, what)) ||
+          match?(element, how, what)
       end
     end
 
+    def match_class? element, what
+      classes = element.class_name.split(/\s+/)
+      classes.any? {|clazz| what.matches(clazz)}
+    end
+
+    # return true if the element matches the provided how and what
+    def match? element, how, what
+      begin
+        attribute = element.send(how)
+      rescue NoMethodError
+        raise MissingWayOfFindingObjectException,
+          "#{how} is an unknown way of finding a <#{@tags.join(", ")}> element (#{what})"
+      end
+
+      what.matches(attribute)
+    end
+
     def has_excluding_specifiers?
       @specifiers.keys.any? {|specifier| [:css, :xpath, :ole_object].include? specifier}
     end
@@ -140,25 +157,6 @@ module Watir
       end # elements
       nil
     end
-
-    def match?(element, how, what)
-      begin
-        method = element.method(how)
-      rescue NameError
-        raise MissingWayOfFindingObjectException,
-          "#{how} is an unknown way of finding a <#{@tags.join(", ")}> element (#{what})"
-      end
-      case method.arity
-      when 0
-        what.matches method.call
-      when 1
-        method.call(what)
-      else
-        raise MissingWayOfFindingObjectException,
-          "#{how} is an unknown way of finding a <#{@tags.join(", ")}> element (#{what})"
-      end
-    end
-
   end
 
   class FrameLocator < TaggedElementLocator
@@ -227,18 +225,6 @@ module Watir
       nil
     end    
 
-    # return true if the element matches the provided how and what
-    def match? element, how, what
-      begin
-        attribute = element.send(how)
-      rescue NoMethodError
-        raise MissingWayOfFindingObjectException,
-          "#{how} is an unknown way of finding an <INPUT> element (#{what})"
-      end
-
-      what.matches(attribute)
-    end
-
     private
 
     def locate_by_name

data/lib/watir/table.rb

@@ -14,7 +14,7 @@ module Watir
       @o.rows.each do |row|
         cells_memo = []
         row.cells.each do |cell|
-          cells_memo << TableCell.new(self, :ole_object, cell).text
+          cells_memo << TableCell.new(self, :ole_object, cell).text.gsub("\r\n","")
         end
         rows_memo << cells_memo
       end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: watir
 version: !ruby/object:Gem::Version 
-  hash: 15424119
+  hash: 15424113
   prerelease: 6
   segments: 
   - 3
   - 0
   - 0
   - rc
-  - 1
-  version: 3.0.0.rc1
+  - 2
+  version: 3.0.0.rc2
 platform: ruby
 authors: 
 - Bret Pettichord
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-02-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: win32-process
@@ -59,14 +59,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424119
+        hash: 15424113
         segments: 
         - 3
         - 0
         - 0
         - rc
-        - 1
-        version: 3.0.0.rc1
+        - 2
+        version: 3.0.0.rc2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency