operawatir 0.3.2-jruby → 0.3.7.pre1-jruby

data/.gitmodules

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

data/.yardopts

@@ -1,5 +1,2 @@
 --no-private
 --title "OperaWatir"
---exclude bin/desktopwatir
---exclude lib/operawatir/desktop*
---exclude lib/operawatir/quickwidget*

data/Gemfile

@@ -2,12 +2,11 @@ source :rubygems
 
 group :development do
   gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
-  gem "yard", ">= 0.6.3"
+  gem "jeweler"
   gem "bluecloth", "= 1.0.1"
-  gem "rspec", ">= 2.4"
-  gem "sinatra", ">= 1.0.0"
+  gem "yard"
   gem "mongrel", ">= 1.1.5"
-  gem "rr", ">= 1.0.2"
+  gem "sinatra", ">= 1.1"
+  gem "rr"
+  gem "clipboard"
 end

data/Rakefile

@@ -31,17 +31,22 @@ EOF
   gem.has_rdoc              = true
   gem.extra_rdoc_files      = ['README.md']
 
-  gem.add_dependency 'rspec', '>= 2.4'
+  gem.add_dependency 'rspec', '= 2.4'
+  gem.add_dependency 'inifile', '>= 0.3'
+  gem.add_dependency 'i18n'
+  gem.add_dependency 'activesupport', '>= 3.0.1'
+  gem.add_dependency 'deprecated'
 
   gem.add_development_dependency 'jeweler'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'bluecloth', '= 1.0.1'
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'mongrel', '>= 1.1.5'
   gem.add_development_dependency 'sinatra', '>= 1.1'
   gem.add_development_dependency 'rr'
+  gem.add_development_dependency 'clipboard'
 
   gem.files.exclude '.gitignore'
-  gem.files.exclude '.gitmodules'
 end
 
 CLEAN.add 'pkg'

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.7.pre1

data/bin/desktopwatir

@@ -1,109 +1,102 @@
 #!/usr/bin/env jruby
-
 require 'rubygems'
-
 require 'optparse'
-require 'ostruct'
-require 'rbconfig'
 require 'rspec'
+require 'rbconfig'
 require 'operawatir'
+require 'operawatir/desktop_helper'
+
+@options = {
+  :ng            => false,
+  :color_enabled => Config::CONFIG['host_os'] =~ /mswin|mingw|bccwin|wince|emx/ ? false : true,
+  :check_syntax  => false,
+  :format	     => 'progress', 
+  :no_quit		 => false,
+  :no_restart   => false
+}
+
+# TODO
+#   Should steal https://github.com/rspec/rspec-core/blob/master/lib/rspec/core/option_parser.rb
+
+begin
+  OptionParser.new do |opts|
+    opts.banner = <<EOS
+Usage: desktopwatir [-l|--launcher=BINARY] [-e|--executable=BINARY] [-a|--args=ARGUMENTS]
+       [--no-color] [-q|--no-quit] [-r|--no-restart] [-f|--format=FORMAT] [-o|--out=FILE] [-h|--help] [-v|--version] FILES
+EOS
+
+    opts.separator ""
+    opts.separator "Specific options:"
+
+    opts.on('-l', '--launcher=BINARY', 'Path to launcher binary, will use environmental ',
+            'variable OPERA_LAUNCHER if not specified') do |c|
+      @options[:launcher] = c
+    end
 
-# Encoding fix
-$KCODE = "UTF8"
-
-class Options
-
-  def self.parse(args)
-    options = OpenStruct.new
-
-    options.ng           = false
-    options.inspectr     = ENV['OPERA_INSPECTR'] || ''
-    options.color        = Config::CONFIG['host_os'] =~ /mswin|msys|mingw32/ ? false : true
-    options.check_syntax = false
-    options.format       = 'progress'
-    options.executable   = ENV['OPERA_PATH'] || ''
-    options.options      = ENV['OPERA_ARGS'] || ''
-
-    opts = OptionParser.new do |opts|
-      opts.banner = "Usage: operawatir [--ng] [-i|--inspectr] [--color] [-c|--check-syntax]\n" +
-        "       [-f|--format=FORMAT[:OUT_FILE]] [-e|--executable=BINARY] [-o|--options=OPTIONS]\n" +
-        "       [-h|--help] [-v|--version] FILES"
-
-      opts.separator ""
-      opts.separator "Specific options:"
-
-      opts.on('--ng', 'Connect to Nailgun server instead of starting our ',
-              'own JVM') do |ng|
-        options.ng = ng
-      end
-
-      opts.on('-i', '--inspectr', 'Attach inspectr to browser instance') do |i|
-        options.inspectr = i
-      end
-
-      opts.on('--color', 'Enable colorized output (default: enabled)') do |c|
-        options.color = c
-      end
-
-      opts.on('-c', '--check-syntax', 'Check syntax only') do |c|
-        options.check_syntax = c
-      end
-
-      opts.on('-f', '--format=FORMAT[:OUT_FILE]',
-              [:OperaHelperFormatter, :SpartanFormatter, :progress,
-              :documentation],
-              'Specify RSpec output format (OperaHelperFormatter,',
-              'SpartanFormatter, Specdoc) and optionally an output',
-              'file') do |t|
-        options.format = t
-      end
-
-      opts.on('-e', '--executable=EXECUTABLE', 'Browser to run the test with.  ',
-              'Will override environmental variable OPERA_PATH') do |e|
-        options.executable = e
-      end
-
-      opts.on('-o', '--options=OPTIONS', 'Options passed to the optional executable.  ',
-              'Will override environmental variable OPERA_ARGS') do |o|
-        options.options = o
-      end
-
-      opts.separator ''
-      opts.separator 'Common options:'
-
-      opts.on_tail('-h', '--help', 'Show this message') do
-        abort opts
-      end
-
-      opts.on_tail('-v', '--version', 'Show version') do
-        abort "OperaWatir version #{OperaWatir.version}"
-      end
+    opts.on('-e', '--executable=BINARY', 'Browser to run the test with, will use environmental ',
+            'variable OPERA_PATH if not specified') do |e|
+      @options[:path] = e
     end
 
-    opts.parse!(args)
-    options
-  end
+    opts.on('-a', '--args=ARGUMENTS', 'Arguments passed to the executable.  ',
+            'Will override environmental variable OPERA_ARGS') do |a|
+      @options[:args] = a
+    end
 
-end
+    opts.on('--no-color', 'Disable colorized output') do |c|
+      @options[:color_enabled] = false
+    end
+
+    opts.on('-q', '--no-quit', 'Disable quitting of Opera at the end of a testrun') do |c|
+      @options[:no_quit] = true
+    end
 
-options = Options.parse(ARGV)
+   opts.on('-r', '--no-restart', 'Disables automatic relaunching of Opera') do |c|
+      @options[:no_restart] = true
+    end
 
-abort 'operawatir: You need to specify at least one test file to run' if ARGV.empty?
-abort 'operawatir: --ng and --check-syntax is disabled for now' if options.ng or options.check_syntax
+    #opts.on('-c', '--check-syntax', 'Check syntax only') do |c|
+    #  @options[:check_syntax] = true
+    #end
+
+    #opts.on('--ng', 'Connect to Nailgun server instead of starting out ',
+    #        'own JVM') do |ng|
+    #  @options[:ng] = ng
+    #end
+  
+    opts.on('-f', '--format=FORMAT',
+            'Specify RSpec output formatter (documentation, html, ',
+            'progress (default), textmate)') do |formatter|
+      @options[:formatter] = formatter
+    end
 
-RSpec.configure do |c|
-  c.color_enabled = options.color
-  c.formatter     = options.format
-  c.files_to_run  = ARGV
-  c.formatter 	  = "documentation"
-end
+    opts.on('-o', '--out=FILE', 'Send output to a file instead of STDOUT') do |o|
+      @options[:output_stream] = File.open(o, 'w') or
+        abort "desktopwatir: Unable to write to file `#{o}'"
+    end
+
+    opts.separator ''
+    opts.separator 'Common options:'
 
-require 'operawatir/desktop-waiter'
+    opts.on_tail('-h', '--help', 'Show this message') do
+      abort opts
+    end
 
-OperaWatir::Waiter.configure do |c|
-  c.path = options.executable
-  c.args = options.options
-  c.inspectr = options.inspectr
+    opts.on_tail('-v', '--version', 'Show version') do
+      abort "OperaWatir version #{OperaWatir.version}"
+    end
+  end.parse!(ARGV)
+rescue OptionParser::InvalidOption => e
+  abort "desktopwatir: Unknown option `#{e.to_s.sub(/invalid option:\s+/, '')}'"
 end
 
-OperaWatir::Waiter.run!
+if ARGV.empty?
+  abort 'desktopwatir: You need to specify at least one test file to run'
+else
+  @options[:files_to_run] = ARGV
+  @options[:files_to_run].map! { | f | Dir.glob(f) }.flatten!
+end
+
+#abort 'desktopwatir: --ng and --check-syntax are disabled for now' if @options[:ng] || @options[:check_syntax]
+
+OperaWatir::DesktopHelper.run! @options

data/bin/operawatir

@@ -8,7 +8,7 @@ require 'operawatir/helper'
 
 @options = {
   :ng            => false,
-  :color_enabled => Config::CONFIG['host_os'] =~ /mswin|mingw|bccwin|wince|emx/ ? false : true,
+  :color_enabled => OperaWatir::Platform.os == :windows ? false : true,
   :check_syntax  => false,
   :format        => 'progress'
 }
@@ -19,7 +19,7 @@ require 'operawatir/helper'
 begin
   OptionParser.new do |opts|
     opts.banner = <<EOS
-Usage: operawatir [-l|--launcher=BINARY] [-e|--executable=BINARY] [-a|--args=ARGUMENTS]
+Usage: operawatir [-l|--launcher=BINARY] [-b|--binary=BINARY] [-a|--args=ARGUMENTS]
        [--no-color] [-f|--format=FORMAT] [-o|--out=FILE] [-h|--help] [-v|--version] FILES
 EOS
 
@@ -31,7 +31,7 @@ EOS
       @options[:launcher] = c
     end
 
-    opts.on('-e', '--executable=BINARY', 'Browser to run the test with, will use environmental ',
+    opts.on('-b', '--binary=BINARY', 'Browser to run the test with, will use environmental ',
             'variable OPERA_PATH if not specified') do |e|
       @options[:path] = e
     end
@@ -45,15 +45,6 @@ EOS
       @options[:color_enabled] = false
     end
 
-    #opts.on('-c', '--check-syntax', 'Check syntax only') do |c|
-    #  @options[:check_syntax] = true
-    #end
-
-    #opts.on('--ng', 'Connect to Nailgun server instead of starting out ',
-    #        'own JVM') do |ng|
-    #  @options[:ng] = ng
-    #end
-
     opts.on('-f', '--format=FORMAT',
             'Specify RSpec output formatter (documentation, html, ',
             'progress (default), textmate)') do |formatter|
@@ -86,10 +77,4 @@ else
   @options[:files_to_run] = ARGV
 end
 
-#abort 'operawatir: --ng and --check-syntax are disabled for now' if @options[:ng] || @options[:check_syntax]
-
-# TODO Be smarter about figuring out the Opera/Launcher path
-warn 'operawatir: Launch path is not specified.' if !ENV['OPERA_LAUNCHER'] && !@options[:launcher]
-warn 'operawatir: Browser path is not specified.' if !ENV['OPERA_PATH'] && !@options[:path]
-
 OperaWatir::Helper.run! @options

data/lib/operawatir/browser.rb

@@ -1,57 +1,70 @@
 # -*- coding: utf-8 -*-
 class OperaWatir::Browser
+  include Deprecated
 
-  attr_accessor :driver, :active_window
+  attr_accessor :driver, :active_window, :preferences, :keys, :spatnav
 
   def self.settings=(settings={})
     @opera_driver_settings = nil  # Bust cache
-    @settings = settings.merge! :launcher => OperaWatir::Platform.launcher,
-                                :path     => OperaWatir::Platform.opera,
-                                :args     => OperaWatir::Platform.args
+    @settings = settings
   end
 
   def self.settings
     @settings || self.settings = {}
   end
 
+  # Constructs a new OperaDriver::Browser object.
+  #
+  # @example
+  #   browser = OperaWatir::Browser.new
+  #
+  # @return [Object] OperaWatir::Browser class.
   def initialize
-    OperaWatir.compatibility! unless OperaWatir.api >= 2
+    OperaWatir.compatibility! unless OperaWatir.api >= 3
 
-    self.driver = OperaDriver.new(self.class.opera_driver_settings)
+    self.driver        = OperaDriver.new(self.class.opera_driver_settings)
     self.active_window = OperaWatir::Window.new(self)
+    self.preferences   = OperaWatir::Preferences.new(self)
+    self.keys          = OperaWatir::Keys.new(self)
+    self.spatnav       = OperaWatir::Spatnav.new(self)
   end
 
+  alias_method :window, :active_window
+
   # Get the name of the browser currently being run.
   #
-  # @return [String] name of browser currently used
+  # @return [String] Name of browser currently used.
   def name
     'Opera'
   end
 
+  # Navigate to a new URL and return a Window object.
+  #
+  # @param  [String] url The URL you wish to go to.
+  # @return [Object] A Window object.
   def url=(url)
     active_window.url = url
   end
-  alias_method :url, :url=
 
   # Tells you whether the browser object exists.  Note that this is
   # not the same as checking whether the object is connected to a
   # browser.
   #
-  # @return [Boolean] whether Browser object exists
+  # @return [Boolean] Whether Browser object exists.
   def exists?
     true
   end
 
   # Query to see if the browser instance is still connected.
   #
-  # @return [Boolean] whether driver is still connected to browser
-  #   instance
+  # @return [Boolean] Whether driver is still connected to browser
+  #   instance.
   def connected?
     driver.isConnected
   end
 
   # Instruct the browser instance to quit and shut down.
-  def quit!
+  def quit
     driver.shutdown
   end
 
@@ -62,61 +75,19 @@ class OperaWatir::Browser
     driver.closeAll
   end
 
-  # Accesses the keys API in OperaWatir::Keys.
-  def keys
-    OperaWatir::Keys.new(self)
-  end
-
-  # Set preference pref in prefs section prefs_section to value
-  # specified.
-  #
-  # TODO: This needs to be moved to a separate preference section.
-  #
-  # @param [String] prefs_section The prefs section the pref belongs to
-  # @param [String] pref          The preference to set
-  # @param [String] value         The value to set the preference to
-  def set_preference(prefs_section, pref, value)
-    @driver.setPref(prefs_section, pref, value.to_s)
-  end
-      
-  # Get value of preference pref in prefs section prefs_section.
-  #
-  # TODO: This needs to be moved to a separate preference section.
-  #
-  # @param [String] prefs_section The prefs section the pref belongs to
-  # @param [String] pref          The preference to get
-  #
-  # @return [String] The value of the preference
-  def get_preference(prefs_section, pref)
-    @driver.getPref(prefs_section, pref)
-  end
-    
-  # Get default value of preference pref in prefs section
-  # prefs_section.
-  #
-  # TODO: This needs to be moved to a separate preference section.
-  #
-  # @param [String] prefs_section The prefs section the pref belongs to
-  # @param [String] pref          The preference to get
-  #
-  # @return [String] The value of the preference
-  def get_default_preference(prefs_section, pref)
-    @driver.getDefaultPref(prefs_section, pref)
-  end
-
   # Get the version number of the driver.  This _is not_ the same as
   # the version number for OperaWatir, which can be retrieved using
   # +OperaWatir.version+ instead.
   #
-  # @return [String] driver version
+  # @return [String] Driver version.
   def version
-    driver.getOperaDriverVersion
+    driver.getVersion
   end
 
   # Get process identifier for spawned Opera browser instance.  This
   # will only work if instance was started through OperaWatir.
   #
-  # @return [Integer] the process ID of the browser instance
+  # @return [Integer] The process ID of the browser instance.
   def pid
     driver.getPid
   end
@@ -124,28 +95,22 @@ class OperaWatir::Browser
   # Get the target device's platform.  This is not equivalent of the
   # platform the OperaWatir server might be running on.
   #
-  # @return [String] operating system flavour
+  # @return [String] Operating system flavour of the device we're
+  #   testing on.
   def platform
     driver.getPlatform
   end
 
-  # Will fetch the build number for the attached browser instance.
-  #
-  # @return [Integer] build number of attached browser instance
-  def build
-    driver.getBuild
-  end
-
   # Get the full path to the attached browser binary.
   #
-  # @return [String] path to the attached browser's binary
+  # @return [String] Path to the attached browser's binary.
   def path
     driver.getPath
   end
 
   # Fetches the user agent (UA) string the browser currently uses.
   #
-  # @return [String] user agent string
+  # @return [String] User agent string.
   def ua_string
     driver.getUaString
   end
@@ -153,19 +118,20 @@ class OperaWatir::Browser
   # Is attached browser instance of type internal build or public
   # desktop?
   #
-  # @return [Boolean] true if browser attached is of type desktop,
-  #   false otherwise
+  # @return [Boolean] True if browser attached is of type desktop,
+  #   false otherwise.
   def desktop?
     false  # FIXME
   end
 
   # Sends an Opera action to the browser.
   #
-  # @param [String] name of the action
-  # @return [String] optional return from the performed action
+  # @param  [String] Name of the action.
+  # @return [String] Optional return from the performed action.
   def opera_action(name, *args)
-    @driver.operaAction(name, param.to_java(:string))
+    driver.operaAction(name, param.to_java(:string))
   end
+  deprecated :opera_action
 
   # Full list of available Opera actions in the Opera build you're
   # using.  Note that this list varies from configuration to
@@ -173,9 +139,59 @@ class OperaWatir::Browser
   # available to devices-type builds will vary greatly from those
   # available to desktop-types.
   #
-  # @return [String] list of available Opera actions
+  # @return [String] List of available Opera actions.
   def opera_action_list
-    @driver.getOperaActionList
+    driver.getOperaActionList.to_s
+  end
+  deprecated :opera_action_list
+
+  # Selects all content in the currently focused element.  Equivalent
+  # to pressing C-a in a desktop browser.  To select content in a
+  # <textarea> or an <input> field, remember to click it first.
+  def select_all
+
+    # FIXME
+    driver.operaAction('Select all')
+  end
+
+  # Copies the currently selected content to the clipboard.
+  # Equivalent to pressing C-c in a desktop browser.
+  def copy
+
+    # FIXME: #copy, #cut and #paste really shouldn't use platform-
+    # dependent keypresses like this.  But until DSK-327491 is fixed,
+    # this will have to do.
+    if OperaWatir::Platform.os == :macosx
+      keys.send [:command, 'c']
+    else
+      keys.send [:control, 'c']
+    end
+  end
+
+  # Cuts the currently selected content to the clipboard.  Equivalent
+  # to pressing C-x in a desktop browser.
+  def cut
+
+    # FIXME
+    if OperaWatir::Platform.os == :macosx
+      keys.send [:command, 'x']
+    else
+      keys.send [:control, 'x']
+    end
+  end
+
+  # Pastes content from the clipboard into the currently focused
+  # element.  Equivalent to pressing C-v in a desktop browser.  To
+  # paste content into textarea or input fields, remember to click it
+  # first.
+  def paste
+
+    # FIXME
+    if OperaWatir::Platform.os == :macosx
+      keys.send [:command, 'v']
+    else
+      keys.send [:control, 'v']
+    end
   end
 
 private
@@ -183,9 +199,9 @@ private
   def self.opera_driver_settings
     @opera_driver_settings ||= OperaDriverSettings.new.tap {|s|
       s.setRunOperaLauncherFromOperaDriver true
-      s.setOperaLauncherBinary self.settings[:launcher]
-      s.setOperaBinaryLocation self.settings[:path]
-      s.setOperaBinaryArguments self.settings[:args] + ' -watirtest'
+      s.setOperaLauncherBinary self.settings[:launcher] if self.settings[:launcher]
+      s.setOperaBinaryLocation self.settings[:path] if self.settings[:path]
+      s.setOperaBinaryArguments self.settings[:args].to_s + ' opera:debug' #+ ' -watirtest'
     }
   end
 

data/lib/operawatir/compat/browser.rb

@@ -1,6 +1,7 @@
 module OperaWatir
   module Compat
     module Browser
+      extend Forwardable
 
       def method_missing(method, *args, &blk)
         if active_window.respond_to? method
@@ -15,6 +16,10 @@ module OperaWatir
         browser.quit!
       end
 
+      # Class#type is defined by Ruby, it will never reach
+      # #method_missing.
+      def_delegator :active_window, :type
+
     end
   end
 end

data/lib/operawatir/compat/element.rb

@@ -33,19 +33,6 @@ class OperaWatir::Element
 
   alias_method :to_s, :text
 
-  # On elements of type `<input>` this gets the value of the value
-  # attribute, on every other element type it returns the text
-  # content.
-  #
-  # @return [String] value of the element
-  def value
-    if tag_name == 'INPUT' or attr?(:value)
-      attr(:value)
-    else
-      text
-    end
-  end
-
   # Checks whether the text content of the element contains the given
   # string In the compatibility layer as the preferred way of doing
   # this is.
@@ -73,13 +60,13 @@ class OperaWatir::Element
     node.click(x.to_i, y.to_i)
   end
 
+  alias_method :click_no_wait, :click_async
+
   # Focuses the element
   def focus
-    trigger! :focus
+    fire_event :focus
   end
 
-  alias_method :fire_event, :trigger!
-
   # Submits a form, or the form the elment is contained in.
   def submit
     assert_exists
@@ -101,7 +88,7 @@ class OperaWatir::Element
       self.text = value
     else
       assert_enabled
-      click!
+      click_async
     end
   end
 
@@ -159,6 +146,12 @@ class OperaWatir::Element
     attr(:colspan).to_i
   end
 
+
+  # Opera-specific
+  def compare_hash(other)
+    visual_hash == other.visual_hash
+  end
+
 private
 
   def assert_enabled!

data/lib/operawatir/compat.rb

@@ -4,7 +4,6 @@ module OperaWatir
 
   # Switches on compatibility layer (Watir 1 API).
   def self.compatibility!
-    # require 'operawatir/compat/deprecation'
     require 'operawatir/compat/browser'
     require 'operawatir/compat/element_finders'
     require 'operawatir/compat/window'