commonwatir 1.9.2 → 2.0.0.rc2

data/CHANGES

@@ -1,3 +1,30 @@
+== Version 2.0.0 - 2011/07/XX
+
+* RIP FireWatir - there won't be any new releases
+* all elements are using 0-based indexing instead of old 1-based indexing:
+ - disable it temporarily: require "watir"; Watir.options[:zero_based_indexing] = false
+* #radio and #checkbox methods doesn't allow 3 parameters anymore for locating with "value"
+ - use browser.radio(:name => "something", :value => "some value") syntax instead for locating with "value"
+* all element methods accept now multiple-specifiers with hash syntax, for example:
+ - browser.element(:class => "someclass", :name => "somename")
+* all elements are searchable by :xpath and :css now (note that it's usually slower than searching by other specifiers)
+* #button, #form and #frame doesn't accept single string as a specifier anymore to search by name:
+ - use browser.frame(:name => "name") or browser.frame(:name, "name") syntax instead
+* :index => 0 is used as a default specifier if nothing is specified:
+ - browser.div(:id => "id").table.tr is same as browser.div(:id => "id").table(:index => 0).tr(:index => 0)
+* all collection methods accept now specifiers too:
+ - browser.divs(:class => "someclass").each {|div| puts div.class_name} # => "someclass"
+* removed FormElement class
+* renamed CheckBox class to Checkbox
+* renamed CheckBoxes class to Checkboxes
+* added aliases:
+ - tr => row
+ - trs => rows
+ - td => cell
+ - tds => cells
+ - a => link
+ - as => links 
+
 == Version 1.9.2 - 2011/07/11
 
 === IE improvements

data/VERSION

@@ -1 +1 @@
-1.9.2
+2.0.0.rc2

data/lib/watir/browser.rb

@@ -84,6 +84,10 @@ before you invoke Browser.new.
         klass.options
       end
 
+      def base_index
+        options[:zero_based_indexing] ? 0 : 1
+      end      
+
       def klass
         key = Watir.options[:browser]
         eval @@browser_classes[key] # this triggers the autoload

data/lib/watir/browsers.rb

@@ -4,7 +4,7 @@
 
 Watir::Browser.support :name => 'ie', :class => 'Watir::IE', 
   :library => 'watir/ie', :gem => 'watir', 
-  :options => [:speed, :visible]
+  :options => [:speed, :visible, :zero_based_indexing]
 
 Watir::Browser.support :name => 'firefox', :class => 'FireWatir::Firefox',
   :library => 'firewatir'

data/lib/watir/options.rb

@@ -44,6 +44,9 @@ module Watir
       :default => 'fast'
       builder.add_choice :visible,
       :type => :boolean
+      builder.add_choice :zero_based_indexing,
+      :type => :boolean,
+      :default => true
     end
     def execute 
       @user_choices[:speed] = @user_choices[:speed].to_sym

data/unittests/buttons_test.rb

@@ -18,10 +18,6 @@ class TC_Button < Test::Unit::TestCase
     assert_raises(UnknownObjectException) { browser.button(:name, "noName").value }  
   end
   
-  def test_exception_when_one_argument
-    assert_raises(UnknownObjectException) { browser.button( "Missing Caption").click }  
-  end    
-  
   def test_exceptions_with_click
     assert_raises(UnknownObjectException)  { browser.button(:caption, "Missing Caption").click }  
     assert_raises(UnknownObjectException)  { browser.button(:id, "missingID").click }  
@@ -35,6 +31,7 @@ class TC_Button < Test::Unit::TestCase
     assert_raises(UnknownObjectException) { browser.button(:name, "noName").enabled?  }  
   end
 
+  tag_method :test_properties, :fails_on_ie
   def test_properties
     assert_equal("b1", browser.button(:index, 1).name) 
     assert_equal("b2", browser.button(:index, 1).id) 
@@ -57,10 +54,29 @@ class TC_Button < Test::Unit::TestCase
     assert_equal("", browser.button(:index, 2).title)
     assert_equal("this is button1", browser.button(:index, 1).title)
   end
-  
-  def test_default_how
-    browser.button("Click Me").click
-    assert(browser.text.include?("PASS"))
+
+  tag_method :test_properties_ie, :fails_on_firefox
+  def test_properties_ie
+    assert_equal("b1", browser.button(:index, 0).name) 
+    assert_equal("b2", browser.button(:index, 0).id) 
+    assert_equal("button", browser.button(:index, 0).type) 
+    assert_equal("Click Me", browser.button(:index, 0).value) 
+    assert_equal(false, browser.button(:index, 0).disabled) 
+    assert_equal("italic_button", browser.button(:name, "b1").class_name) 
+    assert_equal("", browser.button(:name , "b4").class_name) 
+    
+    assert_equal("b1", browser.button(:id, "b2").name) 
+    assert_equal("b2", browser.button(:id, "b2").id) 
+    assert_equal("button", browser.button(:id, "b2").type) 
+    
+    assert_equal("b4", browser.button(:index, 1).name) 
+    assert_equal("b5", browser.button(:index, 1).id) 
+    assert_equal("button", browser.button(:index, 1).type) 
+    assert_equal("Disabled Button", browser.button(:index, 1).value) 
+    assert_equal(true, browser.button(:index, 1).disabled) 
+    
+    assert_equal("", browser.button(:index, 1).title)
+    assert_equal("this is button1", browser.button(:index, 0).title)
   end
   
   def test_click_and_caption
@@ -135,12 +151,12 @@ class TC_Button2 < Test::Unit::TestCase
     assert(browser.text.include?("PASS")) 
   end
 
-  tag_method :test_buttons_length, :fails_on_ie
   def test_buttons_length
     arrButtons = browser.buttons
     assert_equal(7, arrButtons.length)
   end
 
+  tag_method :test_buttons, :fails_on_ie
   def test_buttons
     arrButtons = browser.buttons
     assert_equal("b2", arrButtons[1].id)
@@ -152,7 +168,19 @@ class TC_Button2 < Test::Unit::TestCase
     assert_equal("Sign In", arrButtons[7].value)
   end
   
-  # Tests collection class
+  tag_method :test_buttons_ie, :fails_on_firefox
+  def test_buttons_ie
+    arrButtons = browser.buttons
+    assert_equal("b2", arrButtons[0].id)
+    assert_equal("b5", arrButtons[1].id)
+    assert_equal("Submit", arrButtons[2].value)
+    assert_equal("sub3", arrButtons[3].name)
+    assert_equal("b7", arrButtons[4].id)
+    assert_equal("b9", arrButtons[5].id)
+    assert_equal("Sign In", arrButtons[6].value)
+  end
+  
+  tag_method :test_class_buttons, :fails_on_ie
   def test_class_buttons
     arr_buttons = browser.buttons
     arr_buttons.each do |b|
@@ -182,15 +210,52 @@ class TC_Button2 < Test::Unit::TestCase
     assert_equal("Sign In", arr_buttons[7].value)
   end
 
+  tag_method :test_class_buttons_ie, :fails_on_firefox
+  def test_class_buttons_ie
+    arr_buttons = browser.buttons
+    arr_buttons.each do |b|
+      assert_class b, 'Button' 
+    end
+    # test properties
+    assert_equal("b2", arr_buttons[0].id)
+    assert_equal("b1", arr_buttons[0].name) 
+    assert_equal("button", arr_buttons[0].type) 
+    assert_equal("Click Me", arr_buttons[0].value) 
+    assert_equal(false, arr_buttons[0].disabled) 
+    assert_equal("italic_button", arr_buttons[0].class_name) 
+    assert_equal( "this is button1", arr_buttons[0].title)
+    
+    assert_equal("b5", arr_buttons[1].id)
+    assert_equal("b4", arr_buttons[1].name) 
+    assert_equal("button", arr_buttons[1].type) 
+    assert_equal("Disabled Button", arr_buttons[1].value) 
+    assert_equal(true, arr_buttons[1].disabled) 
+    assert_equal( "", arr_buttons[1].title)
+    assert_equal("", arr_buttons[1].class_name) 
+    
+    assert_equal("Submit", arr_buttons[2].value)
+    assert_equal("sub3", arr_buttons[3].name)
+    assert_equal("b7", arr_buttons[4].id)
+    assert_equal("b9", arr_buttons[5].id)
+    assert_equal("Sign In", arr_buttons[6].value)
+  end
+
   def test_hash_syntax
     assert_equal('Click Me2', browser.button(:id => 'b7').value)
   end
 
+  tag_method :test_class_and_index, :fails_on_ie  
   def test_class_and_index
     assert_equal('Click Me2', 
       browser.button(:class => 'italic_button', :index => 2).value)
   end
 
+  tag_method :test_class_and_index_ie, :fails_on_firefox
+  def test_class_and_index_ie
+    assert_equal('Click Me2', 
+      browser.button(:class => 'italic_button', :index => 1).value)
+  end
+
   def test_name_and_id #sick, but what the hell
     assert_equal('Disabled Button2',
       browser.button(:name => 'b8', :id => 'b9').value)
@@ -213,7 +278,7 @@ class TC_Button_Frame < Test::Unit::TestCase
   end
 
   def test_in_frame
-    assert(browser.frame("buttonFrame").button(:caption, "Click Me").enabled?)
+    assert(browser.frame(:name, "buttonFrame").button(:caption, "Click Me").enabled?)
   end
   
   def test_error_in_frame

data/unittests/dd_test.rb

@@ -55,6 +55,7 @@ class TC_Dd < Test::Unit::TestCase
     end
   end
   
+  tag_method :test_dd_iterator, :fails_on_ie
   def test_dd_iterator
     assert_equal(11, browser.dds.length)
     assert_equal("education", browser.dds[2].title)
@@ -66,5 +67,18 @@ class TC_Dd < Test::Unit::TestCase
       assert_equal(browser.dd(:index,idx+1).title, dd.title)
     end
   end
+
+  tag_method :test_dd_iterator_ie, :fails_on_firefox
+  def test_dd_iterator_ie
+    assert_equal(11, browser.dds.length)
+    assert_equal("education", browser.dds[1].title)
+    
+    browser.dds.each_with_index do |dd, idx|
+      assert_equal(browser.dd(:index,idx).text, dd.text)
+      assert_equal(browser.dd(:index,idx).id, dd.id)
+      assert_equal(browser.dd(:index,idx).class_name , dd.class_name)
+      assert_equal(browser.dd(:index,idx).title, dd.title)
+    end
+  end
     
-end
+end

data/unittests/dl_test.rb

@@ -53,6 +53,7 @@ class TC_Dl < Test::Unit::TestCase
     end
   end
   
+  tag_method :test_dls_iterator, :fails_on_ie
   def test_dls_iterator
     assert_equal(3, browser.dls.length)
     assert_equal("experience-list", browser.dls[1].id)
@@ -65,4 +66,17 @@ class TC_Dl < Test::Unit::TestCase
     end
   end
     
-end
+  tag_method :test_dls_iterator_ie, :fails_on_firefox
+  def test_dls_iterator_ie
+    assert_equal(3, browser.dls.length)
+    assert_equal("experience-list", browser.dls[0].id)
+    
+    browser.dls.each_with_index do |dl, idx|
+      assert_equal(browser.dl(:index,idx).text, dl.text)
+      assert_equal(browser.dl(:index,idx).id, dl.id)
+      assert_equal(browser.dl(:index,idx).class_name , dl.class_name)
+      assert_equal(browser.dl(:index,idx).title, dl.title)
+    end
+  end
+    
+end

data/unittests/dt_test.rb

@@ -53,6 +53,7 @@ class TC_Dt < Test::Unit::TestCase
     end
   end
   
+  tag_method :test_dts_iterator, :fails_on_ie
   def test_dts_iterator
     assert_equal(11, browser.dts.length)
     assert_equal("experience", browser.dts[1].id)
@@ -65,4 +66,17 @@ class TC_Dt < Test::Unit::TestCase
     end
   end
     
-end
+  tag_method :test_dts_iterator_ie, :fails_on_firefox
+  def test_dts_iterator_ie
+    assert_equal(11, browser.dts.length)
+    assert_equal("experience", browser.dts[0].id)
+    
+    browser.dts.each_with_index do |dt, idx|
+      assert_equal(browser.dt(:index,idx).text, dt.text)
+      assert_equal(browser.dt(:index,idx).id, dt.id)
+      assert_equal(browser.dt(:index,idx).class_name , dt.class_name)
+      assert_equal(browser.dt(:index,idx).title, dt.title)
+    end
+  end
+    
+end

data/unittests/em_test.rb

@@ -52,6 +52,7 @@ class TC_Em < Test::Unit::TestCase
     end
   end
   
+  tag_method :test_em_iterator, :fails_on_ie
   def test_em_iterator
     assert_equal(3, browser.ems.length)
     assert_equal("two text", browser.ems[2].text)
@@ -64,4 +65,17 @@ class TC_Em < Test::Unit::TestCase
     end
   end
     
-end
+  tag_method :test_em_iterator_ie, :fails_on_firefox
+  def test_em_iterator_ie
+    assert_equal(3, browser.ems.length)
+    assert_equal("two text", browser.ems[1].text)
+    
+    browser.ems.each_with_index do |em, idx|
+      assert_equal browser.em(:index, idx).text, em.text
+      assert_equal browser.em(:index, idx).id, em.id
+      assert_equal browser.em(:index, idx).class_name, em.class_name
+      assert_equal browser.em(:index, idx).title, em.title
+    end
+  end
+    
+end

data/unittests/strong_test.rb

@@ -17,6 +17,7 @@ class TC_Strong < Test::Unit::TestCase
     assert browser.strong(:text, /this is a/).exists?, "Could not finr <strong> by :text"
   end
   
+  tag_method :test_strong_iterator, :fails_on_ie
   def test_strong_iterator
     assert_equal(2, browser.strongs.length)
     assert_equal("this is a strong", browser.strongs[1].text)
@@ -29,4 +30,17 @@ class TC_Strong < Test::Unit::TestCase
     end
   end
     
-end
+  tag_method :test_strong_iterator_ie, :fails_on_firefox
+  def test_strong_iterator_ie
+    assert_equal(2, browser.strongs.length)
+    assert_equal("this is a strong", browser.strongs[0].text)
+    
+    browser.strongs.each_with_index do |strong, idx|
+      assert_equal(browser.strong(:index,idx).text, strong.text)
+      assert_equal(browser.strong(:index,idx).id, strong.id)
+      assert_equal(browser.strong(:index,idx).class_name , strong.class_name)
+      assert_equal(browser.strong(:index,idx).title, strong.title)
+    end
+  end
+    
+end

data/unittests/whitespace_test.rb

@@ -10,10 +10,16 @@ class TC_WhiteSpace < Test::Unit::TestCase
     uses_page "whitespace.html"
   end 
 
+  tag_method :test_text_with_nbsp, :fails_on_ie
   def test_text_with_nbsp
     assert_equal 'Login', browser.link(:index => 1).text
   end
 
+  tag_method :test_text_with_nbsp_ie, :fails_on_firefox
+  def test_text_with_nbsp_ie
+    assert_equal 'Login', browser.link(:index => 0).text
+  end
+
   def test_nbsp_beginning_and_end
     assert browser.link(:text, 'Login').exists?
   end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: commonwatir
 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: user-choices
@@ -123,12 +125,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: []
 
 rubyforge_project: wtr