watir-webdriver 0.4.1 → 0.5.0

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

@@ -0,0 +1,5 @@
+module Watir
+  class TextArea < HTMLElement
+    include UserEditable
+  end
+end

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

@@ -1,48 +1,15 @@
 # encoding: utf-8
 module Watir
   class TextField < Input
+    include UserEditable
 
     attributes Watir::TextArea.typed_attributes
     remove_method :type # we want Input#type here, which was overriden by TextArea's attributes
 
-    #
-    # Clear the element, the type in the given value.
-    #
-
-    def set(*args)
-      assert_exists
-      assert_writable
-
-      @element.clear
-      @element.send_keys(*args)
-    end
-    alias_method :value=, :set
-
-    #
-    # Append the given value to the text in the text field.
-    #
-
-    def append(*args)
-      assert_exists
-      assert_writable
-
-      @element.send_keys(*args)
-    end
-
-    #
-    # Clear the text field.
-    #
-
-    def clear
-      assert_exists
-      @element.clear
-    end
-
     private
 
-    def locate
-      @parent.assert_exists
-      TextFieldLocator.new(@parent.wd, @selector, self.class.attribute_list).locate
+    def locator_class
+      TextFieldLocator
     end
 
     def selector_string

data/lib/watir-webdriver/html/spec_extractor.rb

@@ -70,9 +70,12 @@ module Watir
         result = {}
 
         @interface_map.each do |tag, interface|
-          result[tag] = @interfaces_by_name[interface] or raise "#{interface} not found in IDL"
+          result[tag] = fetch_interface(interface)
         end
 
+        # missing from the elements-1 table
+        result['frameset'] = fetch_interface('HTMLFrameSetElement')
+
         result
       end
 
@@ -90,6 +93,10 @@ module Watir
         end
       end
 
+      def fetch_interface(interface)
+        @interfaces_by_name[interface] or raise "#{interface} not found in IDL"
+      end
+
       def parse_idl(str)
         result = idl_parser.parse(str)
 

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

@@ -197,7 +197,7 @@ module Watir
 
     def normalize_selector(how, what)
       case how
-      when :tag_name, :text, :xpath, :index, :class, :for, :label
+      when :tag_name, :text, :xpath, :index, :class, :label
         # include :class since the valid attribute is 'class_name'
         # include :for since the valid attribute is 'html_for'
         [how, what]
@@ -205,6 +205,9 @@ module Watir
         [:class, what]
       when :caption
         [:text, what]
+      when :for
+        assert_valid_as_attribute :html_for
+        [how, what]
       else
         assert_valid_as_attribute how
         [how, what]
@@ -295,8 +298,11 @@ module Watir
     end
 
     def equal_pair(key, value)
-      # we assume :label means a corresponding label element, not the attribute
-      if key == :label && should_use_label_element?
+      if key == :class
+        klass = XpathSupport.escape " #{value} "
+        "contains(concat(' ', @class, ' '), #{klass})"
+      elsif key == :label && should_use_label_element?
+        # we assume :label means a corresponding label element, not the attribute
         "@id=//label[normalize-space()=#{XpathSupport.escape value}]/@for"
       else
         "#{lhs_for(key)}=#{XpathSupport.escape value}"

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

@@ -63,5 +63,10 @@ module Watir
     def tag_name_matches?(tag_name, _)
       VALID_TEXT_FIELD_TAGS.include?(tag_name)
     end
+
+    def by_id
+      el = super
+      el if el and not NON_TEXT_TYPES.include? el.attribute(:type)
+    end
   end # TextFieldLocator
 end # Watir

data/lib/watir-webdriver/user_editable.rb

@@ -0,0 +1,37 @@
+module Watir
+  module UserEditable
+    #
+    # Clear the element, the type in the given value.
+    #
+
+    def set(*args)
+      assert_exists
+      assert_writable
+
+      @element.clear
+      @element.send_keys(*args)
+    end
+    alias_method :value=, :set
+
+    #
+    # Append the given value to the text in the text field.
+    #
+
+    def append(*args)
+      assert_exists
+      assert_writable
+
+      @element.send_keys(*args)
+    end
+    alias_method :<<, :append
+
+    #
+    # Clear the text field.
+    #
+
+    def clear
+      assert_exists
+      @element.clear
+    end
+  end
+end

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/watir-webdriver/wait.rb

@@ -72,6 +72,10 @@ module Watir
       @message = message
     end
 
+    def respond_to?(*args)
+      @element.respond_to?(*args)
+    end
+
     def method_missing(m, *args, &block)
       unless @element.respond_to?(m)
         raise NoMethodError, "undefined method `#{m}' for #{@element.inspect}:#{@element.class}"

data/lib/yard/handlers/watir.rb

@@ -1,12 +1,10 @@
-require "watir-webdriver/core_ext/string"
-
 module YARD
   module Handlers
     module Watir
       #
       # @private
-      # 
-      
+      #
+
       class AttributesHandler < YARD::Handlers::Ruby::Base
         handles method_call(:attributes)
 

data/spec/click_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path('../watirspec/spec_helper', __FILE__)
+
+describe Watir::Element do
+  describe "#click" do
+    before {
+      browser.goto('file://' + File.expand_path('../html/clicks.html', __FILE__))
+    }
+
+    let(:clicker) { browser.element(:id => "click-logger") }
+    let(:log)     { browser.element(:id => "log").ps.map { |e| e.text } }
+
+    # TODO: make guards more flexible, in reality this currently only works on linux with native events
+    compliant_on [:webdriver, :firefox, :native_events] do 
+      it "should perform a click with no modifier keys" do
+        clicker.click
+        log.should == ["shift=false alt=false"]
+      end
+
+      it "should perform a click with the shift key pressed" do
+        clicker.click(:shift)
+        log.should == ["shift=true alt=false"]
+      end
+
+      it "should perform a click with the alt key pressed" do
+        clicker.click(:alt)
+        log.should == ["shift=false alt=true"]
+      end
+
+      it "should perform a click with the shift and alt keys pressed" do
+        clicker.click(:shift, :alt)
+        log.should == ["shift=true alt=true"]
+      end
+    end
+
+  end
+end

data/spec/element_locator_spec.rb

@@ -15,10 +15,10 @@ describe Watir::ElementLocator do
 
     describe "with selectors not supported by webdriver" do
       it "handles selector with tag name and a single attribute" do
-        expect_one :xpath, ".//div[@class='foo']"
+        expect_one :xpath, ".//div[@title='foo']"
 
         locate_one :tag_name => "div",
-                   :class    => "foo"
+                   :title    => "foo"
       end
 
       it "handles selector with no tag name and and a single attribute" do
@@ -32,17 +32,17 @@ describe Watir::ElementLocator do
       end
 
       it "handles selector with tag name and multiple attributes" do
-        expect_one :xpath, ".//div[@class='foo' and @title='bar']"
+        expect_one :xpath, ".//div[@title='foo' and @dir='bar']"
 
         locate_one [:tag_name, "div",
-                    :class   , "foo",
-                    :title   , 'bar']
+                    :title   , "foo",
+                    :dir     , 'bar']
       end
 
       it "handles selector with no tag name and multiple attributes" do
-        expect_one :xpath, ".//*[@class='foo' and @title='bar']"
+        expect_one :xpath, ".//*[@dir='foo' and @title='bar']"
 
-        locate_one [:class, "foo",
+        locate_one [:dir,   "foo",
                     :title, "bar"]
       end
     end
@@ -63,7 +63,7 @@ describe Watir::ElementLocator do
       end
 
       it "translates :class_name to :class" do
-        expect_one :xpath, ".//div[@class='foo']"
+        expect_one :xpath, ".//div[contains(concat(' ', @class, ' '), ' foo ')]"
 
         locate_one :tag_name   => "div",
                    :class_name => "foo"
@@ -150,15 +150,15 @@ describe Watir::ElementLocator do
 
       it "handles mix of string and regexp attributes" do
         elements = [
-          element(:tag_name => "div", :attributes => { :class => "foo", :title => "bar" }),
-          element(:tag_name => "div", :attributes => { :class => "foo", :title => "baz" })
+          element(:tag_name => "div", :attributes => { :dir => "foo", :title => "bar" }),
+          element(:tag_name => "div", :attributes => { :dir => "foo", :title => "baz" })
         ]
 
-        expect_all(:xpath, ".//div[@class='foo']").and_return(elements)
+        expect_all(:xpath, ".//div[@dir='foo']").and_return(elements)
 
         selector = {
           :tag_name => "div",
-          :class    => "foo",
+          :dir      => "foo",
           :title    => /baz/
         }
 
@@ -192,11 +192,11 @@ describe Watir::ElementLocator do
         element(:tag_name => "div")
       ]
 
-      expect_all(:xpath, ".//div[@class='foo']").and_return(elements)
+      expect_all(:xpath, ".//div[@dir='foo']").and_return(elements)
 
       selector = {
         :tag_name => "div",
-        :class    => "foo",
+        :dir      => "foo",
         :index    => 1
       }
 
@@ -250,17 +250,17 @@ describe Watir::ElementLocator do
 
     describe "with selectors not supported by webdriver" do
       it "handles selector with tag name and a single attribute" do
-        expect_all :xpath, ".//div[@class='foo']"
+        expect_all :xpath, ".//div[@dir='foo']"
 
         locate_all :tag_name => "div",
-                   :class    => "foo"
+                   :dir      => "foo"
       end
 
       it "handles selector with tag name and multiple attributes" do
-        expect_all :xpath, ".//div[@class='foo' and @title='bar']"
+        expect_all :xpath, ".//div[@dir='foo' and @title='bar']"
 
         locate_all [:tag_name, "div",
-                    :class   , "foo",
+                    :dir     , "foo",
                     :title   , 'bar']
       end
     end
@@ -280,16 +280,16 @@ describe Watir::ElementLocator do
 
       it "handles mix of string and regexp attributes" do
         elements = [
-          element(:tag_name => "div", :attributes => { :class => "foo", :title => "bar" }),
-          element(:tag_name => "div", :attributes => { :class => "foo", :title => "baz" }),
-          element(:tag_name => "div", :attributes => { :class => "foo", :title => "bazt"})
+          element(:tag_name => "div", :attributes => { :dir => "foo", :title => "bar" }),
+          element(:tag_name => "div", :attributes => { :dir => "foo", :title => "baz" }),
+          element(:tag_name => "div", :attributes => { :dir => "foo", :title => "bazt"})
         ]
 
-        expect_all(:xpath, ".//div[@class='foo']").and_return(elements)
+        expect_all(:xpath, ".//div[@dir='foo']").and_return(elements)
 
         selector = {
           :tag_name => "div",
-          :class    => "foo",
+          :dir      => "foo",
           :title    => /baz/
         }
 

data/spec/element_spec.rb

@@ -32,7 +32,7 @@ describe Watir::Element do
 
   describe "#exists?" do
     it "should not propagate ObsoleteElementErrors" do
-      browser.goto 'file://' + File.expand_path('html/removed_element.html', File.dirname(__FILE__))
+      browser.goto 'file://' + File.expand_path('../html/removed_element.html', __FILE__)
 
       button  = browser.button(:id => "remove-button")
       element = browser.div(:id => "text")
@@ -43,4 +43,17 @@ describe Watir::Element do
     end
   end
 
+  describe "#hover" do
+    not_compliant_on [:webdriver, :firefox, :synthesized_events], [:webdriver, :ie] do
+      it "should hover over the element" do
+        browser.goto 'file://' + File.expand_path('../html/hover.html', __FILE__)
+        link = browser.a
+
+        link.style("font-size").should == "10px"
+        link.hover
+        link.style("font-size").should == "20px"
+      end
+    end
+  end
+
 end

data/spec/html/clicks.html

@@ -0,0 +1,16 @@
+<html>
+  <head>
+    <script src="../watirspec/html/javascript/jquery-1.7.1.min.js" type="text/javascript" charset="utf-8"></script>
+  </head>
+  <script>
+  $(document).ready(function() {
+    $("#click-logger").click(function(evt) {
+      $("#log").append("<p>shift=" + evt.shiftKey + " alt=" + evt.altKey + "</p>");
+    });
+  });
+  </script>
+  <body>
+    <div id="click-logger">click me</div>
+    <div id="log"></div>
+  </body>
+</html>

data/spec/html/hover.html

@@ -0,0 +1,12 @@
+<html>
+  <head>
+  <style type="text/css" media="screen">
+    a { font-size: 10px; }
+    a:hover { font-size: 20px; }
+  </style>
+  </head>
+
+  <body>
+    <a href="#">hello</a>
+  </body>
+</html>

data/spec/implementation.rb

@@ -1,27 +1,93 @@
 require File.expand_path("../spec_helper", __FILE__)
 
-WatirSpec.implementation do |imp|
-  name    = :webdriver
-  browser = (ENV['WATIR_WEBDRIVER_BROWSER'] || :firefox).to_sym
+class ImplementationConfig
+  def initialize(imp)
+    @imp = imp
+  end
+
+  def configure
+    set_webdriver
+    set_browser_args
+    set_guard_proc
+  end
+
+  private
+
+  def set_webdriver
+    @imp.name          = :webdriver
+    @imp.browser_class = Watir::Browser
+  end
 
-  imp.name          = name
-  imp.browser_class = Watir::Browser
+  def set_browser_args
+    case browser
+    when :firefox
+      set_firefox_args
+    when :chrome
+      set_chrome_args
+    else
+      @imp.browser_args = [browser]
+    end
+  end
+
+  def set_guard_proc
+    matching_guards = [
+      :webdriver,            # guard only applies to webdriver
+      browser,               # guard only applies to this browser
+      [:webdriver, browser]  # guard only applies to this browser on webdriver
+    ]
+
+    if native_events? || native_events_by_default?
+      # guard only applies to this browser on webdriver with native events enabled
+      matching_guards << [:webdriver, browser, :native_events]
+    else
+      # guard only applies to this browser on webdriver with native events disabled
+      matching_guards << [:webdriver, browser, :synthesized_events]
+    end
+
+    @imp.guard_proc = lambda { |args|
+      args.any? { |arg| matching_guards.include?(arg) }
+    }
+  end
 
-  if browser == :firefox && ENV['NATIVE_EVENTS'] == "true"
+  def set_firefox_args
     profile = Selenium::WebDriver::Firefox::Profile.new
-    profile.native_events = true
+    profile.native_events = native_events?
 
-    imp.browser_args = [:firefox, {:profile => profile}]
-  elsif browser == :chrome && ENV['NATIVE_EVENTS'] == "true"
-    imp.browser_args = [:chrome, {:native_events => true}]
-  else
-    imp.browser_args = [browser]
+    @imp.browser_args = [:firefox, {:profile => profile}]
   end
 
-  imp.guard_proc = lambda { |args|
-    args.any? { |arg| arg == name || arg == browser || arg == [name, browser]}
-  }
-end
+  def set_chrome_args
+    opts = {
+      :switches      => ["--disable-translate"],
+      :native_events => native_events?
+    }
+
+    if url = ENV['WATIR_WEBDRIVER_CHROME_SERVER']
+      opts[:url] = url
+    end
+
+    if driver = ENV['WATIR_WEBDRIVER_CHROME_DRIVER']
+      Selenium::WebDriver::Chrome.driver_path = driver
+    end
 
+    if path = ENV['WATIR_WEBDRIVER_CHROME_BINARY']
+      Selenium::WebDriver::Chrome.path = path
+    end
 
+    @imp.browser_args = [:chrome, opts]
+  end
+
+  def browser
+    @browser ||= (ENV['WATIR_WEBDRIVER_BROWSER'] || :firefox).to_sym
+  end
+
+  def native_events?
+    ENV['NATIVE_EVENTS'] == "true"
+  end
+
+  def native_events_by_default?
+    Selenium::WebDriver::Platform.windows? && [:firefox, :ie].include?(browser)
+  end
+end
 
+ImplementationConfig.new(WatirSpec.implementation).configure