watir 1.9.2 → 2.0.0.rc2

data/unittests/textfields_test.rb

@@ -73,14 +73,14 @@ class TC_Fields < Test::Unit::TestCase
     build_to_s_regex("max length", "20"),
     build_to_s_regex("read only", "false")
     ]
-    items = browser.text_field(:index, 1).to_s.split(/\n/)
+    items = browser.text_field(:index, 0).to_s.split(/\n/)
     expected.each_with_index{|regex, x| assert_match(regex, items[x]) }
     expected[1] = build_to_s_regex("id", "text2")
     expected[2] = build_to_s_regex("name", "")
     expected[3] = build_to_s_regex("value", "goodbye all")
     expected[6] = build_to_s_regex("max length", "2147483647")  
       
-    items = browser.text_field(:index, 2).to_s.split(/\n/)
+    items = browser.text_field(:index, 1).to_s.split(/\n/)
     expected.each_with_index{|regex, x| assert_match(regex, items[x]) }
     assert_raises(UnknownObjectException) { browser.text_field(:index, 999).to_s }  
   end
@@ -119,19 +119,19 @@ class TC_Fields < Test::Unit::TestCase
     assert_raises(UnknownObjectException) { browser.text_field(:index, 199).disabled }  
     assert_raises(UnknownObjectException) { browser.text_field(:index, 199).type }  
     
-    assert_equal("Hello World" , browser.text_field(:index, 1).value) 
-    assert_equal("text"        , browser.text_field(:index, 1).type)
-    assert_equal("text1"       , browser.text_field(:index, 1).name)
-    assert_equal(""            , browser.text_field(:index, 1).id)
-    assert_equal(false         , browser.text_field(:index, 1).disabled)
+    assert_equal("Hello World" , browser.text_field(:index, 0).value) 
+    assert_equal("text"        , browser.text_field(:index, 0).type)
+    assert_equal("text1"       , browser.text_field(:index, 0).name)
+    assert_equal(""            , browser.text_field(:index, 0).id)
+    assert_equal(false         , browser.text_field(:index, 0).disabled)
     
-    assert_equal(""            , browser.text_field(:index, 2).name)
-    assert_equal("text2"       , browser.text_field(:index, 2).id)
+    assert_equal(""            , browser.text_field(:index, 1).name)
+    assert_equal("text2"       , browser.text_field(:index, 1).id)
     
-    assert(browser.text_field(:index, 4).disabled)
+    assert(browser.text_field(:index, 3).disabled)
     
     assert_equal("This used to test :afterText", browser.text_field(:name, "aftertest").title)
-    assert_equal("", browser.text_field(:index, 1).title)
+    assert_equal("", browser.text_field(:index, 0).title)
     # adding for issue: http://jira.openqa.org/browse/WTR-89
     assert_equal("RegEx test", browser.text_field(:name, /REgEx/i).value)
   end
@@ -139,19 +139,18 @@ class TC_Fields < Test::Unit::TestCase
   def test_text_field_iterators
     assert_equal(14, browser.text_fields.length)
     
-    # watir is 1 based, so this is the first text field
-    assert_equal("Hello World", browser.text_fields[1].value)
-    assert_equal("text1", browser.text_fields[1].name)
-    assert_equal("password", browser.text_fields[browser.text_fields.length].type)
+    assert_equal("Hello World", browser.text_fields[0].value)
+    assert_equal("text1", browser.text_fields[0].name)
+    assert_equal("password", browser.text_fields[browser.text_fields.length - 1].type)
     
-    index = 1
+    index = 0
     browser.text_fields.each do |t|
       assert_equal(browser.text_field(:index, index).value, t.value) 
       assert_equal(browser.text_field(:index, index).id,    t.id)
       assert_equal(browser.text_field(:index, index).name,  t.name)
       index += 1
     end
-    assert_equal(index - 1, browser.text_fields.length)         
+    assert_equal(index, browser.text_fields.length)         
   end
   
   tag_method :test_JS_Events, :fails_on_firefox
@@ -177,8 +176,8 @@ class TC_Fields < Test::Unit::TestCase
   
   def test_labels_iterator
     assert_equal(3, browser.labels.length)
-    assert_equal('Label For this Field' , browser.labels[1].innerText.strip )
-    assert_equal('Password With ID ( the text here is a label for it )' , browser.labels[3].innerText )
+    assert_equal('Label For this Field' , browser.labels[0].innerText.strip )
+    assert_equal('Password With ID ( the text here is a label for it )' , browser.labels[2].innerText )
     
     count=0
     browser.labels.each do |l|
@@ -196,16 +195,16 @@ class TC_Fields < Test::Unit::TestCase
     
     assert_false(browser.label(:index,10).exists?) 
     assert_false(browser.label(:id,'missing').exists?) 
-    assert(browser.label(:index,1).exists?) 
+    assert(browser.label(:index,0).exists?) 
     
-    assert_equal("", browser.label(:index,1).id)
-    assert_false(browser.label(:index,1).disabled?) 
-    assert(browser.label(:index,1).enabled?)
+    assert_equal("", browser.label(:index,0).id)
+    assert_false(browser.label(:index,0).disabled?) 
+    assert(browser.label(:index,0).enabled?)
     
-    assert_equal("label2", browser.label(:index,2).id )
+    assert_equal("label2", browser.label(:index,1).id )
     
-    assert_equal("Password With ID ( the text here is a label for it )" , browser.label(:index,3).innerText)
-    assert_equal("password1", browser.label(:index,3).for)
+    assert_equal("Password With ID ( the text here is a label for it )" , browser.label(:index,2).innerText)
+    assert_equal("password1", browser.label(:index,2).for)
   end
 
   def test_max_length_is_not_exceeded
@@ -221,4 +220,4 @@ class TC_Fields < Test::Unit::TestCase
     browser.text_field(:value, 'foo').set 'bar'
 	assert(browser.text_field(:value, 'bar').exists?)
   end
-end
+end

data/unittests/windows/attach_to_new_window_test.rb

@@ -43,7 +43,7 @@ class TC_NewWindow< Watir::TestCase
   end
   
   def test_click_no_wait_works_in_a_container
-    browser.p(:index, 1).link(:text, 'New Window').click_no_wait
+    browser.p(:index, 0).link(:text, 'New Window').click_no_wait
     IE.attach_timeout = 6.0
     ie_new = IE.attach(:title, 'Pass Page')
     assert(ie_new.text.include?('PASS'))

data/watir-rdoc.rb

@@ -1,6 +1,6 @@
 $WATIR_RDOC_OPTIONS = [] << 
       '--title' << 'Watir API Reference' <<
-  		'--accessor' << 'def_wrap=R,def_wrap_guard=R,def_creator=R,def_creator_with_default=R' <<
+  		'--accessor' << 'def_wrap=R,def_wrap_guard=R' <<
   		'--main' << 'README.rdoc' << 
   		'--exclude' << 'unittests|camel_case.rb'
 $WATIR_EXTRA_RDOC_FILES = ['README.rdoc']

data/watir.gemspec

@@ -37,10 +37,9 @@ spec = Gem::Specification.new do |s|
   s.add_dependency 'win32-process', '>= 0.5.5'
   s.add_dependency 'windows-pr', '>= 0.6.6'
   s.add_dependency 'commonwatir', '= ' + version
-  s.add_dependency 'firewatir', '= ' + version
   s.add_dependency 'nokogiri'
   s.add_dependency 'ffi', '~>1.0'
-  s.add_dependency 'rautomation', '~>0.6.2'
+  s.add_dependency 'rautomation', '~>0.6.3'
 
   s.has_rdoc = true
   s.rdoc_options += $WATIR_RDOC_OPTIONS

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: watir
 version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: 
+  hash: 15424081
+  prerelease: 6
   segments: 
-  - 1
-  - 9
   - 2
-  version: 1.9.2
+  - 0
+  - 0
+  - rc
+  - 2
+  version: 2.0.0.rc2
 platform: ruby
 authors: 
 - Bret Pettichord
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 Z
+date: 2011-07-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: win32-process
@@ -57,34 +59,20 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 15424081
         segments: 
-        - 1
-        - 9
         - 2
-        version: 1.9.2
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: firewatir
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 1
-        - 9
+        - 0
+        - 0
+        - rc
         - 2
-        version: 1.9.2
+        version: 2.0.0.rc2
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,11 +82,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: ffi
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,23 +97,23 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rautomation
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 0
         - 6
-        - 2
-        version: 0.6.2
+        - 3
+        version: 0.6.3
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 description: "    WATIR is \"Web Application Testing in Ruby\". Watir (pronounced water) is a free,\n    open-source functional testing tool for automating browser-based tests of web applications.\n    It works with applications written in any language.\n    Watir drives the Internet Explorer browser the same way an end user would.\n    It clicks links, fills in forms, presses buttons.\n    Watir also checks results, such as whether expected text appears on the\n    page, or whether a control is enabled.\n    Watir can test web applications written in any language.\n    Watir is a Ruby library that works with Internet Explorer on Windows.\n"
 email: watir-general@groups.google.com
 executables: 
@@ -187,6 +175,7 @@ files:
 - unittests/div2_xpath_test.rb
 - unittests/div_test.rb
 - unittests/div_xpath_test.rb
+- unittests/element_collections_test.rb
 - unittests/element_test.rb
 - unittests/errorchecker_test.rb
 - unittests/filefield_test.rb
@@ -200,6 +189,7 @@ files:
 - unittests/ie_test.rb
 - unittests/images_test.rb
 - unittests/images_xpath_test.rb
+- unittests/index_specifier_test.rb
 - unittests/js_events_test.rb
 - unittests/links_multi_test.rb
 - unittests/links_test.rb
@@ -207,6 +197,7 @@ files:
 - unittests/lists_test.rb
 - unittests/map_test.rb
 - unittests/minmax_test.rb
+- unittests/multiple_specifiers_test.rb
 - unittests/navigate_test.rb
 - unittests/nbsp_xpath_test.rb
 - unittests/non_core_tests.rb
@@ -270,6 +261,7 @@ files:
 - unittests/html/map_test.html
 - unittests/html/modal_dialog.html
 - unittests/html/modal_dialog_launcher.html
+- unittests/html/multiple_specifiers.html
 - unittests/html/nestedFrames.html
 - unittests/html/new_browser.html
 - unittests/html/pass.html
@@ -332,7 +324,7 @@ rdoc_options:
 - --title
 - Watir API Reference
 - --accessor
-- def_wrap=R,def_wrap_guard=R,def_creator=R,def_creator_with_default=R
+- def_wrap=R,def_wrap_guard=R
 - --main
 - README.rdoc
 - --exclude
@@ -353,12 +345,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