watir-webdriver 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/watir-webdriver/base_element.rb

@@ -71,21 +71,21 @@ module Watir
       def define_string_attribute(mname, aname)
         define_method mname do
           assert_exists
-          rescue_no_match { @element.attribute(aname).to_s }
+          @element.attribute(aname).to_s
         end
       end
 
       def define_boolean_attribute(mname, aname)
         define_method mname do
           assert_exists
-          rescue_no_match(false) { !!@element.attribute(aname) }
+          !!@element.attribute(aname)
         end
       end
 
       def define_int_attribute(mname, aname)
         define_method mname do
           assert_exists
-          rescue_no_match(-1) { @element.attribute(aname).to_i }
+          @element.attribute(aname).to_i
         end
       end
 
@@ -225,12 +225,16 @@ module Watir
 
     def value
       assert_exists
-      rescue_no_match { @element.value || "" }
+
+      begin
+        @element.value
+      rescue WebDriver::Error::ElementNotEnabledError
+        ""
+      end
     end
 
     def attribute_value(attribute_name)
       assert_exists
-      # should rescue?
       @element.attribute attribute_name
     end
 
@@ -291,7 +295,7 @@ module Watir
         assert_exists
         @element.style property
       else
-        rescue_no_match { attribute_value "style" } || ''
+        attribute_value "style" || ''
       end
     end
 
@@ -338,12 +342,6 @@ module Watir
       raise ObjectReadOnlyException if respond_to?(:readonly?) && readonly?
     end
 
-    def rescue_no_match(returned = "", &blk)
-      yield
-    rescue WebDriver::Error::ElementNotEnabledError
-      returned
-    end
-
     def extract_selector(selectors)
       case selectors.size
       when 2

data/lib/watir-webdriver/elements/input.rb

@@ -17,7 +17,7 @@ module Watir
 
     def type
       assert_exists
-      value = rescue_no_match { @element.attribute("type").to_s }
+      value = @element.attribute("type").to_s
 
       # we return 'text' if the type is invalid
       # not sure if we really should do this

data/lib/watir-webdriver/locators/element_locator.rb

@@ -4,16 +4,16 @@ module Watir
     include Watir::Exception
     include Selenium
 
-    WD_FINDERS =  [ 
-      :class, 
-      :class_name, 
+    WD_FINDERS =  [
+      :class,
+      :class_name,
       :css,
-      :id, 
+      :id,
       :link,
-      :link_text, 
-      :name, 
-      :partial_link_text, 
-      :tag_name, 
+      :link_text,
+      :name,
+      :partial_link_text,
+      :tag_name,
       :xpath
     ]
 
@@ -124,6 +124,14 @@ module Watir
 
     def wd_find_by_regexp_selector(selector, method = :find)
       rx_selector = delete_regexps_from(selector)
+
+      if rx_selector.has_key?(:label) && should_use_label_element?
+        label_exp = rx_selector.delete(:label)
+        label     = @wd.find_elements(:tag_name, 'label').find { |e| matches_selector?({:text => label_exp}, e) } || return
+
+        selector[:id] = label.attribute(:for)
+      end
+
       xpath = build_xpath(selector) || raise("internal error: unable to build xpath from #{@selector.inspect}")
 
       elements = @wd.find_elements(:xpath, xpath)
@@ -202,7 +210,7 @@ module Watir
     end
 
     def assert_valid_as_attribute(attribute)
-      if @valid_attributes && !@valid_attributes.include?(attribute)
+      unless valid_attribute? attribute
         raise MissingWayOfFindingObjectException, "invalid attribute: #{attribute.inspect}"
       end
     end
@@ -227,6 +235,14 @@ module Watir
       tag_name === element.tag_name
     end
 
+    def valid_attribute?(attribute)
+      @valid_attributes && @valid_attributes.include?(attribute)
+    end
+
+    def should_use_label_element?
+      @selector[:tag_name] != "option"
+    end
+
     def build_xpath(selectors)
       return if selectors.values.any? { |e| e.kind_of? Regexp }
 
@@ -260,7 +276,12 @@ module Watir
     end
 
     def equal_pair(key, value)
-      "#{lhs_for(key)}='#{value}'"
+      # we assume :label means a corresponding label element, not the attribute
+      if key == :label && should_use_label_element?
+        "@id=//label[normalize-space()='#{value}']/@for"
+      else
+        "#{lhs_for(key)}='#{value}'"
+      end
     end
 
     def lhs_for(key)

data/lib/watir-webdriver/locators/text_field_locator.rb

@@ -32,9 +32,9 @@ module Watir
     end
 
     def lhs_for(key)
-      if @building == :input && [:text, :label].include?(key)
+      if @building == :input && key == :text
         "@value"
-      elsif @building == :textarea && [:value, :label].include?(key)
+      elsif @building == :textarea && :value == :key
         "text()"
       else
         super

data/spec/watirspec/image_spec.rb

@@ -122,7 +122,7 @@ describe "Image" do
   end
 
   # File methods
-  bug "WTR-347", :watir do
+  not_compliant_on :watir, :webdriver do # "WTR-347"
     describe "#file_created_date" do
       it "returns the date the image was created as reported by the file system" do
         browser.goto(WatirSpec.host + "/images.html")
@@ -134,7 +134,7 @@ describe "Image" do
   end
 
 
-  bug "WTR-346", :watir do
+  not_compliant_on :watir, :webdriver do  # WTR-346
     describe "#file_size" do
       it "returns the file size of the image if the image exists" do
         browser.image(:id, 'square').file_size.should == File.size("#{WatirSpec.files}/images/square.jpg".sub("file://", ''))
@@ -172,7 +172,7 @@ describe "Image" do
 
   # Other
 
-  not_compliant_on(:webdriver) {
+  not_compliant_on :webdriver do
     describe "#loaded?" do
       it "returns true if the image has been loaded" do
         browser.image(:title, 'Circle').should be_loaded
@@ -191,20 +191,20 @@ describe "Image" do
         lambda { browser.image(:index, 1337).loaded? }.should raise_error(UnknownObjectException)
       end
     end
+  end
 
-    bug "WTR-336", :watir do
-      describe "#save" do
-        it "saves the image to a file" do
-          file = "#{File.expand_path Dir.pwd}/sample.img.dat"
-          begin
-            browser.image(:index, 1).save(file)
-            File.exist?(file).should be_true
-          ensure
-            File.delete(file) if File.exist?(file)
-          end
+  not_compliant_on :watir, :webdriver do # WTR-336
+    describe "#save" do
+      it "saves the image to a file" do
+        file = "#{File.expand_path Dir.pwd}/sample.img.dat"
+        begin
+          browser.image(:index, 1).save(file)
+          File.exist?(file).should be_true
+        ensure
+          File.delete(file) if File.exist?(file)
         end
       end
     end
-  }
+  end
 
 end

data/spec/watirspec/option_spec.rb

@@ -91,14 +91,12 @@ describe "Option" do
   describe "#select" do
     bug "WTR-367", :watir do
       it "selects the chosen option (page context)" do
-        browser.select_list(:name, "new_user_country").clear
         browser.option(:text, "Denmark").select
         browser.select_list(:name, "new_user_country").selected_options.should == ["Denmark"]
       end
     end
 
     it "selects the chosen option (select_list context)" do
-      browser.select_list(:name, "new_user_country").clear
       browser.select_list(:name, "new_user_country").option(:text, "Denmark").select
       browser.select_list(:name, "new_user_country").selected_options.should == ["Denmark"]
     end

data/watir-webdriver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watir-webdriver}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jari Bakken"]
-  s.date = %q{2010-07-21}
+  s.date = %q{2010-07-22}
   s.description = %q{WebDriver-backed Watir}
   s.email = %q{jari.bakken@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watir-webdriver
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jari Bakken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 +02:00
+date: 2010-07-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency