firewatir 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/firewatir/element.rb

@@ -264,6 +264,9 @@ module FireWatir
         jssh_command = "var isButtonElement = false;"
       end
 
+      # In HTML, getElementsByTagName is case insensitive. However, in XHTML, it needs to be lowercase.
+      tag = tag.downcase
+
       # Because in both the below cases we need to get element with respect to document.
       # when we locate a frame document is automatically adjusted to point to HTML inside the frame
       if(@container.class == FireWatir::Firefox || @container.class == Frame)
@@ -278,6 +281,13 @@ module FireWatir
         #puts "container name is: " + @container.element_name
         #locate if defined? locate
         #@container.locate
+	
+	# We cannot assume that the container exists at this point, because code like:
+	# b.div(:id, "something_that_does_not_exist").h2(:text, /foobar/).exists? would return true
+	if (!@container.exists?)
+	  return nil
+	end
+
         jssh_command << "var elements_#{@@current_level}_#{tag} = #{@container.element_name}.getElementsByTagName(\"#{tag}\");"
         if(types != nil and (types.include?("textarea") or types.include?("button") ) )
           jssh_command << "elements_#{@@current_level}_#{tag} = #{@container.element_name}.getElementsByTagName(\"*\");"

data/lib/firewatir/element_collections.rb

@@ -39,7 +39,7 @@ module FireWatir
     end
 
 
-    # Return all the elements of give tag and type inside the container.
+    # Return all the elements of given tag and type inside the container.
     #
     # Input:
     #   tag - tag name of the elements
@@ -66,6 +66,10 @@ module FireWatir
       else
         search_tag = tag
       end
+
+      # In HTML, getElementsByTagName is case insensitive. However, in XHTML, it needs to be lowercase.
+      search_tag = search_tag.downcase
+
       jssh_command << "var #{elements_tag} = null; "
       jssh_command << "#{elements_tag} = #{container_name}.getElementsByTagName(\"#{search_tag}\");"
 

data/unittests/html/a.html

@@ -0,0 +1,13 @@
+<html>
+<body>
+
+<ul>
+<li><a href="http://watir.com/" id="link1">lowercase link</a></li>
+<li><A href="http://watir.com/" id="link2">uppercase link</A></li>
+<li><a href="http://watir.com/" ID="link3">another lowercase link</a></li>
+<li><A href="http://watir.com/" ID="link4">another uppercase link</A></li>
+</ul>
+
+</body>
+</html>
+

data/unittests/html_case_sensitive_tags_test.rb

@@ -0,0 +1,29 @@
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_HTML_Case_Sensitive_Tags < Test::Unit::TestCase
+  include Watir::Exception
+  location __FILE__
+
+  def setup
+    uses_page "a.html"
+  end
+
+  def test_html
+    # HTML is not case sensitive, so all the links on the page should exist.
+    assert browser.link(:id, "link1").exists?, "Could not find link1 by :id"
+    assert browser.link(:id, "link2").exists?, "Could not find link2 by :id"
+    assert browser.link(:id, "link3").exists?, "Could not find link3 by :id"
+    assert browser.link(:id, "link4").exists?, "Could not find link4 by :id"
+
+    links = browser.links
+    assert(links.size == 4, "Links did not find 2 elements")
+
+    links_text = [links[0].text, links[1].text, links[2].text, links[3].text].sort
+
+    assert(links_text[0] == "another lowercase link", "Links did not find link3")
+    assert(links_text[1] == "another uppercase link", "Links did not find link4")
+    assert(links_text[2] == "lowercase link", "Links did not find link1")
+    assert(links_text[3] == "uppercase link", "Links did not find link2")
+  end
+end

data/unittests/xhtml_case_sensitive_tags_test.rb

@@ -0,0 +1,30 @@
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+class TC_XHTML_Case_Sensitive_Tags < Test::Unit::TestCase
+  include Watir::Exception
+  location __FILE__
+
+  def setup
+    uses_page "a.xhtml"
+  end
+
+  def test_html
+    # XHTML is case sensitive, so only link 1 is valid.
+    # link3 will work if you use ":ID"
+
+    assert browser.link(:id, "link1").exists?, "Could not find link1 by :id"
+    assert !browser.link(:id, "link2").exists?, "Found link2 by :id"
+    assert !browser.link(:id, "link3").exists?, "Found link3 by :id"
+    assert browser.link(:ID, "link3").exists?, "Could not find link3 by :ID"
+    assert !browser.link(:id, "link4").exists?, "Found link4 by :id"
+
+    links = browser.links
+    assert(links.size == 2, "Links did not find 2 elements")
+
+    links_text = [links[0].text, links[1].text].sort
+
+    assert(links_text[0] == "another lowercase link", "Links did not find link1")
+    assert(links_text[1] == "lowercase link", "Links did not find link3")
+  end
+end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: firewatir
 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: 
 - Angrez Singh
@@ -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 
@@ -26,12 +27,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: *id001
 - !ruby/object:Gem::Dependency 
@@ -100,6 +102,7 @@ files:
 - unittests/frame_test.rb
 - unittests/hidden_test.rb
 - unittests/hidden_xpath_test.rb
+- unittests/html_case_sensitive_tags_test.rb
 - unittests/images_test.rb
 - unittests/images_xpath_test.rb
 - unittests/javascript_test.rb
@@ -117,6 +120,8 @@ files:
 - unittests/table_xpath_test.rb
 - unittests/textfields_test.rb
 - unittests/textfields_xpath_test.rb
+- unittests/xhtml_case_sensitive_tags_test.rb
+- unittests/html/a.html
 - unittests/html/blankpage.html
 - unittests/html/buttons1.html
 - unittests/html/checkboxes1.html
@@ -208,12 +213,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: 
 - Mozilla Firefox browser 1.5 or later.
 rubyforge_project: Watir