watir 1.6.7 → 1.7.0.rc1

data/CHANGES

@@ -1,9 +1,23 @@
+== Version 1.7.0 - 2010/12/20
+
+=== IE improvements
+
+* Fixed Watir::IE#close_all. Closes http://jira.openqa.org/browse/WTR-463 (Jarmo Pertman)
+* IE#wait waits now again until browser has a state of READYSTATE_COMPLETE due to strange timing issues. Closes http://jira.openqa.org/browse/WTR-466 (Jarmo Pertman)
+* Added CSS3 selectors with usage like browser.text_field(:css => "input[name='text1']") (Jonas Tingeborn)
+* Updated bundled version of AutoIt to 3.3.6.1. Closes http://jira.openqa.org/browse/WTR-440 (Jarmo Pertman)
+
+=== Firefox improvements
+
+* Fixed Element#exists? for cases where nested elements were used for locating (Alok Menghrajani)
+* Ignore uppercase tags in XHTML when searching for elements (Alok Menghrajani)
+
 == Version 1.6.7 - 2010/10/26
 
 === General improvements
 
-* added new waiting methods on Watir::Element: #when_present, #wait_until_present and #wait_while_present (Jari Bakken and Jarmo Pertman)
-* added new waiting methods on Watir::IE and Watir::Firefox: #wait_until and #wait_while (Jari Bakken and Jarmo Pertman)
+* added new waiting methods for Watir::Element: #when_present, #wait_until_present and #wait_while_present (Jari Bakken and Jarmo Pertman)
+* added new waiting methods for Watir::IE and Watir::Firefox: #wait_until and #wait_while (Jari Bakken and Jarmo Pertman)
 * added method #present? for Watir::Element (Jari Bakken and Jarmo Pertman)
 * deprecated old waiting methods in Watir::Waiter which will be removed in some future version - use Watir::Wait instead (Jarmo Pertman)
 

data/README.rdoc

@@ -46,11 +46,11 @@ To install Firefox driver:
 
 Some examples from http://watir.com/examples
 
-Including Watir gem to drive Internet Explorer on Windows
+Loading Watir gem to drive Internet Explorer on Windows
 
   require 'watir'
 
-Including FireWatir gem to drive Firefox on Windows/Mac/Linux
+Loading FireWatir gem to drive Firefox on Windows/Mac/Linux
 
   require 'firewatir'
 
@@ -69,8 +69,8 @@ Setting a multi-line text box
 
 Setting and clearing a radio button
 
-  browser.radio(:value => "watir").set
-  browser.radio(:value => "watir".clear
+  browser.radio(:value => "Watir").set
+  browser.radio(:value => "Watir").clear
 
 Setting and clearing check boxes
 
@@ -94,7 +94,7 @@ Clicking a button
 
 Checking for text in a page
 
-  puts browser.text.include? "Your response has been recorded."
+  puts browser.text.include?("Your response has been recorded.")
 
 Checking the title of a page
 

data/VERSION

@@ -1 +1 @@
-1.6.7
+1.7.0.rc1

data/lib/watir/close_all.rb

@@ -28,7 +28,7 @@ module Watir
         IE.attach_timeout = 0
         self.modal_dialog.close
         true
-      rescue NoMatchingWindowFoundException, TimeOutException
+      rescue NoMatchingWindowFoundException, Wait::TimeoutError
         false
       ensure
         IE.attach_timeout = original_attach_timeout

data/lib/watir/container.rb

@@ -824,6 +824,8 @@ module Watir
       case how
       when :xpath
         return element_by_xpath(what)
+      when :css
+        return element_by_css(what)
       when :ole_object
         return what
       end
@@ -839,6 +841,11 @@ module Watir
       locator.locate
     end
     
+    # abstract method for locating an element using a CSS selector expression
+    def element_by_css(selector)
+      raise MissingWayOfFindingObjectException, "CSS selectors not yet supported for #{self.class.name}"
+    end
+    
     # returns the ole object for the specified element
     def locate_tagged_element(tag, how, what)
       locator = TaggedElementLocator.new(self, tag)

data/lib/watir/form.rb

@@ -45,6 +45,8 @@ module Watir
       # Get form using xpath.
       if @how == :xpath
         @ole_object = @container.element_by_xpath(@what)
+      elsif @how == :css
+        @ole_object = @container.element_by_css(@what)
       else
         count = 1
         doc = @container.document

data/lib/watir/ie-class.rb

@@ -50,8 +50,7 @@ module Watir
 		end
 
     # Used internally to determine when IE has finished loading a page
-    READYSTATE_INTERACTIVE = 3
-    READYSTATE_COMPLETE = 4
+    READYSTATES = {:complete => 4}
 
     # The default color for highlighting objects as they are accessed.
     HIGHLIGHT_COLOR = 'yellow'
@@ -312,7 +311,6 @@ module Watir
 
   	# Are we attached to an open browser?
     def exists?
-      return false if @closing
       begin
         @ie.name =~ /Internet Explorer/
       rescue WIN32OLERuntimeError
@@ -396,7 +394,6 @@ module Watir
     # Closes the Browser
     def close
       return unless exists?
-      @closing = true
       @ie.stop
       wait rescue nil
       chwnd = @ie.hwnd.to_i
@@ -487,7 +484,7 @@ module Watir
             sleep interval
           end
 
-          until [READYSTATE_INTERACTIVE, READYSTATE_COMPLETE].include?(@ie.readyState)
+          until READYSTATES.has_value?(@ie.readyState)
             sleep interval
           end
 
@@ -503,7 +500,7 @@ module Watir
 
         while doc = documents_to_wait_for.shift
           begin
-            until ["interactive", "complete"].include?(doc.readyState)
+            until READYSTATES.has_key?(doc.readyState.to_sym)
               sleep interval
             end
             @url_list << doc.location.href unless @url_list.include?(doc.location.href)
@@ -893,6 +890,19 @@ module Watir
     end
     private :html_source
 
+    # execute css selector and return an array of (ole object) elements
+    def elements_by_css(selector)
+      xmlparser_document_object # Needed to ensure Nokogiri has been loaded
+      xpath = Nokogiri::CSS.xpath_for(selector)[0]
+      elements_by_xpath(xpath)
+    end
+
+    # return the first (ole object) element that matches the css selector
+    def element_by_css(selector)
+      temp = elements_by_css(selector)
+      return temp[0] if temp
+    end
+
     # return the first element that matches the xpath
     def element_by_xpath(xpath)
       temp = elements_by_xpath(xpath)

data/lib/watir/image.rb

@@ -16,6 +16,8 @@ module Watir
     def locate
       if @how == :xpath
         @o = @container.element_by_xpath(@what)
+      elsif @how == :css
+        @o = @container.element_by_css(@what)
       else
         @o = @container.locate_tagged_element('IMG', @how, @what)
       end

data/lib/watir/link.rb

@@ -19,6 +19,8 @@ module Watir
     def locate
       if @how == :xpath
         @o = @container.element_by_xpath(@what)
+      elsif @how == :css
+        @o = @container.element_by_css(@what)
       else
         begin
           @o = @container.locate_tagged_element('A', @how, @what)

data/lib/watir/modal_dialog.rb

@@ -17,7 +17,7 @@ module Watir
           hwnd_modal, arr = GetWindow.call(hwnd, GW_ENABLEDPOPUP) # GW_ENABLEDPOPUP = 6
           hwnd_modal > 0
         end
-      rescue TimeOutException
+      rescue Wait::TimeoutError
         return nil
       end
       if hwnd_modal == hwnd || hwnd_modal == 0
@@ -47,7 +47,7 @@ module Watir
               @hwnd, arr = FindWindowEx.call(0, 0, nil, title)
               @hwnd > 0
             end
-          rescue TimeOutException
+          rescue Wait::TimeoutError
             raise NoMatchingWindowFoundException, 
               "Modal Dialog with title #{what} not found. Timeout = #{Watir::IE.attach_timeout}"
           end
@@ -67,7 +67,7 @@ module Watir
           intUnknown = intArray.first
           intUnknown > 0
         end
-      rescue TimeOutException => e        
+      rescue Wait::TimeoutError => e
         raise NoMatchingWindowFoundException, 
           "Unable to attach to Modal Window #{what.inspect} after #{e.duration} seconds."
       end

data/lib/watir/module.rb

@@ -4,7 +4,7 @@ module Watir
 # Directory containing the watir.rb file
   @@dir = File.expand_path(File.dirname(__FILE__))
 
-# Like regular Ruby "until", except that a TimeOutException is raised
+# Like regular Ruby "until", except that a Wait::TimeoutError is raised
 # if the timeout is exceeded. Timeout is IE.attach_timeout.
   def self.until_with_timeout # block
     Wait.until(IE.attach_timeout) { yield }

data/lib/watir/non_control_elements.rb

@@ -21,6 +21,8 @@ module Watir
     def locate
       if @how == :xpath
         @o = @container.element_by_xpath(@what)
+      elsif @how == :css
+        @o = @container.element_by_css(@what)
       else
         @o = @container.locate_tagged_element(self.class::TAG, @how, @what)
       end

data/lib/watir/table.rb

@@ -32,6 +32,8 @@ module Watir
     def locate
       if @how == :xpath
         @o = @container.element_by_xpath(@what)
+      elsif @how == :css
+        @o = @container.element_by_css(@what)
       elsif @how == :ole_object
         @o = @what
       else
@@ -260,6 +262,8 @@ module Watir
         @o = @what
       elsif @how == :xpath
         @o = @container.element_by_xpath(@what)
+      elsif @how == :css
+        @o = @container.element_by_css(@what)
       else
         @o = @container.locate_tagged_element("TR", @how, @what)
       end
@@ -355,6 +359,8 @@ module Watir
     def locate
       if @how == :xpath
         @o = @container.element_by_xpath(@what)
+      elsif @how == :css
+        @o = @container.element_by_css(@what)
       elsif @how == :ole_object
         @o = @what
       else

data/unittests/css_selector_test.rb

@@ -0,0 +1,57 @@
+# Feature tests for CSS selectors.
+#
+# Only shallow testing is needed since the selectors are immediately 
+# converted to xpath and the other xpath tests will provide coverage 
+# for the returned objects. This test more or less only verifies that the 
+# respective classes have implemented the css selector as a query option.
+#
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+# Since the CSS selectors were added to Watir::IE, these CSS selector tests
+# will fail when using Firefox, until someone implements the method 
+# "element_by_css(selector)" for that browser that is..  so for now only run 
+# them for IE.
+if Watir::Browser.default == 'ie'
+
+	class TC_CSS_Selector < Test::Unit::TestCase
+	  include Watir::Exception
+	        
+	  # Same test as TC_Divs_XPath::test_divs but using css selectors instead
+	  def test_matching_queries
+	    goto_page "div.html"
+	    
+	    assert_raises(UnknownObjectException) {browser.div(:css , "div[id='div77']").click }
+	    assert_raises(UnknownObjectException) {browser.div(:css , "div[title='div77']").click }
+	    
+	    assert(browser.text_field(:css, "input[name='text1']").verify_contains("0") )  
+	    browser.div(:css , "div[id='div3']").click
+	    assert(browser.text_field(:css, "input[ name = 'text1' ]").verify_contains("1") )  
+	    browser.div(:css , "div[id = div4]").click
+	    assert(browser.text_field(:css, "input[name=text1]").verify_contains("0") )  
+	  end
+	  
+	  def test_form
+	    goto_page "forms2.html"
+	    assert_equal(browser.form(:css, "#f2").action, "pass2.html")
+	    assert_equal(browser.button(:css, "form #b2").value, "Click Me")
+	  end
+	
+	  def test_image
+	    goto_page "div.html"
+	    assert_equal( "circle", browser.image(:css, "*[id ^= 'circ']").id )
+	  end
+	  
+	  def test_link
+	    goto_page "links1.html"
+	    assert_equal( "link_name", browser.link(:css, "*[name *= ink_nam]").name )
+	  end
+	  
+	  def test_table
+	  	goto_page "table1.html"
+	  	assert_equal( "Header", browser.cell(:css , ".sample th").text )
+	  end
+	end
+	
+end

data/watir.gemspec

@@ -2,7 +2,7 @@ require 'watir-rdoc'
 
 $__watir_source_patterns = [
     'CHANGES', 'rakefile.rb', 'VERSION', "README.rdoc", 'watir.gemspec', 'watir-rdoc.rb', 'LICENSE',
-    'lib/watir/*.rb', 'lib/watir/AutoItX3.dll',
+    'lib/watir/*.rb', 'lib/watir/AutoItX3.dll', 'lib/watir/AutoItX.chm',
     'unittests/*.rb', 'unittests/html/*.html', 'unittests/html/images/*.*',
     'unittests/other/*.rb', 'unittests/testcase/*.rb', 'unittests/windows/*.rb',
     'lib/watir/IEDialog/Release/IEDialog.dll', 'lib/watir/win32ole/win32ole.so',

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: watir
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 977940582
+  prerelease: true
   segments: 
   - 1
-  - 6
   - 7
-  version: 1.6.7
+  - 0
+  - rc1
+  version: 1.7.0.rc1
 platform: ruby
 authors: 
 - Bret Pettichord
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -06:00
+date: 2010-12-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,12 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 977940582
         segments: 
         - 1
-        - 6
         - 7
-        version: 1.6.7
+        - 0
+        - rc1
+        version: 1.7.0.rc1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,12 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 977940582
         segments: 
         - 1
-        - 6
         - 7
-        version: 1.6.7
+        - 0
+        - rc1
+        version: 1.7.0.rc1
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -149,12 +152,14 @@ files:
 - lib/watir/winClicker.rb
 - lib/watir/WindowHelper.rb
 - lib/watir/AutoItX3.dll
+- lib/watir/AutoItX.chm
 - unittests/all_tests.rb
 - unittests/buttons_xpath_test.rb
 - unittests/checkbox_test.rb
 - unittests/checkbox_xpath_test.rb
 - unittests/click_no_wait_test.rb
 - unittests/core_tests.rb
+- unittests/css_selector_test.rb
 - unittests/css_test.rb
 - unittests/defer_test.rb
 - unittests/dialog_test.rb
@@ -330,12 +335,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - Microsoft Windows running Internet Explorer 5.5 or later.
 rubyforge_project: Watir