operawatir 0.4.3.pre1-jruby → 0.5-jruby

data/.gitmodules

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

data/CHANGES

@@ -1,3 +1,233 @@
+v0.5         2011-09-12
+
+  [OTHER]
+
+  * Pushed final version 0.5.  (andreastt)
+
+v0.5.pre3    2011-09-09
+
+  [BUG FIXES]
+
+  * Calling #to_s on opts, fixes `desktopwatir --help`.  (andreastt)
+
+  * Removing redundant -autotestmode argument sent by
+    OperaWatir::DesktopBrowser.  (andreastt)
+
+  [OTHER]
+
+  * Upgraded to OperaDriver v0.7.2.  This will fix issues with getting location
+    of elements in SVG documents, among other fixes.  (andreastt)
+
+  * Upgraded to latest head of selenium-client-nodeps.  (andreatt)
+
+v0.5.pre2    2011-09-06
+
+  [NEW FEATURES]
+
+  * Added browser utility service as Browser#utils, implementing the following
+    new method calls:
+
+      Utils#core_version, returning the core version
+      Utils#os, returning the browser's OS
+      Utils#product, returning product type (desktop/core/mobile)
+      Utils#binary_path, returning full path to Opera binary
+      Utils#user_agent, returning User-Agent string
+      Utils#pid, returning the browser's PID if available
+
+    (andreastt)
+
+  * Implementing ability to enable verbose logging in operawatir.  Added
+    following new command-line switches to the operawatir binary:
+
+      --debug=LEVEL (or -d for short), for specifying logging level
+      --log=FILE, for specifying sending the logging to a file
+
+    Available logging levels are: SEVERE (highest), WARNING, INFO, CONFIG,
+    FINE, FINER, FINEST (lowest), ALL.  Default is INFO.  See `operawatir
+    --help` for more information.
+
+    (andreastt)
+
+  [ENHANCEMENTS]
+
+  * Now using DesiredCapabilities from OperaDriver v0.7 instead of
+    OperaDriverSettings.  (andreastt)
+
+  [BUG FIXES]
+
+  * initMouseEvent in Element#fire_event is now clicking clientX and clientY
+    instead of relying on internal driver locators.  (andreastt)
+
+  * Compat::Window#show_frames now returns a string instead of writing to
+    STDOUT.  (andreastt)
+
+  * Browser#quit was calling OperaDriver.shutdown() which is now deprecated.
+    Fixed by now calling OperaDriver.quit() instead.  (andreastt)
+
+  * `operawatir --help` was broken, fixed by converting OptionParse object to a
+    String.  (andreastt)
+
+  [OTHER]
+
+  * Upgraded to OperaDriver v0.7.1.  (andreastt)
+
+  * Added tests for new Utils interface.  (andreastt)
+
+v0.5.pre1    2011-08-31
+
+  [API CHANGES]
+
+  * Implemented advanced user interaction API in Watir by adding a new Actions
+    class.  This is accessible through Browser#actions.  (stuartk)
+
+  * Removed Browser#close_all since this is no longer supported in WebDriver.
+    The alternative approach is to get all windows, then cycle through them to
+    close them.  (andreastt)
+
+  * Added following method calls related to performing context menu clicks:
+
+      DesktopBrowser#action_with_condition
+      DesktopBrowser#active_quick_window_id
+      DesktopBrowser#close_active_menu
+      DesktopBrowser#close_all_menus
+      DesktopBrowser#close_menu
+      DesktopBrowser#close_menu_with_key_press
+      DesktopBrowser#key_press_with_condition
+      DesktopBrowser#open_menu_with_key_press
+      DesktopBrowser#open_menu_with_rightclick
+      DesktopBrowser#quick_menuitems
+      DesktopBrowser#quick_menus
+      DesktopBrowser#quick_tabs
+      DesktopBrowser::ConditionTimeout
+      DesktopContainer#quick_dropdownitem
+      DesktopContainer#quick_menu
+      DesktopContainer#quick_menuitem
+      QuickMenu (...)
+      QuickMenuItem (...)
+
+    (karie)
+
+  * Added following utility methods:
+
+      DesktopBrowser#desktop?
+      DesktopHelper#linux?
+      DesktopHelper#mac?
+      DesktopCommon#linux_internal?
+      DesktopCommon#mac_internal?
+      DesktopCommon#wait_for_menu_closed
+      DesktopCommon#wait_for_menu_shown
+      DesktopCommon#wait_for_widget_visible
+      DesktopCommon#widgets
+
+    (karie)
+
+  * Added QuickButton#wait_for_visible to wait for a button to become visible.
+   (karie)
+
+  * Added following APIs related to QuickDropdown's:
+
+      QuickDropdown#dropped_down?
+      QuickDropdown#open_with_click
+      QuickDropdownItem (...)
+
+  * Added QuickTab#close_window_with_doubleclick.  (karie)
+
+  * Added following APIs related to QuickTreeItem:
+
+      QuickTreeItem#open_dialog_with_click
+      QuickTreeItem#open_window_with_click
+
+    (karie)
+
+  * Added following APIs related to widgets:
+
+      QuickWidget#click_with_condition
+      QuickWidget#click_with_condition_internal
+      QuickWidget#double_click_with_condition
+      QuickWidget#focus_with_hover
+      QuickWidget#middle_click_with_condition
+      QuickWidget#open_menu_with_rightclick
+      QuickWidget#open_window_with_click_internal
+      QuickWidget#quick_tabs
+      QuickWidget#quick_widgets
+      QuickWidget#right_click_with_condition
+      QuickWidget#verify_realtext
+      QuickWidget::ConditionTimeout
+
+    (karie)
+
+  * Added following APIs related to QuickWindow:
+
+      QuickWindow#active?
+      QuickWindow#quick_widgets
+
+    (karie)
+
+  * Removed DesktopBrowser#open_dialog_with_click.  (karie)
+
+  * Removed DesktopBrowser#key_down.  (karie)
+
+  * Removed DesktopBrowser#key_up.  (karie)
+
+  * Removed Preferences::Entry (...) and Preferences::SECTIONS; replaced by
+    Preferences::Section and Preferences::Section::Key.  (andreastt)
+
+  * Removed QuickButton#load_page_with_click.  (karie)
+
+  * Removed QuickButton#open_dialog_with_click.  (karie)
+
+  * Removed QuickButton#open_window_with_click.  (karie)
+
+  * Exposed WebElement.middleClick() from WebDriver as Element#middle_click.
+    (andreastt)
+
+  * Renamed #key_down, and #key_up in desktop_browser to avoid clash with clash
+    with browser#key_down and up.  Fixes failures of operawatir/core spec tests.
+    New APIs:
+
+       DesktopCommon#key_down_direct
+       DesktopCommon#key_up_direct
+
+    (karie)
+
+  [NEW FEATURES]
+
+  * Access to widgets in Desktop.  (karie/adamm)
+
+  * Context menus in Desktop.  (karie/adamm)
+
+  [BUG FIXES]
+
+  * Fix for bug DSK-341584 concerning a regression in quick_treeitem where it
+    complained about wrong number of arguments.  (karie)
+
+  * profile-autotest folder was not deleted in running any spec test with no
+    arguments, fixes DSK-333674.  (karie)
+
+  * Add separator to #QuickMenuItem#to_s method.  (adamm)
+
+  * Fixes to make Mac work with menus and multiple windows.  (adamm)
+
+  * treeitem open window with click, fixes bug DSK-341539.  (karie)
+
+  [OTHER]
+
+  * Added more desktop-related tests.  (karie)
+
+  * Added preliminary tests for keys implementation in key_spec.rb.
+    (andreastt)
+
+  * Fixes to make core tests run.  (andreastt)
+
+  * Fixes to make desktop tests run.  (mariap)
+
+v0.4.3.pre2  2011-05-25
+
+  [BUG FIXES]
+
+  * Element#click and Compat::Element#click now defaults to
+    coordinates [1,1], fixing WTR-354.  (andreastt)
+
 v0.4.3.pre1  2011-05-24
 
   [OTHER]

data/Gemfile

@@ -9,4 +9,8 @@ group :development do
   gem "sinatra", ">= 1.1"
   gem "rr"
   gem "clipboard"
+  gem "rspec", "~> 2.6.0"
+  gem "ci_reporter"
+  gem "deprecated"
+  gem "builder"
 end

data/Rakefile

@@ -3,6 +3,7 @@ require 'rake/clean'
 require 'jeweler'
 require 'rspec/core/rake_task'
 require 'yard'
+require 'ci/reporter/rake/rspec'
 
 require './lib/operawatir/version'
 
@@ -47,8 +48,8 @@ end
 
 CLEAN.add 'pkg'
 
-RSpec::Core::RakeTask.new do |t|
-end
+RSpec::Core::RakeTask.new(:spec)
+task :test => [:"ci:setup:rspec", :spec]
 
 YARD::Rake::YardocTask.new do |t|
   t.options = ['--no-private']

data/VERSION

@@ -1 +1 @@
-0.4.3.pre1
+0.5

data/bin/desktopwatir

@@ -97,7 +97,7 @@ EOS
     opts.separator 'Common options:'
 
     opts.on_tail('-h', '--help', 'Show this message') do
-      abort opts
+      abort opts.to_s
     end
 
     opts.on_tail('-v', '--version', 'Show version') do

data/bin/operawatir

@@ -27,7 +27,7 @@ begin
 Usage: operawatir [-m|--manual] [-l|--launcher=BINARY] [--binary=BINARY]
        [-a|--args=ARGUMENTS] [-q|--no-quit] [--opera-idle] [-b|--backtrace]
        [--no-color] [-t|--tag=TAG] [-f|--format=FORMAT] [-o|--out=FILE]
-       [-h|--help] [-v|--version] FILES
+       [-d|--debug=LEVEL] [--log=FILE] [-h|--help] [-v|--version] FILES
 EOS
 
     opts.separator ''
@@ -90,16 +90,28 @@ EOS
     opts.separator ''
     opts.separator 'Common options:'
 
+    opts.on_tail('-d', '--debug=LEVEL', 'The logging level to use.  Available levels: SEVERE',
+                 '(highest),  WARNING, INFO (default), CONFIG, FINE,',
+                 'FINER, FINEST (lowest), ALL') do |l|
+      available_levels = ['SEVERE', 'WARNING', 'INFO', 'CONFIG', 'FINE', 'FINER', 'FINEST', 'ALL']
+      raise OptionParser::InvalidArgument, l.to_s.inspect unless available_levels.include?(l)
+      @options[:logging_level] = l
+    end
+
+    opts.on_tail('--log=FILE', 'Output the log to a file') do |f|
+      @options[:logging_file] = f
+    end
+
     opts.on_tail('-h', '--help', 'Show this message') do
-      abort opts
+      abort opts.to_s
     end
 
     opts.on_tail('-v', '--version', 'Show version') do
       abort "OperaWatir version #{OperaWatir.version}"
     end
   end.parse!(ARGV)
-rescue OptionParser::InvalidOption => e
-  abort "operawatir: Unknown option `#{e.to_s.sub(/invalid option:\s+/, '')}'"
+rescue OptionParser::ParseError => e
+  abort "operawatir: #{e}"
 end
 
 if ARGV.empty?

data/lib/operawatir.rb

@@ -4,12 +4,14 @@ require 'deprecated'
 require 'java'
 include Java
 
-%w(commons-jxpath-1.3.jar protobuf-java-2.3.0.jar client-combined-nodeps.jar
-   webdriver-opera.jar commons-io-2.0.1.jar).each { |jar| require "operadriver/#{jar}" }
+%w(commons-jxpath-1.3.jar protobuf-java-2.3.0.jar selenium-nodeps-20100909.jar
+   operadriver-v0.7.2.jar commons-io-2.0.1.jar guava-r09.jar).each { |jar| require "operadriver/#{jar}" }
 
 include_class org.openqa.selenium.WebDriver
-include_class org.openqa.selenium.RenderedWebElement
+include_class org.openqa.selenium.remote.RemoteWebElement
 include_class org.openqa.selenium.NoSuchElementException
+include_class org.openqa.selenium.interactions.Actions
+include_class org.openqa.selenium.remote.DesiredCapabilities
 include_class com.opera.core.systems.OperaDriver
 include_class com.opera.core.systems.OperaWebElement
 include_class com.opera.core.systems.settings.OperaDriverSettings
@@ -19,6 +21,8 @@ include_class com.opera.core.systems.OperaDesktopDriver
 include_class com.opera.core.systems.scope.protos.DesktopWmProtos
 include_class com.opera.core.systems.scope.protos.SystemInputProtos
 include_class com.opera.core.systems.QuickWidget
+include_class com.opera.core.systems.QuickMenu
+include_class com.opera.core.systems.QuickMenuItem
 
 $KCODE = 'u'  # UTF-8 support
 
@@ -56,6 +60,8 @@ require 'operawatir/keys'
 require 'operawatir/screenshot'
 require 'operawatir/preferences'
 require 'operawatir/spatnav'
+require 'operawatir/actions'
+require 'operawatir/utils'
 
 require 'operawatir/exceptions'
 require 'operawatir/selector'
@@ -69,6 +75,7 @@ require 'operawatir/compat'
 # Desktop stuff
 require 'operawatir/desktop_enums'
 require 'operawatir/desktop_common'
+require 'operawatir/clickable_item'
 require 'operawatir/desktop_container'
 require 'operawatir/desktop_browser'
 require 'operawatir/quickwidgets'

data/lib/operawatir/actions.rb

@@ -0,0 +1,111 @@
+include_class org.openqa.selenium.interactions.Actions
+#include_class java.util.lang.CharSequence
+
+class OperaWatir::Actions
+
+  attr_accessor :browser
+  attr_accessor :driver
+  attr_accessor :actions
+
+  def initialize(browser)
+    self.browser, self.driver = browser, browser.driver
+    self.actions = Java::OrgOpenqaSeleniumInteractions::Actions.new(@driver)
+
+    @sym_key_map = {}
+  end
+
+  # If only one argument is given then it is the key, and so we call the
+  # method that accepts only the key
+  def key_down(element, key = nil)
+    if not key
+      @actions.keyDown(sym_to_key(element))
+    else
+      @actions.keyDown(element.node, sym_to_key(key))
+    end
+    self
+  end
+
+  # If only one argument is given then it is the key, and so we call the
+  # method that accepts only the key
+  def key_up(element, key = nil)
+    if not key
+      @actions.keyUp(sym_to_key(element))
+    else
+      @actions.keyUp(element.node, sym_to_key(key))
+    end
+    self
+  end
+
+  # If only one argument is given then it is the key, and so we call the
+  # method that accepts only the key
+  def send_keys(element, keys_to_send = nil)
+    if not keys_to_send
+      @actions.sendKeys(element)
+    else
+      @actions.sendKeys(element.node, keys_to_send)
+    end
+    self
+  end
+
+  def click_and_hold(element)
+    @actions.clickAndHold(element.node)
+    self
+  end
+
+  def release(element)
+    @actions.release(element.node)
+    self
+  end
+
+  def click(element = nil)
+    element ? @actions.click(element.node) : @actions.click()
+    self
+  end
+
+  def double_click(element = nil)
+    element ? @actions.double_click(element.node) : @actions.double_click()
+    self
+  end
+
+  def move_to_element(element, x_offset = 0, y_offset = 0)
+    @actions.moveToElement(element.node, x_offset, y_offset)
+    self
+  end
+
+  def move_by_offset(x_offset, y_offset)
+    @actions.moveByOffset(x_offset, y_offset)
+    self
+  end
+
+  def context_click(element)
+    @actions.contextClick(element.node)
+    self
+  end
+
+  def drag_and_drop(source, target)
+    @actions.dragAndDrop(source.node, target.node)
+    self
+  end
+
+  def drag_and_drop_by(source, x_offset, y_offset)
+    @actions.dragAndDrop(source, x_offset, y_offset)
+    self
+  end
+
+  def perform()
+    @actions.perform()
+  end
+
+private
+
+  def sym_to_key(sym)
+    if @sym_key_map.empty?
+      Java::OrgOpenqaSelenium::Keys.values().each do |k|
+        @sym_key_map[k.name().downcase.to_sym] = k
+      end
+    end
+
+    @sym_key_map[sym]
+  end
+
+end