watir-webdriver 0.2.0 → 0.2.1

data/.gitignore

@@ -7,3 +7,4 @@ coverage
 rdoc
 .yardoc
 Gemfile.lock
+.rvmrc

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem "simplecov", ">= 0.3.5", :platform => :ruby_19
+gem "ruby-debug19", :platform => :ruby_19
 
 # Specify your gem's dependencies in watir-webdriver.gemspec
 gemspec

data/lib/watir-webdriver/browser.rb

@@ -120,7 +120,7 @@ module Watir
     end
 
     def execute_script(script, *args)
-      args.map! { |e| e.kind_of?(Watir::Element) ? e.element : e }
+      args.map! { |e| e.kind_of?(Watir::Element) ? e.wd : e }
       returned = @driver.execute_script(script, *args)
 
       wrap_elements_in(returned)
@@ -190,7 +190,7 @@ module Watir
     end
 
     def wrap_element(element)
-      Watir.element_class_for(element.tag_name).new(self, :element => element)
+      Watir.element_class_for(element.tag_name.downcase).new(self, :element => element)
     end
 
   end # Browser

data/lib/watir-webdriver/element_collection.rb

@@ -41,7 +41,6 @@ module Watir
     # @return [Watir::Element] Returns an instance of a Watir::Element subclass
     #
 
-
     def [](idx)
       to_a[idx] || element_class.new(@parent, :index => idx)
     end

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

@@ -23,13 +23,16 @@ module Watir
 
     def text
       assert_exists
-      case @element.tag_name
+
+      tn = @element.tag_name.downcase
+
+      case tn
       when 'input'
         @element.attribute(:value)
       when 'button'
         @element.text
       else
-        raise Exception::Error, "unknown tag name for button: #{@element.tag_name}"
+        raise Exception::Error, "unknown tag name for button: #{tn}"
       end
     end
 

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

@@ -47,7 +47,7 @@ module Watir
       return false unless other.kind_of? self.class
 
       assert_exists
-      @element == other.element
+      @element == other.wd
     end
     alias_method :eql?, :==
 
@@ -62,7 +62,7 @@ module Watir
 
     def tag_name
       assert_exists
-      @element.tag_name
+      @element.tag_name.downcase
     end
 
     def click
@@ -102,7 +102,7 @@ module Watir
 
       begin
         @element.value || ''
-      rescue WebDriver::Error::ElementNotEnabledError
+      rescue WebDriver::Error::InvalidElementStateError
         ""
       end
     end
@@ -145,19 +145,26 @@ module Watir
       e = driver.execute_script "return arguments[0].parentNode", @element
 
       if e.kind_of?(WebDriver::Element)
-        Watir.element_class_for(e.tag_name).new(@parent, :element => e)
+        Watir.element_class_for(e.tag_name.downcase).new(@parent, :element => e)
       end
     end
 
+    #
+    # @api private
+    #
+
     def driver
       @parent.driver
     end
 
-    def element
+    #
+    # @api private
+    #
+
+    def wd
       assert_exists
       @element
     end
-    alias_method :wd, :element # ensures duck typing with Browser
 
     #
     # Returns true if this element is visible on the page
@@ -183,7 +190,7 @@ module Watir
         assert_exists
         @element.style property
       else
-        attribute_value("style") || ''
+        attribute_value("style").to_s.strip
       end
     end
 
@@ -200,8 +207,8 @@ module Watir
     #
 
     def to_subtype
-      elem = element()
-      tag_name = elem.tag_name
+      elem = wd()
+      tag_name = elem.tag_name.downcase
 
       klass = nil
 

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

@@ -71,7 +71,7 @@ module Watir
     end
 
     def ==(other)
-      @element == other.element
+      @element == other.wd
     end
     alias_method :eql?, :==
 
@@ -82,7 +82,7 @@ module Watir
 
     protected
 
-    def element
+    def wd
       @element
     end
 

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

@@ -50,10 +50,11 @@ module Watir
 
     def matches_selector?(element, rx_selector)
       rx_selector = rx_selector.dup
+      tag_name    = element.tag_name.downcase
 
       [:value, :caption].each do |key|
         if rx_selector.has_key?(key)
-          correct_key = element.tag_name == 'button' ? :text : :value
+          correct_key = tag_name == 'button' ? :text : :value
           rx_selector[correct_key] = rx_selector.delete(key)
         end
       end
@@ -61,12 +62,12 @@ module Watir
       super
     end
 
-    def tag_name_matches?(element, _)
-      !!(/^(input|button)$/ === element.tag_name)
+    def tag_name_matches?(tag_name, _)
+      !!(/^(input|button)$/ === tag_name)
     end
 
     def validate_element(element)
-      return if element.tag_name == "input" && !Button::VALID_TYPES.include?(element.attribute(:type))
+      return if element.tag_name.downcase == "input" && !Button::VALID_TYPES.include?(element.attribute(:type))
       super
     end
 

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

@@ -16,7 +16,7 @@ module Watir
       selectors.delete(:tag_name) || raise("internal error: no tag_name?!")
 
       expressions = %w[./tr]
-      unless %w[tbody tfoot thead].include?(@wd.tag_name)
+      unless %w[tbody tfoot thead].include?(@wd.tag_name.downcase)
         expressions += %w[./tbody/tr ./thead/tr ./tfoot/tr]
       end
 

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

@@ -168,7 +168,7 @@ module Watir
       when :text
         element.text
       when :tag_name
-        element.tag_name
+        element.tag_name.downcase
       when :href
         (href = element.attribute(:href)) && href.strip
       else
@@ -239,7 +239,7 @@ module Watir
       return unless selector.empty? # multiple attributes
 
       element = @wd.find_element(:id, id)
-      return if tag_name && !tag_name_matches?(element, tag_name)
+      return if tag_name && !tag_name_matches?(element.tag_name.downcase, tag_name)
 
       element
     rescue WebDriver::Error::NoSuchElementError => wde
@@ -250,8 +250,8 @@ module Watir
       @wd.find_elements(:xpath => ".//*")
     end
 
-    def tag_name_matches?(element, tag_name)
-      tag_name === element.tag_name
+    def tag_name_matches?(element_tag_name, tag_name)
+      tag_name === element_tag_name
     end
 
     def valid_attribute?(attribute)
@@ -317,9 +317,11 @@ module Watir
 
     def validate_element(element)
       tn = @selector[:tag_name]
-      return if tn && !tag_name_matches?(element, tn)
+      element_tag_name = element.tag_name.downcase
 
-      if element.tag_name == 'input'
+      return if tn && !tag_name_matches?(element_tag_name, tn)
+
+      if element_tag_name == 'input'
         return if @selector[:type] && @selector[:type] != element.attribute(:type)
       end
 

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

@@ -46,9 +46,11 @@ module Watir
     def matches_selector?(element, rx_selector)
       rx_selector = rx_selector.dup
 
+      tag_name = element.tag_name.downcase
+
       [:text, :value, :label].each do |key|
         if rx_selector.has_key?(key)
-          correct_key = element.tag_name == 'input' ? :value : :text
+          correct_key = tag_name == 'input' ? :value : :text
           rx_selector[correct_key] = rx_selector.delete(key)
         end
       end
@@ -58,8 +60,8 @@ module Watir
 
     VALID_TEXT_FIELD_TAGS = %w[input textarea]
 
-    def tag_name_matches?(element, _)
-      VALID_TEXT_FIELD_TAGS.include?(element.tag_name)
+    def tag_name_matches?(tag_name, _)
+      VALID_TEXT_FIELD_TAGS.include?(tag_name)
     end
   end # TextFieldLocator
 end # Watir

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/watir-webdriver/xpath_support.rb

@@ -9,7 +9,7 @@ module Watir
 
     def element_by_xpath(xpath)
       e = wd.find_element(:xpath, xpath)
-      Watir.element_class_for(e.tag_name).new(self, :element => e)
+      Watir.element_class_for(e.tag_name.downcase).new(self, :element => e)
     rescue WebDriver::Error::NoSuchElementError
       Element.new(self, :xpath => xpath)
     end
@@ -20,7 +20,7 @@ module Watir
 
     def elements_by_xpath(xpath)
       wd.find_elements(:xpath, xpath).map do |e|
-        Watir.element_class_for(e.tag_name).new(self, :element => e)
+        Watir.element_class_for(e.tag_name.downcase).new(self, :element => e)
       end
     end
 

data/spec/browser_spec.rb

@@ -66,7 +66,7 @@ describe Watir::Browser do
     end
   end
 
-  bug "http://github.com/jarib/watirspec/issues/issue/8", [:webdriver, :ie], [:webdriver, :chrome] do
+  not_compliant_on [:webdriver, :chrome] do
     it "raises an error when trying to interact with a closed browser" do
       b = WatirSpec.new_browser
       b.goto(WatirSpec.files + "/definition_lists.html")
@@ -108,7 +108,7 @@ describe Watir::Browser do
   end
 
   describe "#ready_state" do
-    it "gets the documents readyState property" do
+    it "gets the document's readyState property" do
       browser.should_receive(:execute_script).with('return document.readyState')
       browser.ready_state
     end

data/spec/element_spec.rb

@@ -5,8 +5,8 @@ describe Watir::Element do
   describe "#send_keys" do
     it "sends keystrokes to the element" do
       browser.goto("file://" + File.expand_path("html/keylogger.html", File.dirname(__FILE__)))
-      browser.div(:id, 'receiver').send_keys("hello world")
-      browser.div(:id, 'output').ps.size.should == 11
+      browser.element(:id, 'receiver').send_keys("hello world")
+      browser.element(:id, 'output').ps.size.should == 11
     end
   end
 

data/spec/html/keylogger.html

@@ -9,7 +9,7 @@
     </script>
   </head>
   <body>
-     <div id="receiver" onkeypress="log(this)">Receiver</div>
+     <input type="text" id="receiver" onkeydown="log(this)">
      <div id="output"></div>
   </body>
 </html>

data/spec/implementation.rb

@@ -8,6 +8,12 @@ WatirSpec.implementation do |imp|
   imp.browser_class = Watir::Browser
   imp.browser_args  = [browser]
 
+  case browser
+  when :chromedriver
+    # assumes the chromedriver server is running on the default port
+    imp.browser_args = [:remote, {:url => "http://localhost:9515"}]
+  end
+
   imp.guard_proc = lambda { |args|
     args.any? { |arg| arg == name || arg == [name, browser] }
   }

data/watir-webdriver.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "selenium-webdriver", '>= 0.1.2'
+  s.add_dependency "selenium-webdriver", '>= 0.1.4'
 
   s.add_development_dependency "rspec", "~> 2.3.0"
   s.add_development_dependency "yard", "~> 0.6"

metadata

@@ -2,7 +2,7 @@
 name: watir-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 +01:00
+date: 2011-03-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.2
+        version: 0.1.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -138,7 +138,6 @@ files:
 - lib/watir-webdriver/extensions/alerts.rb
 - lib/watir-webdriver/extensions/nokogiri.rb
 - lib/watir-webdriver/extensions/performance.rb
-- lib/watir-webdriver/extensions/wait.rb
 - lib/watir-webdriver/html.rb
 - lib/watir-webdriver/html/generator.rb
 - lib/watir-webdriver/html/idl_sorter.rb
@@ -197,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: watir-webdriver
-rubygems_version: 1.5.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Watir on WebDriver

data/lib/watir-webdriver/extensions/wait.rb

@@ -1 +0,0 @@
-warn "wait helpers are now loaded by default, please remove require of 'watir-webdriver/extensions/wait'"