watir 2.0.2 → 2.0.3

data/CHANGES

@@ -1,3 +1,10 @@
+== Version 2.0.3 - 2011/10/21
+
+* fix ElementCollections#[]
+* fix IE::Process.start for IE9 when opening multiple windows
+* add support for Spanish JavaScript and file upload dialogs
+* fix IE#execute_script for Ruby 1.9 with IE9
+
 == Version 2.0.2 - 2011/09/10
 
 * added support for del, ins, font, meta and ol tags

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/lib/watir/dialogs/file_field.rb

@@ -21,15 +21,15 @@ module Watir
     end
 
     def open_button
-      file_upload_window.button(:value => '&Open')
+      file_upload_window.button(:value => /&Open|&Abrir/)
     end
 
     def cancel_button
-      file_upload_window.button(:value => 'Cancel')
+      file_upload_window.button(:value => /Cancel/)
     end
 
     def file_upload_window
-      @window ||= RAutomation::Window.new(:title => /^choose file( to upload)?$/i)
+      @window ||= RAutomation::Window.new(:title => /^choose file( to upload)?|Elegir archivos para cargar$/i)
     end
 
   end

data/lib/watir/dialogs/javascript.rb

@@ -1,7 +1,7 @@
 module Watir
 
   class JavascriptDialog
-    WINDOW_TITLES = ['Message from webpage', 'Windows Internet Explorer','Microsoft Internet Explorer']
+    WINDOW_TITLES = ['Message from webpage', 'Windows Internet Explorer','Microsoft Internet Explorer',/Mensaje de p.*/]
 
     def initialize(opts={})
       @opts = opts

data/lib/watir/element_collections.rb

@@ -3,7 +3,7 @@ module Watir
   # it would normally only be accessed by the iterator methods (spans, links etc) of IE
   class ElementCollections
     include Enumerable
-    
+
     # Super class for all the iteractor classes
     #   * container - an instance of an IE object
     def initialize(container, how, what)
@@ -19,7 +19,7 @@ module Watir
       @length = length
       @page_container = container.page_container
     end
-    
+
     def length
       count = 0
       each {|element| count += 1 }
@@ -32,14 +32,17 @@ module Watir
     def each
       @container.tagged_element_locator(element_tag, @how, @what, element_class).each {|element| yield element}
     end
-    
+
     # allows access to a specific item in the collection
     def [](n)
-      unless n.between?(0, length - 1)
+      number = n - Watir::IE.base_index
+      offset = Watir::IE.zero_based_indexing ? (length - 1) : length
+
+      unless number.between?(0, offset)
         raise Exception::MissingWayOfFindingObjectException,
           "Can't find #{element_tag.downcase} with :index #{n} from #{self.class} with size of #{length}"
       end
-      return iterator_object(n)
+      return iterator_object(number)
     end
 
     def first
@@ -64,7 +67,7 @@ module Watir
       count = 0
       each {|e| return e if count == i; count += 1}
     end
-    
+
     def element_class
       Watir.const_get self.class.name.split("::").last.chop
     end

data/lib/watir/ie-class.rb

@@ -420,7 +420,7 @@ module Watir
     # Execute the given JavaScript string
     def execute_script(source)
       document.parentWindow.eval(source.to_s)
-    rescue WIN32OLERuntimeError #if eval fails we need to use execScript(source.to_s) which does not return a value, hence the workaround
+    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("'", "\\\\'")

data/lib/watir/ie-process.rb

@@ -6,6 +6,7 @@ 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
         process_info = ::Process.create('app_name' => "#{startup_command} about:blank")
         process_id = process_info.process_id
         new process_id

data/unittests/element_collection_indexes_test.rb

@@ -0,0 +1,57 @@
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
+require 'unittests/setup'
+
+
+class TC_TestElementCollectionIndexingForOneBasedIndexes < Test::Unit::TestCase
+
+  def setup
+    close_browser
+    Watir.options[:zero_based_indexing] = false
+    goto_page "zeroindex.html"    
+  end
+
+  def teardown
+    Watir.options[:zero_based_indexing] = true
+    close_browser
+  end
+
+  def test_one_based_index    
+    assert browser.table(:id, 'a_table').rows.length == 6
+
+    #row 1
+    r = browser.table(:id, 'a_table').rows[1]
+    assert r.id == 'first'
+
+    #something in the middle
+    r = browser.table(:id, 'a_table').rows[2]
+    assert r.id == 'second'
+
+    #the last row
+    r = browser.table(:id, 'a_table').rows[6]
+    assert r.id == 'sixth'
+  end
+end
+
+class TC_TestElementCollectionIndexingForZeroBasedIndexes < Test::Unit::TestCase
+
+  def setup
+    #currently the watir default is zero based index    
+    goto_page "zeroindex.html"
+  end
+
+  def test_zero_based_index
+    assert browser.table(:id, 'a_table').rows.length == 6
+
+    #row 1
+    r = browser.table(:id, 'a_table').rows[0]
+    assert r.id == 'first'
+
+    #something in the middle
+    r = browser.table(:id, 'a_table').rows[2]
+    assert r.id == 'third'
+
+    #last row
+    r = browser.table(:id, 'a_table').rows[5]
+    assert r.id == 'sixth'
+  end
+end

data/unittests/html/zeroindex.html

@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<table id="a_table">
+    <tr id="first"><td>alt_1 - boring text</td></tr>
+    <tr id="second"><td>alt_2 - great text</td></tr>
+    <tr id="third"><td>alt_1 - the best text ever<td></tr>
+    <tr id="fourth"><td>alt_2 - okay text<td></tr>
+    <tr id="fifth"><td>alt_1 - supreme text<td></tr>
+    <tr id="sixth"><td>alt_2 - middle of the road text<td></tr>
+</table>
+</html>

data/unittests/windows/new_process_test.rb

@@ -0,0 +1,24 @@
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'commonwatir', 'lib')
+require 'test/unit'
+require 'watir/ie'
+
+class TC_NewProcess < Test::Unit::TestCase
+  def test_new_process_single_window
+    assert_nothing_raised {
+      ie = Watir::IE.new_process
+      ie.goto 'www.yahoo.com'
+      ie.close
+    }
+  end
+  def test_new_process_multiple_windows
+    assert_nothing_raised {
+      ie1 = Watir::IE.new_process
+      ie1.goto 'www.yahoo.com'
+      ie2 = Watir::IE.new_process
+      ie2.goto 'www.google.com'
+      ie1.close
+      ie2.close
+    }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watir
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - Bret Pettichord
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-10 00:00:00 Z
+date: 2011-10-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: win32-process
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 2
         - 0
-        - 2
-        version: 2.0.2
+        - 3
+        version: 2.0.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -173,6 +173,7 @@ files:
 - unittests/div_xpath_test.rb
 - unittests/document_standards.rb
 - unittests/element_collections_test.rb
+- unittests/element_collection_indexes_test.rb
 - unittests/element_test.rb
 - unittests/errorchecker_test.rb
 - unittests/filefield_test.rb
@@ -282,6 +283,7 @@ files:
 - unittests/html/textsearch.html
 - unittests/html/wallofcheckboxes.html
 - unittests/html/xpath_nbsp.html
+- unittests/html/zeroindex.html
 - unittests/html/images/1.gif
 - unittests/html/images/2.GIF
 - unittests/html/images/3.GIF
@@ -308,6 +310,7 @@ files:
 - unittests/windows/ie-each_test.rb
 - unittests/windows/iedialog_test.rb
 - unittests/windows/modal_dialog_test.rb
+- unittests/windows/new_process_test.rb
 - unittests/windows/new_test.rb
 - unittests/windows/open_close_test.rb
 - unittests/windows/send_keys_test.rb
@@ -355,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - Microsoft Windows running Internet Explorer 5.5 or later.
 rubyforge_project: Watir
-rubygems_version: 1.8.10
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: Automated testing tool for web applications.