watir 1.5.4 → 1.5.5

data/watir/cookiemanager.rb

@@ -1,4 +1,7 @@
-    require 'find'
+# should be moved to watir/contrib
+# use of modules here is ugly
+
+require 'find'
 module Watir
   module CookieManager 
 

data/watir/element.rb

@@ -41,12 +41,19 @@ module Watir
                           end
                         end"
     end
+    # return a message indicating how the element is being located
+    def located_using_message
+      result = "using #{@how.inspect}"
+      result << ", #{@what.inspect}" if @what
+      result
+    end
 
     public
     def assert_exists
       locate if defined?(locate)
       unless ole_object
-        raise UnknownObjectException.new("Unable to locate object, using #{@how} and #{@what}")
+        raise UnknownObjectException.new(
+          "Unable to locate element, #{located_using_message}")
       end
     end
     def assert_enabled

data/watir/ie.rb

@@ -57,7 +57,7 @@ module Watir
     REVISION = $1 or 'unknown'
     
     # The Release number
-    VERSION_SHORT = '1.5.4'
+    VERSION_SHORT = '1.5.5'
     VERSION = VERSION_SHORT + '.' + REVISION
     
     # Used internally to determine when IE has finished loading a page
@@ -492,7 +492,7 @@ module Watir
           until doc.readyState == "complete" do
             sleep a_moment
           end
-          @url_list << doc.url unless @url_list.include?(doc.url)
+          @url_list << doc.location.href unless @url_list.include?(doc.location.href)
           doc.frames.length.times do |n|
             begin
               documents_to_wait_for << doc.frames[n.to_s].document

data/watir/input_elements.rb

@@ -252,7 +252,7 @@ module Watir
     def verify_contains(target) # FIXME: verify_contains should have same name and semantics as IE#contains_text (prolly make this work for all elements)
       assert_exists
       if target.kind_of? String
-        return true if self.value == target
+        return true if self.value == target
       elsif target.kind_of? Regexp
         return true if self.value.match(target) != nil
       end
@@ -440,7 +440,7 @@ module Watir
       WindowHelper.check_autoit_installed
       begin
         thrd = Thread.new do
-          system("rubyw -e \"require 'win32ole'; @autoit=WIN32OLE.new('AutoItX3.Control'); waitresult=@autoit.WinWait 'Choose file', '', 15; if waitresult == 1\" -e \"@autoit.ControlSetText 'Choose file', '', 'Edit1', '#{setPath}'; @autoit.ControlSend 'Choose file', '', 'Button2', '{ENTER}';\" -e \"end\"")
+          system("rubyw -e \"require 'win32ole'; @autoit=WIN32OLE.new('AutoItX3.Control'); waitresult=@autoit.WinWait 'Choose file', '', 15; sleep 1; if waitresult == 1\" -e \"@autoit.ControlSetText 'Choose file', '', 'Edit1', '#{setPath}'; @autoit.ControlSend 'Choose file', '', 'Button2', '{ENTER}';\" -e \"end\"")
         end
       thrd.join(1)
       rescue

data/watir/non_control_elements.rb

@@ -1,3 +1,4 @@
+require 'active_support'    
 module Watir
   
   # this class contains items that are common between the span, div, and pre objects
@@ -6,8 +7,14 @@ module Watir
   # 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 "def #{method_name}(how, what=nil)
+      return #{class_name}.new(self, how, what); end"
+    end
     include Watir::Exception
-    
+        
     def locate
       if @how == :xpath
         @o = @container.element_by_xpath(@what)
@@ -41,6 +48,7 @@ module Watir
       return r.join("\n")
     end
   end
+
   
   class Pre < NonControlElement
     TAG = 'PRE'
@@ -61,6 +69,14 @@ module Watir
     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'
@@ -87,5 +103,26 @@ module Watir
   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
+
 end

data/watir/page-container.rb

@@ -17,7 +17,7 @@ module Watir
         end
       else
         # assume its IE6
-        url = self.document.url
+        url = self.document.location.href
         if /shdoclc.dll/.match(url)
           m = /id=IEText.*?>(.*?)</i.match(self.html)
           raise NavigationException, m[1] if m

data/watir/table.rb

@@ -8,12 +8,12 @@ module Watir
   class Table < Element
     include Container
     
-    # Returns the table object containing anElement
+    # Returns the table object containing the element
     #   * container  - an instance of an IE object
     #   * anElement  - a Watir object (TextField, Button, etc.)
-    def Table.create_from_element(container, anElement)
-      anElement.locate if defined?(anElement.locate)
-      o = anElement.ole_object.parentElement
+    def Table.create_from_element(container, element)
+      element.locate if defined?(element.locate)
+      o = element.ole_object.parentElement
       o = o.parentElement until o.tagName == 'TABLE'
       new container, :ole_object, o 
     end
@@ -42,7 +42,6 @@ module Watir
     # override the highlight method, as if the tables rows are set to have a background color,
     # this will override the table background color, and the normal flash method won't work
     def highlight(set_or_clear)
-      
       if set_or_clear == :set
         begin
           @original_border = @o.border.to_i
@@ -70,8 +69,8 @@ module Watir
     # this method is used to populate the properties in the to_s method
     def table_string_creator
       n = []
-      n <<   "rows:".ljust(TO_S_SIZE) + self.row_count.to_s
-      n <<   "cols:".ljust(TO_S_SIZE) + self.column_count.to_s
+      n << "rows:".ljust(TO_S_SIZE) + self.row_count.to_s
+      n << "cols:".ljust(TO_S_SIZE) + self.column_count.to_s
       return n
     end
     private :table_string_creator
@@ -88,14 +87,16 @@ module Watir
     # iterates through the rows in the table. Yields a TableRow object
     def each
       assert_exists
-      1.upto(@o.getElementsByTagName("TR").length) { |i| yield TableRow.new(@container, :ole_object, row(i))    }
+      1.upto(@o.getElementsByTagName("TR").length) do |i| 
+        yield TableRow.new(@container, :ole_object, _row(i))
+      end
     end
     
     # Returns a row in the table
     #   * index         - the index of the row
     def [](index)
       assert_exists
-      return TableRow.new(@container, :ole_object, row(index))
+      return TableRow.new(@container, :ole_object, _row(index))
     end
     
     # This method returns the number of rows in the table.
@@ -111,10 +112,11 @@ module Watir
     #   * index         - the index of the row
     def column_count(index=1)
       assert_exists
-      row(index).cells.length
+      _row(index).cells.length
     end
     
-    # This method returns the table as a 2 dimensional array. Dont expect too much if there are nested tables, colspan etc.
+    # This method returns the table as a 2 dimensional array. 
+    # Don't expect too much if there are nested tables, colspan etc.
     # Raises an UnknownObjectException if the table doesn't exist.
     # http://www.w3.org/TR/html4/struct/tables.html
     def to_a
@@ -148,10 +150,10 @@ module Watir
     end
     
     # returns an ole object
-    def row(index)
-      return @o.invoke("rows")[(index-1).to_s]
+    def _row(index)
+      return @o.invoke("rows")[(index - 1).to_s]
     end
-    private :row
+    private :_row
     
     # Returns an array containing all the text values in the specified column
     # Raises an UnknownCellException if the specified column does not exist in every
@@ -159,15 +161,14 @@ module Watir
     # row of the table
     #   * columnnumber  - column index to extract values from
     def column_values(columnnumber)
-
-      return(1..row_count).collect {|idx| self[idx][columnnumber].text}
+      return (1..row_count).collect {|i| self[i][columnnumber].text}
     end
     
     # Returns an array containing all the text values in the specified row
     # Raises an UnknownObjectException if the table doesn't exist.
     #   * rownumber  - row index to extract values from
     def row_values(rownumber)
-      return(1..column_count(rownumber)).collect {|idx| self[rownumber][idx].text}
+      return (1..column_count(rownumber)).collect {|i| self[rownumber][i].text}
     end
     
   end
@@ -201,7 +202,9 @@ module Watir
     
     # iterates through each of the TableBodies in the Table. Yields a TableBody object
     def each
-      1.upto(@o.tBodies.length) { |i| yield TableBody.new(@container, :ole_object, ole_table_body_at_index(i)) }
+      1.upto(@o.tBodies.length) do |i| 
+        yield TableBody.new(@container, :ole_object, ole_table_body_at_index(i))
+      end
     end
     
   end
@@ -248,9 +251,7 @@ module Watir
       return @rows.length
     end
   end
-  
-  
-  # this class is a table row
+    
   class TableRow < Element
     
     def locate
@@ -291,7 +292,9 @@ module Watir
     # Returns an element from the row as a TableCell object
     def [](index)
       assert_exists
-      raise UnknownCellException, "Unable to locate a cell at index #{index}" if @cells.length < index
+      if @cells.length < index
+        raise UnknownCellException, "Unable to locate a cell at index #{index}" 
+      end
       return @cells[(index - 1)]
     end
     
@@ -300,7 +303,6 @@ module Watir
     #        def method_missing(aSymbol, *args)
     #            return @o.send(aSymbol, *args)
     #        end
-    
     def column_count
       locate
       @cells.length

metadata

@@ -1,37 +1,55 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: watir
 version: !ruby/object:Gem::Version 
-  version: 1.5.4
-date: 2008-04-23 00:00:00 -05:00
-summary: Automated testing tool for web applications.
-require_paths: 
-- .
-email: wtr-general@rubyforge.org
-homepage: http://wtr.rubyforge.org/
-rubyforge_project: Web Testing with Ruby
-description: WATIR is "Web Application Testing in Ruby". Watir (pronounced water) is a free,  open-source functional testing tool for automating browser-based tests of web applications.  It works with applications written in any language. Watir drives the Internet Explorer browser the same way an end user would.  It clicks links, fills in forms, presses buttons.  Watir also checks results, such as whether expected text appears on the  page, or whether a control is enabled. Watir can test web applications written in any language.  Watir is a Ruby library that works with Internet Explorer on Windows.
-autorequire: watir
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.5.5
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Bret Pettichord
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-06-09 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: win32-process
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.5.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: windows-pr
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.6.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: WATIR is "Web Application Testing in Ruby". Watir (pronounced water) is a free,  open-source functional testing tool for automating browser-based tests of web applications.  It works with applications written in any language. Watir drives the Internet Explorer browser the same way an end user would.  It clicks links, fills in forms, presses buttons.  Watir also checks results, such as whether expected text appears on the  page, or whether a control is enabled. Watir can test web applications written in any language.  Watir is a Ruby library that works with Internet Explorer on Windows.
+email: watir-general@groups.google.com
+executables: 
+- watir-console
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - watir.rb
 - watir/assertions.rb
-- watir/bonus-elements.rb
 - watir/camel_case.rb
 - watir/clickJSDialog.rb
 - watir/close_all.rb
@@ -62,7 +80,6 @@ files:
 - watir/setFileDialog.rb
 - watir/table.rb
 - watir/testcase.rb
-- watir/testUnitAddons.rb
 - watir/utils.rb
 - watir/waiter.rb
 - watir/watir_simple.rb
@@ -112,7 +129,6 @@ files:
 - unittests/pre_test.rb
 - unittests/radios_test.rb
 - unittests/radios_xpath_test.rb
-- unittests/screen_capture_test.rb
 - unittests/selectbox_test.rb
 - unittests/selectbox_xpath_test.rb
 - unittests/setup.rb
@@ -191,6 +207,7 @@ files:
 - unittests/other/all_tests_concurrent.rb
 - unittests/other/navigate_exception_test.rb
 - unittests/other/rexml_unit_test.rb
+- unittests/other/screen_capture_test.rb
 - unittests/other/testcase_method_order_test.rb
 - unittests/other/testcase_verify_test.rb
 - unittests/other/wait_until_test.rb
@@ -221,8 +238,9 @@ files:
 - readme.rb
 - changes.rb
 - license.rb
-test_files: 
-- unittests/core_tests.rb
+has_rdoc: true
+homepage: http://wtr.rubyforge.org/
+post_install_message: 
 rdoc_options: 
 - --title
 - Watir API Reference
@@ -232,30 +250,26 @@ rdoc_options:
 - Watir::IE
 - --exclude
 - unittests|camel_case.rb|testUnitAddons.rb
-extra_rdoc_files: []
-
-executables: 
-- watir-console
-extensions: []
-
+require_paths: 
+- .
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: 
 - Microsoft Windows running Internet Explorer 5.5 or later.
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: win32-process
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: windows-pr
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.6
-    version: 
+rubyforge_project: Watir
+rubygems_version: 1.1.1
+signing_key: 
+specification_version: 2
+summary: Automated testing tool for web applications.
+test_files: 
+- unittests/core_tests.rb