watir 2.0.0.rc2 → 2.0.0.rc3

data/CHANGES

@@ -15,8 +15,6 @@
 * 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

data/VERSION

@@ -1 +1 @@
-2.0.0.rc2
+2.0.0.rc3

data/lib/watir/collections.rb

@@ -25,8 +25,8 @@ module Watir
 
   # this class accesses the check boxes in the document as a collection
   # Normally a user would not need to create this object as it is returned by the Watir::Container#checkboxes method
-  class Checkboxes < InputElementCollections
-    def element_class; Checkbox; end
+  class CheckBoxes < InputElementCollections
+    def element_class; CheckBox; end
   end
     
   # this class accesses the select boxes in the document as a collection

data/lib/watir/ie-class.rb

@@ -58,6 +58,10 @@ module Watir
       @@zero_based_indexing
     end
 
+    def self.base_index
+      self.zero_based_indexing ? 0 : 1
+    end  
+
     # Used internally to determine when IE has finished loading a page
     READYSTATES = {:complete => 4}
 

data/lib/watir/input_elements.rb

@@ -535,7 +535,7 @@ module Watir
 
   # This class is the watir representation of a check box.
   # Normally a user would not need to create this object as it is returned by the Watir::Container#checkbox method
-  class Checkbox < RadioCheckCommon
+  class CheckBox < RadioCheckCommon
     INPUT_TYPES = ["checkbox"]
     # This method checks or unchecks the checkbox.
     # With no arguments supplied it sets the checkbox.
@@ -561,10 +561,16 @@ module Watir
     end
 
     Watir::Container.module_eval do
-      remove_method :checkboxs
+      remove_method :check_boxs
 
       def checkboxes(how={}, what=nil)
-        Checkboxes.new(self, how, what)
+        CheckBoxes.new(self, how, what)
+      end
+
+      remove_method :check_box
+
+      def checkbox(how={}, what=nil)
+        CheckBox.new(self, how, what)
       end
     end
   end

data/lib/watir/link.rb

@@ -54,7 +54,8 @@ module Watir
     Watir::Container.module_eval do
       alias_method :a, :link
       alias_method :as, :links
-    end
+    end    
+
   end
   
 end

data/lib/watir/locator.rb

@@ -30,7 +30,7 @@ module Watir
 
     def set_specifier(how, what=nil)
       specifiers = what ? {how => what} : how
-      @specifiers = {:index => Watir::Browser.base_index} # default if not specified
+      @specifiers = {:index => Watir::IE.base_index} # default if not specified
       normalize_specifiers! specifiers
     end
 
@@ -76,7 +76,7 @@ module Watir
     def locate
       return locate_by_xpath_css_ole if @specifiers[:xpath] || @specifiers[:css] || @specifiers[:ole_object]
 
-      count = Watir::Browser.base_index - 1
+      count = Watir::IE.base_index - 1
       each do |element|
         count += 1
         return element.ole_object if count == @specifiers[:index]
@@ -136,7 +136,7 @@ module Watir
     def locate
       return locate_by_xpath_css_ole if @specifiers[:xpath] || @specifiers[:css] || @specifiers[:ole_object]      
 
-      count = Watir::Browser.base_index - 1
+      count = Watir::IE.base_index - 1
       each do |frame|
         count += 1
         return frame.ole_object, frame.document if count == @specifiers[:index]
@@ -187,7 +187,7 @@ module Watir
     def locate
       return locate_by_xpath_css_ole if @specifiers[:xpath] || @specifiers[:css] || @specifiers[:ole_object]
 
-      count = Watir::Browser.base_index - 1
+      count = Watir::IE.base_index - 1
       each do |element|
         count += 1
         return element.ole_object if count == @specifiers[:index]
@@ -226,7 +226,7 @@ module Watir
 
       the_id = @specifiers[:id]
       if the_id && the_id.class == String &&
-          @specifiers[:index] == Watir::Browser.base_index && @specifiers.length == 2
+          @specifiers[:index] == Watir::IE.base_index && @specifiers.length == 2
         @element = @document.getElementById(the_id) rescue nil
         # Return if our fast match really HAS a matching :id
         return true if @element && @element.invoke('id') == the_id && @types.include?(@element.getAttribute('type'))

data/unittests/checkbox_test.rb

@@ -3,7 +3,7 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 require 'unittests/setup'
 
-class TC_Checkbox < Test::Unit::TestCase
+class TC_CheckBox < Test::Unit::TestCase
   include Watir::Exception
   
   def setup
@@ -53,7 +53,7 @@ class TC_Checkbox < Test::Unit::TestCase
     assert_false(browser.button(:value, "foo").enabled?)
   end
   
-  def test_Checkbox_Exists
+  def test_CheckBox_Exists
     assert(browser.checkbox(:name, "box1").exists?)   
     assert_false(browser.checkbox(:name, "missing").exists?)   
     

data/unittests/checkbox_xpath_test.rb

@@ -3,7 +3,7 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') unless $SETUP_LOADED
 require 'unittests/setup'
 
-class TC_Checkbox_XPath < Test::Unit::TestCase
+class TC_CheckBox_XPath < Test::Unit::TestCase
   include Watir::Exception
   
   def setup
@@ -27,7 +27,7 @@ class TC_Checkbox_XPath < Test::Unit::TestCase
     assert_equal("" , browser.checkbox(:xpath , "//input[@name='box4' and @value='4']/").title)
   end
   
-  def test_Checkbox_Exists
+  def test_CheckBox_Exists
     assert(browser.checkbox(:xpath , "//input[@name='box4' and @value='1']/").exists?)   
     assert_false(browser.checkbox(:xpath , "//input[@name='box4' and @value='22']/").exists?)   
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: watir
 version: !ruby/object:Gem::Version 
-  hash: 15424081
+  hash: 15424083
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
   - rc
-  - 2
-  version: 2.0.0.rc2
+  - 3
+  version: 2.0.0.rc3
 platform: ruby
 authors: 
 - Bret Pettichord
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-24 00:00:00 Z
+date: 2011-07-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: win32-process
@@ -59,14 +59,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424081
+        hash: 15424083
         segments: 
         - 2
         - 0
         - 0
         - rc
-        - 2
-        version: 2.0.0.rc2
+        - 3
+        version: 2.0.0.rc3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency