watir-webdriver 0.4.1 → 0.5.0

data/.gitignore

@@ -9,4 +9,5 @@ rdoc
 Gemfile.lock
 .rvmrc
 *.rbc
-.rbx/*
+.rbx/*
+chromedriver.log

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "spec/watirspec"]
 	path = spec/watirspec
-	url = git://github.com/jarib/watirspec.git
+	url = git://github.com/watir/watirspec.git

data/.travis.yml

@@ -10,7 +10,7 @@ before_script:
 env:
   - WATIR_WEBDRIVER_BROWSER=firefox
   - WATIR_WEBDRIVER_BROWSER=firefox ALWAYS_LOCATE=false
-  # - WATIR_WEBDRIVER_BROWSER=chrome
-  # - WATIR_WEBDRIVER_BROWSER=chrome ALWAYS_LOCATE=false
   # - WATIR_WEBDRIVER_BROWSER=firefox NATIVE_EVENTS=true
+  - WATIR_WEBDRIVER_BROWSER=chrome
+  - WATIR_WEBDRIVER_BROWSER=chrome ALWAYS_LOCATE=false
   # - WATIR_WEBDRIVER_BROWSER=chrome NATIVE_EVENTS=true

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2011 Jari Bakken
+Copyright (c) 2009-2012 Jari Bakken
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -4,7 +4,7 @@ watir-webdriver
 Watir implementation built on WebDriver's Ruby bindings.
 See http://rubyforge.org/pipermail/wtr-development/2009-October/001313.html.
 
-[![Build Status](https://secure.travis-ci.org/jarib/watir-webdriver.png)](http://travis-ci.org/jarib/watir-webdriver)
+[![Build Status](https://secure.travis-ci.org/watir/watir-webdriver.png)](http://travis-ci.org/watir/watir-webdriver)
 
 API docs
 --------
@@ -33,7 +33,7 @@ The file in lib/watir/elements/generated.rb is autogenerated from the HTML5 spec
 Specs
 -----
 
-watir-webdriver uses [watirspec](http://github.com/jarib/watirspec) for testing. After cloning, you should fetch the submodule:
+watir-webdriver uses [watirspec](http://github.com/watir/watirspec) for testing. After cloning, you should fetch the submodule:
 
     git submodule init && git submodule update
 
@@ -43,7 +43,7 @@ See also
 --------
 
 * http://github.com/jarib/webidl
-* http://github.com/jarib/watirspec/tree/watir2
+* http://github.com/watir/watirspec
 * http://selenium.googlecode.com
 
 Dependencies
@@ -65,4 +65,4 @@ Note on Patches/Pull Requests
 Copyright
 ---------
 
-Copyright (c) 2009-2011 Jari Bakken. See LICENSE for details.
+Copyright (c) 2009-2012 Jari Bakken. See LICENSE for details.

data/Rakefile

@@ -1,3 +1,5 @@
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+
 require 'rubygems'
 require 'bundler'
 Bundler::GemHelper.install_tasks
@@ -19,10 +21,6 @@ end
 
 task :default => :spec
 
-task :lib do
-  $LOAD_PATH.unshift(File.expand_path("lib", File.dirname(__FILE__)))
-end
-
 namespace :html5 do
   SPEC_URI  = "http://www.whatwg.org/specs/web-apps/current-work/"
   SPEC_PATH = "support/html5.html"
@@ -86,17 +84,11 @@ namespace :html5 do
   task :update => [:download, :generate, :overwrite]
 end # html5
 
-begin
-  require 'yard'
-  Rake::Task[:lib].invoke
-  require "yard/handlers/watir"
-  YARD::Rake::YardocTask.new do |task|
-    task.options = %w[--debug] # this is pretty slow, so nice with some output
-  end
-rescue LoadError
-  task :yard do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
+
+require 'yard'
+require "yard/handlers/watir"
+YARD::Rake::YardocTask.new do |task|
+  task.options = %w[--debug] # this is pretty slow, so nice with some output
 end
 
 load "spec/watirspec/watirspec.rake" if File.exist?("spec/watirspec/watirspec.rake")

data/lib/watir-webdriver.rb

@@ -57,26 +57,31 @@ end
 require 'watir-webdriver/attribute_helper'
 require 'watir-webdriver/row_container'
 require 'watir-webdriver/cell_container'
+require 'watir-webdriver/user_editable'
 require 'watir-webdriver/element_collection'
 require 'watir-webdriver/elements/element'
 require 'watir-webdriver/elements/generated'
-require 'watir-webdriver/elements/frame'
-require 'watir-webdriver/elements/input'
+
 require 'watir-webdriver/elements/button'
 require 'watir-webdriver/elements/checkbox'
 require 'watir-webdriver/elements/file_field'
+require 'watir-webdriver/elements/font'
+require 'watir-webdriver/elements/form'
+require 'watir-webdriver/elements/frame'
+require 'watir-webdriver/elements/hidden'
 require 'watir-webdriver/elements/image'
+require 'watir-webdriver/elements/input'
 require 'watir-webdriver/elements/link'
-require 'watir-webdriver/elements/font'
+require 'watir-webdriver/elements/option'
 require 'watir-webdriver/elements/radio'
-require 'watir-webdriver/elements/text_field'
-require 'watir-webdriver/elements/hidden'
 require 'watir-webdriver/elements/select'
-require 'watir-webdriver/elements/form'
-require 'watir-webdriver/elements/option'
 require 'watir-webdriver/elements/table'
-require 'watir-webdriver/elements/table_row'
 require 'watir-webdriver/elements/table_cell'
+require 'watir-webdriver/elements/table_row'
 require 'watir-webdriver/elements/table_section'
+require 'watir-webdriver/elements/text_area'
+require 'watir-webdriver/elements/text_field'
+
+require 'watir-webdriver/aliases'
 
 Watir.tag_to_class.freeze

data/lib/watir-webdriver/aliases.rb

@@ -0,0 +1,6 @@
+module Watir
+  module Container
+    alias_method :field_set, :fieldset
+    alias_method :field_sets, :fieldsets
+  end
+end

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

@@ -70,35 +70,128 @@ module Watir
       @element.tag_name.downcase
     end
 
-    def click
+    #
+    # Clicks the element, optionally while pressing the given mofifier keys.
+    # Note that support for holding a modifier key is currently experimental,
+    # and may not work at all.
+    #
+    # @example Click an element
+    #
+    #   element.click
+    #
+    # @example Click an element with shift key pressed
+    #
+    #   element.click(:shift)
+    #
+    # @example Click an element with several modifier keys pressed
+    #
+    #   element.click(:shift, :control)
+    #
+    # @param [:shift, :alt, :control, :command, :meta] Modifier key(s) to press while clicking.
+    #
+
+    def click(*modifiers)
       assert_exists
       assert_enabled
-      @element.click
+
+      if modifiers.any?
+        assert_has_input_devices_for "click(#{modifiers.join ', '})"
+
+        action = driver.action
+        modifiers.each { |mod| action.key_down mod }
+        action.click @element
+        modifiers.each { |mod| action.key_up mod }
+
+        action.perform
+      else
+        @element.click
+      end
+
       run_checkers
     end
 
+    #
+    # Double clicks the element.
+    #
+    # Note that browser support may vary.
+    #
+
+
     def double_click
       assert_exists
-
-      unless driver.kind_of? WebDriver::DriverExtensions::HasInputDevices
-        raise NotImplementedError, "Element#double_click is not supported by this driver"
-      end
+      assert_has_input_devices_for :double_click
 
       driver.action.double_click(@element).perform
       run_checkers
     end
 
+    #
+    # Right clicks the element.
+    #
+    # Note that browser support may vary.
+    #
+
     def right_click
       assert_exists
-
-      unless driver.kind_of? WebDriver::DriverExtensions::HasInputDevices
-        raise NotImplementedError, "Element#context_click is not supported by this driver"
-      end
+      assert_has_input_devices_for :right_click
 
       driver.action.context_click(@element).perform
       run_checkers
     end
 
+    #
+    # Moves the mouse to the middle of this element.
+    #
+    # Note that browser/platform support may vary.
+    #
+
+    def hover
+      assert_exists
+      assert_has_input_devices_for :hover
+
+      driver.action.move_to(@element).perform
+    end
+
+    #
+    # Drag and drop this element on to another element instance.
+    #
+    # Example:
+    #
+    #    a = browser.div(:id => "draggable")
+    #    b = browser.div(:id => "droppable")
+    #
+    #    a.drag_and_drop_on b
+    #
+
+    def drag_and_drop_on(other)
+      assert_is_element other
+      assert_exists
+      assert_has_input_devices_for :drag_and_drop_on
+
+      driver.action.
+             drag_and_drop(@element, other.wd).
+             perform
+    end
+
+    #
+    # Drag and drop this element by the given offsets.
+    #
+    # Example:
+    #
+    #    a = browser.div(:id => "draggable")
+    #
+    #    a.drag_and_drop_by 100, -200
+    #
+
+    def drag_and_drop_by(right_by, down_by)
+      assert_exists
+      assert_has_input_devices_for :drag_and_drop_by
+
+      driver.action.
+             drag_and_drop_by(@element, right_by, down_by).
+             perform
+    end
+
     def flash
       original_color = style("backgroundColor")
 
@@ -144,6 +237,11 @@ module Watir
       driver.execute_script "return arguments[0].focus()", @element
     end
 
+    def focused?
+      assert_exists
+      @element == driver.switch_to.active_element
+    end
+
     def fire_event(event_name)
       assert_exists
       event_name = event_name.to_s.sub(/^on/, '').downcase
@@ -309,6 +407,18 @@ module Watir
       raise ObjectReadOnlyException if respond_to?(:readonly?) && readonly?
     end
 
+    def assert_has_input_devices_for(name)
+      unless driver.kind_of? WebDriver::DriverExtensions::HasInputDevices
+        raise NotImplementedError, "#{self.class}##{name} is not supported by this driver"
+      end
+    end
+
+    def assert_is_element(obj)
+      unless obj.kind_of? Watir::Element
+        raise TypeError, "execpted Watir::Element, got #{obj.inspect}:#{obj.class}"
+      end
+    end
+
     def method_missing(meth, *args, &blk)
       method = meth.to_s
       if method =~ /^data_(.+)$/

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

@@ -49,18 +49,6 @@ module Watir
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -538,6 +526,14 @@ module Watir
      Span
    end
  end
+ class Time < HTMLElement
+   attributes(:string => [:datetime])
+ end
+ class TimeCollection < ElementCollection
+   def element_class
+     Time
+   end
+ end
  class Data < HTMLElement
    attributes(:string => [:value])
  end
@@ -1422,6 +1418,23 @@ module Watir
 
    Watir.tag_to_class[:form] = Form
    #
+   # @return [FrameSet]
+   #
+
+   def frameset(*args)
+     FrameSet.new(self, extract_selector(args).merge(:tag_name => "frameset"))
+   end
+
+   #
+   # @return [FrameSetCollection]
+   #
+
+   def framesets(*args)
+     FrameSetCollection.new(self, extract_selector(args).merge(:tag_name => "frameset"))
+   end
+
+   Watir.tag_to_class[:frameset] = FrameSet
+   #
    # @return [Heading]
    #
 
@@ -2459,6 +2472,23 @@ module Watir
 
    Watir.tag_to_class[:thead] = TableSection
    #
+   # @return [Time]
+   #
+
+   def time(*args)
+     Time.new(self, extract_selector(args).merge(:tag_name => "time"))
+   end
+
+   #
+   # @return [TimeCollection]
+   #
+
+   def times(*args)
+     TimeCollection.new(self, extract_selector(args).merge(:tag_name => "time"))
+   end
+
+   Watir.tag_to_class[:time] = Time
+   #
    # @return [Title]
    #
 

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

@@ -2,7 +2,14 @@
 module Watir
   class Image < HTMLElement
 
-    alias_method :loaded?, :complete?
+    def loaded?
+      return false unless complete?
+
+      driver.execute_script(
+        'return typeof arguments[0].naturalWidth != "undefined" && arguments[0].naturalWidth > 0',
+        @element
+      )
+    end
 
     #
     # returns the image's width in pixels

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

@@ -25,6 +25,10 @@ module Watir
       @element.click
     end
 
+    def clear
+      @element.click if selected?
+    end
+
     #
     # Is this option selected?
     #

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

@@ -111,12 +111,12 @@ module Watir
 
 
     #
-    # @return [Array<String>] An array of strings representing the text value of the currently selected options.
+    # @return [Array<Watir::Option>] An array of Watir::Option elements that are currently selected.
     #
 
     def selected_options
       assert_exists
-      options.map { |e| e.text if e.selected? }.compact
+      options.select { |e| e.selected? }
     end
 
     private