watir 2.0.3 → 2.0.4

data/CHANGES

@@ -1,3 +1,8 @@
+== Version 2.0.4 - 2011/10/29
+
+* IE#execute_script escapes multi-line JavaScript scripts
+* allow css and xpath locators for element collection methods, fixes http://jira.openqa.org/browse/WTR-493
+
 == Version 2.0.3 - 2011/10/21
 
 * fix ElementCollections#[]

data/VERSION

@@ -1 +1 @@
-2.0.3
+2.0.4

data/lib/watir/ie-class.rb

@@ -16,38 +16,38 @@ module Watir
 
     # Return the options used when creating new instances of IE.
     # BUG: this interface invites misunderstanding/misuse such as IE.options[:speed] = :zippy]
-		def self.options
-			{:speed => self.speed, :visible => self.visible, :attach_timeout => self.attach_timeout, :zero_based_indexing => self.zero_based_indexing}
-	  end
+    def self.options
+      {:speed => self.speed, :visible => self.visible, :attach_timeout => self.attach_timeout, :zero_based_indexing => self.zero_based_indexing}
+    end
     # set values for options used when creating new instances of IE.
-		def self.set_options options
-			options.each do |name, value|
-				send "#{name}=", value
-			end
-		end
-		# The globals $FAST_SPEED and $HIDE_IE are checked both at initialization
-		# and later, because they
-		# might be set after initialization. Setting them beforehand (e.g. from
-		# the command line) will affect the class, otherwise it is only a temporary
-		# effect
-		@@speed = $FAST_SPEED ? :fast : :slow
-		def self.speed
-			return :fast if $FAST_SPEED
-			@@speed
-		end
-		def self.speed= x
-			$FAST_SPEED = nil
-			@@speed = x
-		end
-		@@visible = $HIDE_IE ? false : true
-		def self.visible
-			return false if $HIDE_IE
-			@@visible
-		end
-		def self.visible= x
-			$HIDE_IE = nil
-			@@visible = x
-		end
+    def self.set_options options
+      options.each do |name, value|
+        send "#{name}=", value
+      end
+    end
+    # The globals $FAST_SPEED and $HIDE_IE are checked both at initialization
+    # and later, because they
+    # might be set after initialization. Setting them beforehand (e.g. from
+    # the command line) will affect the class, otherwise it is only a temporary
+    # effect
+    @@speed = $FAST_SPEED ? :fast : :slow
+    def self.speed
+      return :fast if $FAST_SPEED
+      @@speed
+    end
+    def self.speed= x
+      $FAST_SPEED = nil
+      @@speed = x
+    end
+    @@visible = $HIDE_IE ? false : true
+    def self.visible
+      return false if $HIDE_IE
+      @@visible
+    end
+    def self.visible= x
+      $HIDE_IE = nil
+      @@visible = x
+    end
 
     @@zero_based_indexing = true
     def self.zero_based_indexing= enabled
@@ -202,20 +202,20 @@ module Watir
     def speed= how_fast
       case how_fast
       when :zippy then
-	      @typingspeed = 0
-	      @pause_after_wait = 0.01
-	      @type_keys = false
-	      @speed = :fast
+        @typingspeed = 0
+        @pause_after_wait = 0.01
+        @type_keys = false
+        @speed = :fast
       when :fast then
-	      @typingspeed = 0
-	      @pause_after_wait = 0.01
-	      @type_keys = true
-	      @speed = :fast
+        @typingspeed = 0
+        @pause_after_wait = 0.01
+        @type_keys = true
+        @speed = :fast
       when :slow then
-	      @typingspeed = 0.08
-	      @pause_after_wait = 0.1
-	      @type_keys = true
-	      @speed = :slow
+        @typingspeed = 0.08
+        @pause_after_wait = 0.1
+        @type_keys = true
+        @speed = :slow
       else
         raise ArgumentError, "Invalid speed: #{how_fast}"
       end
@@ -228,12 +228,12 @@ module Watir
 
     # deprecated: use speed = :fast instead
     def set_fast_speed
-    	self.speed = :fast
+      self.speed = :fast
     end
 
     # deprecated: use speed = :slow instead    
     def set_slow_speed
-    	self.speed = :slow
+      self.speed = :slow
     end
 
     def visible
@@ -327,7 +327,7 @@ module Watir
         end
       rescue Watir::Wait::TimeoutError
         raise NoMatchingWindowFoundException,
-                 "Unable to locate a window with #{how} of #{what}"
+        "Unable to locate a window with #{how} of #{what}"
       end
       @ie = ieTemp
     end
@@ -340,7 +340,7 @@ module Watir
     end
     attr_writer :hwnd
 
-  	# Are we attached to an open browser?
+    # Are we attached to an open browser?
     def exists?
       begin
         !!(@ie.name =~ /Internet Explorer/)
@@ -419,12 +419,11 @@ module Watir
 
     # Execute the given JavaScript string
     def execute_script(source)
-      document.parentWindow.eval(source.to_s)
+      escaped_src = source.to_s.gsub(/[\r\n']/) {|m| "\\#{m}"}
+      document.parentWindow.eval(escaped_src)
     rescue WIN32OLERuntimeError, NoMethodError #if eval fails we need to use execScript(source.to_s) which does not return a value, hence the workaround
       wrapper = "_watir_helper_div_#{rand(100000)}"
-      escaped_src = source.to_s
-      escaped_src = escaped_src.gsub("'", "\\\\'")
-      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.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

data/lib/watir/locator.rb

@@ -29,6 +29,7 @@ module Watir
     end
 
     def match_with_specifiers?(element)
+      return true if has_excluding_specifiers?
       @specifiers.all? {|how, what| how == :index || match?(element, how, what)}
     end
 

data/unittests/css_selector_test.rb

@@ -9,49 +9,41 @@
 $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(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
+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(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

data/unittests/element_collections_test.rb

@@ -62,6 +62,12 @@ class TC_ElementCollections < Test::Unit::TestCase
     elements.each do |element|
       assert Watir::Div, element.class
     end
+
+    elements = browser.elements(:css => "div")
+    assert 2, elements.size
+    elements.each do |element|
+      assert Watir::Div, element.class
+    end
   end
 
   def test_multiple_specifiers

data/unittests/ie_test.rb

@@ -1,9 +1,8 @@
 # Unit Test for Internet Explorer
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
-require 'watir/win32ole'
+require 'unittests/setup'
 require 'unittests/ie_mock'
-require 'test/unit'
 
 class TC_ie < Test::Unit::TestCase
   include Watir::Exception
@@ -35,12 +34,21 @@ class TC_ie < Test::Unit::TestCase
       @faked_ie.tagged_element_locator('A', :no_such_mechanism, "verifying error handling")
     end
   end
+
+  def test_execute_script
+    script = %q[
+      var x = 'something';
+      var y = " else";
+      x + y;
+    ]
+    assert_equal "something else", browser.execute_script(script)
+  end
   
   # is this correct? 
   def test_getLink_ByUrlReturnsNilOnNoLinks
     assert_nil(@faked_ie.tagged_element_locator('A', :url, "whatever"))
   end
-  
+    
   # is this correct? 
   def test_getLink_ByTextReturnsNilOnNoLinks
     assert_nil(@faked_ie.tagged_element_locator('A', :text, "whatever"))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watir
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 2
   - 0
-  - 3
-  version: 2.0.3
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - Bret Pettichord
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 Z
+date: 2011-10-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: win32-process
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
         - 2
         - 0
-        - 3
-        version: 2.0.3
+        - 4
+        version: 2.0.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency