operawatir 0.4-jruby → 0.4.1-jruby

data/lib/operawatir.rb

@@ -4,7 +4,7 @@ require 'deprecated'
 require 'java'
 include Java
 
-%w(commons-jxpath-1.3.jar protobuf-java-2.3.0.jar selenium-common.jar
+%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}" }
 
 include_class org.openqa.selenium.WebDriver
@@ -22,6 +22,12 @@ include_class com.opera.core.systems.QuickWidget
 
 $KCODE = 'u'  # UTF-8 support
 
+class Object
+  def truthy?
+    self && [true, 'true', 'yes', 'y', '1', 1].include?(self)
+  end
+end
+
 # TODO This should be replaced when we decide upon a better way of
 # enabling the Watir 3 API.
 module OperaWatir
@@ -47,6 +53,7 @@ end
 require 'operawatir/version'
 require 'operawatir/platform'
 require 'operawatir/keys'
+require 'operawatir/screenshot'
 require 'operawatir/preferences'
 require 'operawatir/spatnav'
 

data/lib/operawatir/browser.rb

@@ -67,21 +67,13 @@ class OperaWatir::Browser
     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.
-  def pid
-    driver.getPid
-  end
-
   # 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 of the device we're
   #   testing on.
   def platform
-    driver.getPlatform
+    window.execute_script('navigator.platform')
   end
 
   # Get the full path to the attached browser binary.
@@ -95,7 +87,7 @@ class OperaWatir::Browser
   #
   # @return [String] User agent string.
   def ua_string
-    driver.getUaString
+    window.execute_script('navigator.userAgent')
   end
 
   # Is attached browser instance of type internal build or public
@@ -112,7 +104,7 @@ class OperaWatir::Browser
   # @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, args.to_java(:string))
   end
   deprecated :opera_action
 
@@ -132,7 +124,6 @@ class OperaWatir::Browser
   # 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
@@ -177,14 +168,43 @@ class OperaWatir::Browser
     end
   end
 
+
+  # Keyboard
+
+  def key(key)
+    driver.key(key)
+  end
+
+  deprecated :key, 'browser.keys.send'
+
+  def key_down(key)
+    driver.keyDown(key)
+  end
+
+  deprecated :key, 'browser.keys.down'
+
+  def key_up(key)
+    driver.keyUp(key)
+  end
+
+  deprecated :key, 'browser.keys.up or browser.keys.release'
+
+  def type(text)
+    driver.type(text)
+  end
+
+  deprecated :key, 'browser.keys.send'
+
 private
 
   def self.opera_driver_settings
-    @opera_driver_settings ||= OperaDriverSettings.new.tap {|s|
-      s.setRunOperaLauncherFromOperaDriver true
+    @opera_driver_settings ||= OperaDriverSettings.new.tap { |s|
+      s.setAutostart false if self.settings[:manual]
       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'
+      s.setOperaBinaryArguments self.settings[:args].to_s if self.settings[:args]
+      s.setNoQuit true if self.settings[:no_quit]
+      s.setUseOperaIdle true if self.settings[:opera_idle] or ENV['OPERA_IDLE'].truthy?
     }
   end
 

data/lib/operawatir/collection.rb

@@ -51,7 +51,7 @@ class OperaWatir::Collection
   # Public interface to elms, used in Selector
   def raw_elements
     _elms.tap do |e|
-      raise(OperaWatir::Exceptions::UnknownObjectException) if e.empty?
+      #raise(OperaWatir::Exceptions::UnknownObjectException) if e.empty?
     end
   end
 
@@ -63,7 +63,7 @@ class OperaWatir::Collection
   end
 
   def attr(name)
-    raw_elements[0].attr(name)
+    raw_elements.first.attr(name)
   end
 
   def attrs(name)

data/lib/operawatir/compat.rb

@@ -2,7 +2,7 @@ module OperaWatir
   
   module Compat; end
 
-  # Switches on compatibility layer (Watir 1 API).
+  # Switches on compatibility layer (Watir 2 API).
   def self.compatibility!
     require 'operawatir/compat/browser'
     require 'operawatir/compat/element_finders'
@@ -16,7 +16,8 @@ module OperaWatir
     # TODO Ruby Modules can't override methods defined in their included klass
     #   Requiring the files is OK, but there needs to be some way of detecting
     #   that we are in compatibility mode.
-    
+
+    require 'operawatir/compat/selector'
     require 'operawatir/compat/collection'
     require 'operawatir/compat/element'
   end

data/lib/operawatir/compat/browser.rb

@@ -11,11 +11,6 @@ module OperaWatir
         end
       end
 
-      # Quits the browser
-      def quit
-        browser.quit!
-      end
-
       # Class#type is defined by Ruby, it will never reach
       # #method_missing.
       def_delegator :active_window, :type

data/lib/operawatir/compat/collection.rb

@@ -79,6 +79,10 @@ class OperaWatir::Collection
     define_method(name) {method_missing(name)}
   end
 
+=begin
+  This only applies to Watir 1.  #to_s is in Watir 2 treated the same
+  way as Object#to_s (which will give you a Collection instance).
+
   # Fetches the string representation of this collection.
   #
   # @return [String] the string representation of this collection
@@ -95,6 +99,15 @@ class OperaWatir::Collection
       "  text:         #{el.text}"
     end.join("\n")
   end
+=end
+
+  def select(option_text)
+    option(:text => option_text).node.setSelected
+  end
+
+  def selected?(option_text)
+    option(:text => option_text).node.isSelected
+  end
 
 private
 
@@ -102,4 +115,6 @@ private
     blk.call(raw_elements.first)
   end
 
+  alias_method :find_elements_by_selector, :find_elements_by_css
+
 end

data/lib/operawatir/compat/element.rb

@@ -1,17 +1,24 @@
 class OperaWatir::Element
+  include Deprecated
 
+  #
   # Gets the attribute called name.
   #
-  # @param [String, Symbol] name The name of the attribute to get
-  # @return [String] The value of the attribute
+  # @param  [String, Symbol] name  The name of the attribute to get.
+  # @return [String]               The value of the attribute.
+  #
+
   def attr(name)
     node.getAttribute(name.to_s) || ''
   end
 
+  #
   # Check the existence of the attribute on the element.
   #
-  # @return [Boolean] true if the attribute exists on the element,
-  #   false otherwise
+  # @return [Boolean] True if the attribute exists on the element,
+  #                   false otherwise.
+  #
+
   def attr?(name)
     !node.getAttribute(name.to_s).nil?
   end
@@ -24,24 +31,32 @@ class OperaWatir::Element
     end
   end
 
+  #
   # Gets the text content of the element.
   #
-  # @return [String] the text content
+  # @return [String] The text content.
+  #
+
   def text
-    node.getText.strip
+    if node.tag_name =~ /input|textarea|select/i
+      node.value.strip
+    else
+      node.getText.strip
+    end
   end
 
-  alias_method :to_s, :text
-
+  #
   # Checks whether the text content of the element contains the given
   # string In the compatibility layer as the preferred way of doing
   # this is.
   #
   #   elm.text.should include('My string')
   #
-  # @param [String] String to search for
-  # @param [Boolean] true if the element's text contains str, false
-  #   otherwise
+  # @param [String]  String to search for.
+  # @param [Boolean] True if the element's text contains str, false
+  #                  otherwise.
+  #
+
   def verify_contains(str)
     text.include?(str)
   end
@@ -50,11 +65,15 @@ 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.
   #
   # @param [optional, Fixnum] x The offset from the left of the
   #   element
   # @param [optional, Fixnum] y The offset from the top of the element
+  #
+
   def click(x=0, y=0)
     assert_enabled!
     node.click(x.to_i, y.to_i)
@@ -62,27 +81,40 @@ class OperaWatir::Element
 
   alias_method :click_no_wait, :click_async
 
+  #
   # Focuses the element
+  #
+
   def focus
     fire_event :focus
   end
 
+  #
   # Submits a form, or the form the elment is contained in.
+  #
+
   def submit
     assert_exists
     node.submit
   end
 
+  #
   # Clears a text input or textarea of any text.
+  #
+
   def clear
     assert_enabled!
-    uncheck!
+    click
+    node.clear
   end
 
+  #
   # If passed a value it will type text into the element, otherwise it
   # will check a radio button or checkbox.
   #
-  # @param [optional, String] value Text to type
+  # @param [String] value  (Optional.) Text to type.
+  #
+
   def set(value=nil)
     if value
       self.text = value
@@ -92,31 +124,40 @@ class OperaWatir::Element
     end
   end
 
+  #
   # Gets the href of an `<a>` element, or the url attribute of any
   # other element.
   #
-  # @return [String] an href or the url attribute
+  # @return [String] An href or the @url attribute.
+  #
+
   def url
     attr(tag_name == 'A' ? :href : :url)
   end
 
+  #
   # Gets the selected `<option>` elements in a `<select>` element.
   #
-  # @return [OperaWatir::Collection] a collection of the selected
-  #   `<option>`s
+  # @return [Collection] a collection of the selected
+  #                                  `<option>`s
+  #
+
   def selected_options
     options(:selected?, true)
   end
 
+  #
   # On checkboxes, radio buttons, and option elements returns whether
   # the element is checked/selected. On a select element, when passed
   # an value it checks whether the selected option contains the given
   # text.
   #
-  # @param [optional, String] value Text the selected option should
-  #   contain
-  # @return [Boolean] true if the element is selected/selected option
-  #   contains value, false otherwise
+  # @param  [String]  value (Optional.) Text the selected option should
+  #                         contain.
+  # @return [Boolean]       True if the element is selected/selected
+  #                         option contains value, false otherwise.
+  #
+
   def selected?(value=nil)
     if option.nil?
       selected_options.text.include?(value)
@@ -127,10 +168,13 @@ class OperaWatir::Element
 
   alias_method :set?, :checked?
 
+  #
   # For `<select>` elements returns either 'select-one' for
   # `<select>`s where only a single `<option>` can be selected, or
   # 'select-multiple' otherwise.  For non-`<select>` elements returns
   # the `type` attribute.
+  #
+
   def type
     if tag_name == 'SELECT'
       attr(:multiple) == 'multiple' ? 'select-multiple' : 'select-one'
@@ -139,9 +183,12 @@ class OperaWatir::Element
     end
   end
 
+  #
   # Gets the colspan attribute as an integer.
   #
-  # @return [Fixnum] the colspan
+  # @return [Fixnum] The colspan.
+  #
+
   def colspan
     attr(:colspan).to_i
   end
@@ -151,6 +198,10 @@ class OperaWatir::Element
   def compare_hash(other)
     visual_hash == other.visual_hash
   end
+  deprecated :compare_hash, 'element.visual_hash'
+
+  alias_method :get_hash, :visual_hash
+  deprecated :get_hash, 'element.visual_hash'
 
 private
 

data/lib/operawatir/compat/element_finders.rb

@@ -52,6 +52,10 @@ module OperaWatir::Compat::ElementFinders
 
   def_element :dt, :dts
 
+  def_element :element, :elements do |selector|
+    selector.xpath '//*'
+  end
+
   def_element :em, :ems
 
   def_element :file_field, :file_fields, :how => :name do |selector|
@@ -76,6 +80,8 @@ module OperaWatir::Compat::ElementFinders
 
   def_element :h6, :h6s
 
+  def_element :iframe, :iframes
+
   def_element :image, :images, :how => :src do |selector|
     selector.tag :img
   end

data/lib/operawatir/compat/selector.rb

@@ -0,0 +1,7 @@
+class OperaWatir::Selector
+  include Deprecated
+
+  BASE_TYPES << :selector
+  alias_method :selector, :css
+  deprecated :selector, "element(:css, 'foo')"
+end