operawatir 0.7.pre1-jruby → 0.7.pre2-jruby

data/VERSION

@@ -1 +1 @@
-0.7.pre1
+0.7.pre2

data/lib/operawatir.rb

@@ -5,8 +5,8 @@ require 'java'
 include Java
 
 %w(commons-jxpath-1.3.jar commons-exec-1.1.jar protobuf-java-2.4.1.jar
-    selenium-java-2.17.jar operalaunchers-0.6.jar operadriver-v0.11.jar
-    guava-11.0.1.jar ini4j-0.5.2.jar json-20080701.jar).each { |jar| require "operadriver/#{jar}" }
+    selenium-java-2.21.0.jar operalaunchers-0.7.jar operadriver-v0.12.jar
+    guava-12.0.jar ini4j-0.5.2.jar json-20080701.jar).each { |jar| require "operadriver/#{jar}" }
 
 include_class org.openqa.selenium.WebDriver
 include_class org.openqa.selenium.remote.RemoteWebElement

data/lib/operawatir/actions.rb

@@ -88,7 +88,7 @@ class OperaWatir::Actions
   end
 
   def drag_and_drop_by(source, x_offset, y_offset)
-    @actions.dragAndDrop(source, x_offset, y_offset)
+    @actions.dragAndDrop(source.node, x_offset.to_i, y_offset.to_i)
     self
   end
 

data/lib/operawatir/compat/collection.rb

@@ -102,7 +102,7 @@ class OperaWatir::Collection
 =end
 
   def select(option_text)
-    option(:text => option_text).node.setSelected
+    option(:text => option_text).node.click
   end
 
   def selected?(option_text)

data/lib/operawatir/compat/element.rb

@@ -66,21 +66,21 @@ class OperaWatir::Element
   alias_method :caption, :text
 
   #
-  # Clicks on the top left of the element, or the given x, y offset.
-  # Asserts whether element is enabled first.
+  # Clicks the element with an offset of x, y.
   #
-  # @param [optional, Fixnum] x The offset from the left of the
+  # @param [Optional, Fixnum] x The offset from the left of the
   #   element
-  # @param [optional, Fixnum] y The offset from the top of the element
+  # @param [Optional, Fixnum] y The offset from the top of the element
   #
 
-  def click(x=1, y=1)
-    assert_enabled!
-    node.click(x.to_i, y.to_i)
+  def click(x=nil, y=nil)
+    if x and i
+      @browser.actions.move_to_element(self, x.to_i, y.to_i).click.perform
+    else
+      node.click
+    end
   end
 
-  alias_method :click_no_wait, :click_async
-
   #
   # Focuses the element
   #

data/lib/operawatir/element.rb

@@ -3,8 +3,8 @@ class OperaWatir::Element
 
   attr_reader :node
 
-  def initialize(node)
-    @node = node
+  def initialize(node, browser)
+    @node, @browser = node, browser
   end
 
   # TODO Need support for this in Webdriver
@@ -61,7 +61,7 @@ class OperaWatir::Element
   def_delegator :node, :isEnabled, :enabled?
   def_delegator :node, :isSelected, :checked?
 
-  def_delegator :node, :setSelected, :select
+  def_delegator :node, :click, :select
 
   def_delegator :node, :isSelected, :selected?
 
@@ -123,48 +123,34 @@ class OperaWatir::Element
 
   # Events
 
-  #
-  # Clicks on the top left of the element, or the given x,y offset
-  # relative to the element.
-  #
-  # @param [Integer] x The offset from the top left of the element.
-  # @param [Integer] y The offset from the top of the element.
-  #
+  def_delegator :node, :click, :click
 
-  def click(x=1, y=1)
-    node.click(x.to_i, y.to_i)
-  end
-
-  def click_async
-    node.click 1
+  def click_no_wait
+    click
   end
 
   def double_click
-    node.click 2
+    @browser.actions.move_to_element(self).double_click.perform
   end
 
   def triple_click
-    node.click 3
+    3.times { click }
   end
 
   def quadruple_click
-    node.click 4
+    4.times { click }
   end
 
   def right_click
-    node.rightClick
-  end
-
-  def middle_click
-    node.middleClick
+    @browser.actions.move_to_element(self).context_click.perform
   end
 
   def drag_and_drop_on(other)
-    node.dragAndDropOn other.node
+    @browser.actions.drag_and_drop(self, other)
   end
 
   def drag_and_drop_by(x, y)
-    node.dragAndDropBy(x.to_i, y.to_i)
+    @browser.actions.drag_and_drop_by(self, x, y)
   end
 
   def_delegator :node, :submit, :submit!
@@ -242,37 +228,37 @@ private
 
   def find_elements_by_id(value)
     node.findElementsById(value).to_a.map do |n|
-      OperaWatir::Element.new(n)
+      OperaWatir::Element.new(n, @browser)
     end
   end
 
   def find_elements_by_class_name(value)
     node.findElementsByClassName(value).to_a.map do |n|
-      OperaWatir::Element.new(n)
+      OperaWatir::Element.new(n, @browser)
     end
   end
 
   def find_elements_by_tag_name(value)
     node.findElementsByTagName(value).to_a.map do |n|
-      OperaWatir::Element.new(n)
+      OperaWatir::Element.new(n, @browser)
     end
   end
 
   def find_elements_by_css(value)
     node.findElementsByCssSelector(value).to_a.map do |n|
-      OperaWatir::Element.new(n)
+      OperaWatir::Element.new(n, @browser)
     end
   end
 
   def find_elements_by_xpath(value)
     node.findElementsByXPath(value).to_a.map do |n|
-      OperaWatir::Element.new(n)
+      OperaWatir::Element.new(n, @browser)
     end
   end
 
   def find_elements_by_name(value)
     node.findElementsByName(value).to_a.map do |n|
-      OperaWatir::Element.new(n)
+      OperaWatir::Element.new(n, @browser)
     end
   end
 

data/lib/operawatir/window.rb

@@ -192,37 +192,37 @@ private
 
   def find_elements_by_id(value)
     driver.findElementsById(value).to_a.map do |node|
-      OperaWatir::Element.new(node)
+      OperaWatir::Element.new(node, @browser)
     end
   end
 
   def find_elements_by_class_name(value)
     driver.findElementsByClassName(value).to_a.map do |node|
-      OperaWatir::Element.new(node)
+      OperaWatir::Element.new(node, @browser)
     end
   end
 
   def find_elements_by_tag_name(value)
     driver.findElementsByTagName(value).to_a.map do |node|
-      OperaWatir::Element.new(node)
+      OperaWatir::Element.new(node, @browser)
     end
   end
 
   def find_elements_by_css(value)
     driver.findElementsByCssSelector(value).to_a.map do |node|
-      OperaWatir::Element.new(node)
+      OperaWatir::Element.new(node, @browser)
     end
   end
 
   def find_elements_by_xpath(value)
     driver.findElementsByXPath(value).to_a.map do |node|
-      OperaWatir::Element.new(node)
+      OperaWatir::Element.new(node, @browser)
     end
   end
 
   def find_elements_by_name(value)
     driver.findElementsByName(value).to_a.map do |node|
-      OperaWatir::Element.new(node)
+      OperaWatir::Element.new(node, @browser)
     end
   end
 

data/spec/operawatir/core/actions_spec.rb

@@ -147,10 +147,11 @@ describe OperaWatir::Actions do
       window.text.should include 'click 0'
     end
 
-    it 'cannot move to a nil element' do
+    # last known mouse position
+    it 'can move to a nil element' do
       browser.url = fixture('mouse.html')
 
-      lambda { @actions.click().perform() }.should raise_error
+      lambda { @actions.click().perform() }.should_not raise_error
     end
 
     it 'moves by an offset' do

metadata

@@ -2,7 +2,7 @@
 name: operawatir
 version: !ruby/object:Gem::Version 
   prerelease: 4
-  version: 0.7.pre1
+  version: 0.7.pre2
 platform: jruby
 authors: 
   - Andreas Tolf Tolfsen
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 Z
+date: 2012-05-07 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: bundler
@@ -287,14 +287,14 @@ files:
   - lib/operadriver/NEW_BSD_LICENSE.txt
   - lib/operadriver/commons-exec-1.1.jar
   - lib/operadriver/commons-jxpath-1.3.jar
-  - lib/operadriver/guava-11.0.1.jar
+  - lib/operadriver/guava-12.0.jar
   - lib/operadriver/ini4j-0.5.2.jar
   - lib/operadriver/json-20080701.jar
-  - lib/operadriver/operadriver-v0.11.jar
+  - lib/operadriver/operadriver-v0.12.jar
   - lib/operadriver/operadriver-v0.8.1.jar
-  - lib/operadriver/operalaunchers-0.6.jar
+  - lib/operadriver/operalaunchers-0.7.jar
   - lib/operadriver/protobuf-java-2.4.1.jar
-  - lib/operadriver/selenium-java-2.17.jar
+  - lib/operadriver/selenium-java-2.21.0.jar
   - lib/operawatir.rb
   - lib/operawatir/actions.rb
   - lib/operawatir/browser.rb