operawatir 0.4-jruby → 0.4.1-jruby

data/lib/operawatir/screenshot.rb

@@ -0,0 +1,46 @@
+class OperaWatir::Screenshot
+
+  attr_accessor :browser, :reply
+
+  def initialize(parent)
+    self.browser = parent.browser
+    self.reply   = driver.saveScreenshot(2, [].to_java(:string))
+  end
+
+  # Saves screenshot to specified location.
+  #
+  # @param [String]  Path to where you want the screenshot saved.
+  # @return [String] The full path to the file that was saved.
+  def save(filename)
+    File.open(filename, 'w') { |f| f.write png }
+    File.expand_path filename
+  end
+
+  # Is the screenshot blank?
+  #
+  # @return [Boolean] True/false depending on the screenshot is blank.
+  def blank?
+    reply.isBlank
+  end
+
+  # Returns the raw byte string of the screenshot in PNG format.
+  #
+  # @return [String] A png image in a raw byte string.
+  def png
+    String.from_java_bytes reply.getPng
+  end
+
+  # Lets you get a MD5 sum of the screen.
+  #
+  # @return [String] A hash. 
+  def md5
+    reply.getMd5
+  end
+
+private
+
+  def driver
+    browser.driver
+  end
+
+end

data/lib/operawatir/version.rb

@@ -3,12 +3,14 @@ module OperaWatir
   # @private
   VERSION = File.read(File.join(File.dirname(__FILE__), '../..', 'VERSION')).strip.freeze
 
-  # Fetches OperaWatir's version number.  Note that this is not the
-  # same as OperaDriver's version number.
   #
-  # @return [String] current version of OperaWatir
+  # Fetches OperaWatir's version number.  Note that this is not the same
+  # as OperaDriver's version number.
+  #
+  # @return [String] Current version of OperaWatir.
+  #
   def self.version
     VERSION
   end
-  
+
 end

data/lib/operawatir/window.rb

@@ -52,27 +52,40 @@ class OperaWatir::Window
     driver.getTitle
   end
 
+  #
   # Gets the URL of the document.
   #
   # @return [String] The URL of the current document.
+  #
+
   def url
     driver.getCurrentUrl
   end
 
+  #
   # Navigates to a new URL.
   #
-  # @param [String] url The new URL to navigate to.
+
   def url=(url)
-    driver.get(url)
+    driver.navigate.to(url)
   end
+
   alias_method :goto, :url=  # deprecate?
 
+  #
+  # Refreshes the page.
+  #
+
+  def refresh
+    driver.navigate.refresh
+  end
+
   # Retrieves the text without the DOM or source code from the
   # currently loaded document.
   #
   # @return [String] The text of the document.
   def text
-    driver.getText
+    document.text
   end
 
   # Retrieves the HTML/source code of the currently loaded document.
@@ -91,12 +104,6 @@ class OperaWatir::Window
     url != ''
   end
 
-  # TODO
-=begin
-  def document
-  end
-=end
-
   # Executes the given JavaScript on the current window.
   #
   # @param  [String] js The script to be executed.
@@ -104,55 +111,39 @@ class OperaWatir::Window
   def execute_script(js)
     object = driver.executeScript(js, [].to_java(:string))
   end
-  alias_method :eval_js, :execute_script
-  deprecated :eval_js, "window.execute_script"
-
 
-  # Keyboard
+  alias_method :eval_js, :execute_script
+  deprecated :eval_js, 'window.execute_script'
 
-  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"
+  # Opera-specific
 
-  def key_up(key)
-    driver.keyUp(key)
-  end
-  deprecated :key, "browser.keys.up or browser.keys.release"
+  #
+  # Creates a Screenshot interface or saves screenshot to specified
+  # location if a file path is given.
+  #
+  # @param [String] file_name The absolute path to the location where 
+  #                           you want the screenshot saved.
+  #
+  # @return [Object]          A Screenshot object.
+  # @return [String]          Filename to the saved file.
+  #
 
-  def type(text)
-    driver.type(text)
+  def screenshot(filename=nil)
+    # TODO: This should call document.screenshot instead, but that
+    # requires a generic ScreenShotReply interface in OperaDriver.
+    filename.nil? ? OperaWatir::Screenshot.new(self) : OperaWatir::Screenshot.new(self).save(filename)
   end
-  deprecated :key, "browser.keys.send"
-
-
-  # Opera-specific
 
-  # Saves a screenshot of the window to the filesystem of the server.
   #
-  # @param [String]  file_name The absolute path to the location where 
-  #   you want the screenshot saved.
-  # @param [Hash]    hashes    A list of hashes to compare.  If the hashes
-  #   match the hashes of what you are trying to take a screenshot of,
-  #   this method will return a boolean value instead of an actual
-  #   screenshot.
-  # @param [Integer] time_out  Specifies how long we should wait before
-  #   timing out.
+  # Returns a visual hash sum of the document.  It takes a screenshot of
+  # the page and generates an MD5 hash sum of it.
+  #
+  # @return [String]          A hash sum.
   #
-  # @return [Object]  A ScreenShotReply object.
-  # @return [Boolean] True/false depending on whether you have given a
-  #   hash as an argument.
-  def screenshot(file_name, hashes=[], time_out=2)
-    driver.saveScreenshot(file_name, time_out, hashes.to_java(:string))
-  end
 
-  def visual_hash(time_out=50)
-    document.visual_hash time_out
+  def visual_hash
+    document.visual_hash
   end
 
   # Raw finders
@@ -168,9 +159,23 @@ class OperaWatir::Window
   alias_method :find_by_class, :find_by_class_name
   alias_method :find_by_tag, :find_by_tag_name
 
+  #
+  # Finds the root element of the document.  For HTML document, this is
+  # the element with the tagName “HTML”.
+  #
+  # @return [Element] The root element of the document.
+  #
+
+  def document
+    find_by_css(':root')
+  end
+
+  #
   # Finds all elements in document.
   #
   # @return [Collection] A collection of elements.
+  #
+
   def elements
     find_by_tag('*')
   end
@@ -185,61 +190,42 @@ class OperaWatir::Window
 
 private
 
-  # Locate elements by id.
-  #
-  # @return [Array] An array of found elements.
   def find_elements_by_id(value)
     driver.findElementsById(value).to_a.map do |node|
       OperaWatir::Element.new(node)
     end
   end
 
-  # Locate elements by class.
-  #
-  # @return [Array] An array of found elements.
   def find_elements_by_class_name(value)
     driver.findElementsByClassName(value).to_a.map do |node|
       OperaWatir::Element.new(node)
     end
   end
 
-  # Locate elements by tag name.
-  #
-  # @return [Array] An array of found elements.
   def find_elements_by_tag_name(value)
     driver.findElementsByTagName(value).to_a.map do |node|
       OperaWatir::Element.new(node)
     end
   end
 
-  # Locate elements by CSS selector.
-  #
-  # @return [Array] An array of found elements.
   def find_elements_by_css(value)
     driver.findElementsByCssSelector(value).to_a.map do |node|
       OperaWatir::Element.new(node)
     end
   end
 
-  # Locate elements by XPath expression.
-  #
-  # @return [Array] An array of found elements.
   def find_elements_by_xpath(value)
     driver.findElementsByXPath(value).to_a.map do |node|
       OperaWatir::Element.new(node)
     end
   end
 
-  # Locate elements by attribute @name.
-  #
-  # @return [Array] An array of found elements.
   def find_elements_by_name(value)
     driver.findElementsByName(value).to_a.map do |node|
       OperaWatir::Element.new(node)
     end
   end
 
-  # @private
   def driver
     browser.driver
   end

data/operawatir.gemspec

@@ -5,20 +5,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{operawatir}
-  s.version = "0.3.5"
+  s.version = "0.4.1"
   s.platform = %q{jruby}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Deniz Turkoglu", "Andreas Tolf Tolfsen", "Chris Lloyd", "Stuart Knightley"]
-  s.date = %q{2011-02-08}
+  s.authors = ["Andreas Tolf Tolfsen", "Chris Lloyd", "Stuart Knightley", "Deniz Turkoglu"]
+  s.date = %q{2011-05-19}
   s.description = %q{    OperaWatir is a part of the Watir (pronounced water) family of
-    free software Ruby libraries for automating web
-    browsers.  OperaWatir provides a querying engine and Ruby bindings
-    for a backend Java library, OperaDriver, for driving the Opera web
-    browser.  It aims for full compliancy with the watirspec
-    specification.
+    free software Ruby libraries for automating web browsers.
+    OperaWatir provides a querying engine and Ruby bindings for a
+    backend Java library, OperaDriver, for driving the Opera web
+    browser.  It aims for full compliancy with the Watir 2 and Watir 3
+    specifications.
 }
-  s.email = ["dturkoglu@opera.com", "andreastt@opera.com", "christopherl@opera.com", "stuartk@opera.com"]
+  s.email = ["andreastt@opera.com", "christopherl@opera.com", "stuartk@opera.com", "dturkoglu@opera.com"]
   s.executables = ["desktopwatir", "operawatir"]
   s.extra_rdoc_files = [
     "README.md"
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     ".gitmodules",
     ".yardopts",
     "AUTHORS",
+    "CHANGES",
     "Gemfile",
     "LICENSE",
     "README.md",
@@ -36,10 +37,10 @@ Gem::Specification.new do |s|
     "bin/operawatir",
     "lib/operadriver/APACHE_2.0_LICENSE.txt",
     "lib/operadriver/NEW_BSD_LICENSE.txt",
+    "lib/operadriver/client-combined-nodeps.jar",
     "lib/operadriver/commons-io-2.0.1.jar",
     "lib/operadriver/commons-jxpath-1.3.jar",
     "lib/operadriver/protobuf-java-2.3.0.jar",
-    "lib/operadriver/selenium-common.jar",
     "lib/operadriver/webdriver-opera.jar",
     "lib/operawatir.rb",
     "lib/operawatir/browser.rb",
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
     "lib/operawatir/compat/collection.rb",
     "lib/operawatir/compat/element.rb",
     "lib/operawatir/compat/element_finders.rb",
+    "lib/operawatir/compat/selector.rb",
     "lib/operawatir/compat/window.rb",
     "lib/operawatir/desktop-waiter.rb",
     "lib/operawatir/desktop_browser.rb",
@@ -70,6 +72,9 @@ Gem::Specification.new do |s|
     "lib/operawatir/quickwidgets/quick_dialogtab.rb",
     "lib/operawatir/quickwidgets/quick_dropdown.rb",
     "lib/operawatir/quickwidgets/quick_editfield.rb",
+    "lib/operawatir/quickwidgets/quick_find.rb",
+    "lib/operawatir/quickwidgets/quick_griditem.rb",
+    "lib/operawatir/quickwidgets/quick_gridlayout.rb",
     "lib/operawatir/quickwidgets/quick_label.rb",
     "lib/operawatir/quickwidgets/quick_radiobutton.rb",
     "lib/operawatir/quickwidgets/quick_searchfield.rb",
@@ -80,6 +85,7 @@ Gem::Specification.new do |s|
     "lib/operawatir/quickwidgets/quick_treeview.rb",
     "lib/operawatir/quickwidgets/quick_widget.rb",
     "lib/operawatir/quickwidgets/quick_window.rb",
+    "lib/operawatir/screenshot.rb",
     "lib/operawatir/selector.rb",
     "lib/operawatir/spatnav.rb",
     "lib/operawatir/version.rb",
@@ -97,233 +103,301 @@ Gem::Specification.new do |s|
     "spec/fire_event/interactive/onMouseOver.html",
     "spec/fire_event/interactive/onMouseUp.html",
     "spec/fire_event/interactive/onScroll.html",
-    "spec/legacy_watirspec/area_spec.rb",
-    "spec/legacy_watirspec/areas_spec.rb",
-    "spec/legacy_watirspec/browser_spec.rb",
-    "spec/legacy_watirspec/button_spec.rb",
-    "spec/legacy_watirspec/buttons_spec.rb",
-    "spec/legacy_watirspec/checkbox_spec.rb",
-    "spec/legacy_watirspec/checkboxes_spec.rb",
-    "spec/legacy_watirspec/collections_spec.rb",
-    "spec/legacy_watirspec/dd_spec.rb",
-    "spec/legacy_watirspec/dds_spec.rb",
-    "spec/legacy_watirspec/del_spec.rb",
-    "spec/legacy_watirspec/dels_spec.rb",
-    "spec/legacy_watirspec/div_spec.rb",
-    "spec/legacy_watirspec/divs_spec.rb",
-    "spec/legacy_watirspec/dl_spec.rb",
-    "spec/legacy_watirspec/dls_spec.rb",
-    "spec/legacy_watirspec/dt_spec.rb",
-    "spec/legacy_watirspec/dts_spec.rb",
-    "spec/legacy_watirspec/element_spec.rb",
-    "spec/legacy_watirspec/em_spec.rb",
-    "spec/legacy_watirspec/ems_spec.rb",
-    "spec/legacy_watirspec/filefield_spec.rb",
-    "spec/legacy_watirspec/filefields_spec.rb",
-    "spec/legacy_watirspec/fixtures/2000_spans.html",
-    "spec/legacy_watirspec/fixtures/bug_duplicate_attributes.html",
-    "spec/legacy_watirspec/fixtures/bug_javascript_001.html",
-    "spec/legacy_watirspec/fixtures/buttons_with_duplicate_ids.html",
-    "spec/legacy_watirspec/fixtures/collections.html",
-    "spec/legacy_watirspec/fixtures/definition_lists.html",
-    "spec/legacy_watirspec/fixtures/euc-jp_text.html",
-    "spec/legacy_watirspec/fixtures/forms_with_input_elements.html",
-    "spec/legacy_watirspec/fixtures/frame_1.html",
-    "spec/legacy_watirspec/fixtures/frame_2.html",
-    "spec/legacy_watirspec/fixtures/frames.html",
-    "spec/legacy_watirspec/fixtures/iframes.html",
-    "spec/legacy_watirspec/fixtures/images.html",
-    "spec/legacy_watirspec/fixtures/images/1.gif",
-    "spec/legacy_watirspec/fixtures/images/2.gif",
-    "spec/legacy_watirspec/fixtures/images/3.gif",
-    "spec/legacy_watirspec/fixtures/images/button.jpg",
-    "spec/legacy_watirspec/fixtures/images/circle.jpg",
-    "spec/legacy_watirspec/fixtures/images/map.gif",
-    "spec/legacy_watirspec/fixtures/images/map2.gif",
-    "spec/legacy_watirspec/fixtures/images/minus.gif",
-    "spec/legacy_watirspec/fixtures/images/originaltriangle.jpg",
-    "spec/legacy_watirspec/fixtures/images/plus.gif",
-    "spec/legacy_watirspec/fixtures/images/square.jpg",
-    "spec/legacy_watirspec/fixtures/images/triangle.jpg",
-    "spec/legacy_watirspec/fixtures/iso-2022-jp_text.html",
-    "spec/legacy_watirspec/fixtures/javascript/helpers.js",
-    "spec/legacy_watirspec/fixtures/jquery.html",
-    "spec/legacy_watirspec/fixtures/latin1_text.html",
-    "spec/legacy_watirspec/fixtures/multiple_ids.html",
-    "spec/legacy_watirspec/fixtures/non_control_elements.html",
-    "spec/legacy_watirspec/fixtures/parser_bug_001.html",
-    "spec/legacy_watirspec/fixtures/prevent_form_submit.html",
-    "spec/legacy_watirspec/fixtures/right_click.html",
-    "spec/legacy_watirspec/fixtures/shift_jis_text.html",
-    "spec/legacy_watirspec/fixtures/tables.html",
-    "spec/legacy_watirspec/fixtures/timeout.html",
-    "spec/legacy_watirspec/fixtures/timeout_window_location.html",
-    "spec/legacy_watirspec/fixtures/tiny_mce.html",
-    "spec/legacy_watirspec/fixtures/utf8_text.html",
-    "spec/legacy_watirspec/fixtures/watirspec.css",
-    "spec/legacy_watirspec/form_spec.rb",
-    "spec/legacy_watirspec/forms_spec.rb",
-    "spec/legacy_watirspec/frame_spec.rb",
-    "spec/legacy_watirspec/frames_spec.rb",
-    "spec/legacy_watirspec/guards.rb",
-    "spec/legacy_watirspec/hidden_spec.rb",
-    "spec/legacy_watirspec/hiddens_spec.rb",
-    "spec/legacy_watirspec/hn_spec.rb",
-    "spec/legacy_watirspec/hns_spec.rb",
-    "spec/legacy_watirspec/image_spec.rb",
-    "spec/legacy_watirspec/images_spec.rb",
-    "spec/legacy_watirspec/ins_spec.rb",
-    "spec/legacy_watirspec/inses_spec.rb",
-    "spec/legacy_watirspec/label_spec.rb",
-    "spec/legacy_watirspec/labels_spec.rb",
-    "spec/legacy_watirspec/li_spec.rb",
-    "spec/legacy_watirspec/link_spec.rb",
-    "spec/legacy_watirspec/links_spec.rb",
-    "spec/legacy_watirspec/lis_spec.rb",
-    "spec/legacy_watirspec/map_spec.rb",
-    "spec/legacy_watirspec/maps_spec.rb",
-    "spec/legacy_watirspec/meta_spec.rb",
-    "spec/legacy_watirspec/metas_spec.rb",
-    "spec/legacy_watirspec/ol_spec.rb",
-    "spec/legacy_watirspec/ols_spec.rb",
-    "spec/legacy_watirspec/option_spec.rb",
-    "spec/legacy_watirspec/p_spec.rb",
-    "spec/legacy_watirspec/pre_spec.rb",
-    "spec/legacy_watirspec/pres_spec.rb",
-    "spec/legacy_watirspec/ps_spec.rb",
-    "spec/legacy_watirspec/radio_spec.rb",
-    "spec/legacy_watirspec/radios_spec.rb",
-    "spec/legacy_watirspec/select_list_spec.rb",
-    "spec/legacy_watirspec/select_lists_spec.rb",
-    "spec/legacy_watirspec/server.rb",
-    "spec/legacy_watirspec/span_spec.rb",
-    "spec/legacy_watirspec/spans_spec.rb",
-    "spec/legacy_watirspec/spec_helper.rb",
-    "spec/legacy_watirspec/strong_spec.rb",
-    "spec/legacy_watirspec/strongs_spec.rb",
-    "spec/legacy_watirspec/table_bodies_spec.rb",
-    "spec/legacy_watirspec/table_body_spec.rb",
-    "spec/legacy_watirspec/table_cell_spec.rb",
-    "spec/legacy_watirspec/table_cells_spec.rb",
-    "spec/legacy_watirspec/table_footer_spec.rb",
-    "spec/legacy_watirspec/table_footers_spec.rb",
-    "spec/legacy_watirspec/table_header_spec.rb",
-    "spec/legacy_watirspec/table_headers_spec.rb",
-    "spec/legacy_watirspec/table_row_spec.rb",
-    "spec/legacy_watirspec/table_rows_spec.rb",
-    "spec/legacy_watirspec/table_spec.rb",
-    "spec/legacy_watirspec/tables_spec.rb",
-    "spec/legacy_watirspec/text_field_spec.rb",
-    "spec/legacy_watirspec/text_fields_spec.rb",
-    "spec/legacy_watirspec/ul_spec.rb",
-    "spec/legacy_watirspec/uls_spec.rb",
-    "spec/legacy_watirspec/watir_compatibility_spec.rb",
-    "spec/legacy_watirspec/watirspec_helper.rb",
+    "spec/operawatir/README.md",
+    "spec/operawatir/core/browser_spec.rb",
+    "spec/operawatir/core/element_spec.rb",
+    "spec/operawatir/core/preferences_spec.rb",
+    "spec/operawatir/core/screenshot_spec.rb",
+    "spec/operawatir/core/spatnav_spec.rb",
+    "spec/operawatir/core/window_spec.rb",
+    "spec/operawatir/desktop/desktopbrowser_spec.rb",
+    "spec/operawatir/desktop/quickaddressfield_spec.rb",
+    "spec/operawatir/desktop/quickbutton_spec.rb",
+    "spec/operawatir/desktop/quickcheckbox_spec.rb",
+    "spec/operawatir/desktop/quickdialogtab_spec.rb",
+    "spec/operawatir/desktop/quickdropdown_spec.rb",
+    "spec/operawatir/desktop/quickeditfield_spec.rb",
+    "spec/operawatir/desktop/quickfind_spec.rb",
+    "spec/operawatir/desktop/quickgriditem_spec.rb",
+    "spec/operawatir/desktop/quickgridlayout_spec.rb",
+    "spec/operawatir/desktop/quicklabel_spec.rb",
+    "spec/operawatir/desktop/quickradiobutton_spec.rb",
+    "spec/operawatir/desktop/quicksearchfield_spec.rb",
+    "spec/operawatir/desktop/quicktab_spec.rb",
+    "spec/operawatir/desktop/quickthumbnail_spec.rb",
+    "spec/operawatir/desktop/quicktreeitem_spec.rb",
+    "spec/operawatir/desktop/quicktreeview_spec.rb",
+    "spec/operawatir/desktop/quickwidget_spec.rb",
+    "spec/operawatir/desktop/quickwindow_spec.rb",
+    "spec/operawatir/desktop/shared/shared.rb",
+    "spec/operawatir/fixtures/boxes.html",
+    "spec/operawatir/fixtures/browsers.svg",
+    "spec/operawatir/fixtures/frames.html",
+    "spec/operawatir/fixtures/grid.html",
+    "spec/operawatir/fixtures/input_fields_value.html",
+    "spec/operawatir/fixtures/onclick.html",
+    "spec/operawatir/fixtures/paragraphs.html",
+    "spec/operawatir/fixtures/two_input_fields.html",
+    "spec/operawatir/guards.rb",
+    "spec/operawatir/matchers.rb",
+    "spec/operawatir/server.rb",
+    "spec/operawatir/watirspec.rake",
+    "spec/operawatir/watirspec_desktophelper.rb",
+    "spec/operawatir/watirspec_helper.rb",
+    "spec/watir2/area_spec.rb",
+    "spec/watir2/areas_spec.rb",
+    "spec/watir2/browser_spec.rb",
+    "spec/watir2/button_spec.rb",
+    "spec/watir2/buttons_spec.rb",
+    "spec/watir2/checkbox_spec.rb",
+    "spec/watir2/checkboxes_spec.rb",
+    "spec/watir2/collections_spec.rb",
+    "spec/watir2/dd_spec.rb",
+    "spec/watir2/dds_spec.rb",
+    "spec/watir2/del_spec.rb",
+    "spec/watir2/dels_spec.rb",
+    "spec/watir2/div_spec.rb",
+    "spec/watir2/divs_spec.rb",
+    "spec/watir2/dl_spec.rb",
+    "spec/watir2/dls_spec.rb",
+    "spec/watir2/dt_spec.rb",
+    "spec/watir2/dts_spec.rb",
+    "spec/watir2/element_spec.rb",
+    "spec/watir2/em_spec.rb",
+    "spec/watir2/ems_spec.rb",
+    "spec/watir2/filefield_spec.rb",
+    "spec/watir2/filefields_spec.rb",
+    "spec/watir2/fixtures/2000_spans.html",
+    "spec/watir2/fixtures/bug_duplicate_attributes.html",
+    "spec/watir2/fixtures/bug_javascript_001.html",
+    "spec/watir2/fixtures/buttons_with_duplicate_ids.html",
+    "spec/watir2/fixtures/collections.html",
+    "spec/watir2/fixtures/definition_lists.html",
+    "spec/watir2/fixtures/euc-jp_text.html",
+    "spec/watir2/fixtures/forms_with_input_elements.html",
+    "spec/watir2/fixtures/frame_1.html",
+    "spec/watir2/fixtures/frame_2.html",
+    "spec/watir2/fixtures/frames.html",
+    "spec/watir2/fixtures/iframes.html",
+    "spec/watir2/fixtures/images.html",
+    "spec/watir2/fixtures/images/1.gif",
+    "spec/watir2/fixtures/images/2.gif",
+    "spec/watir2/fixtures/images/3.gif",
+    "spec/watir2/fixtures/images/button.jpg",
+    "spec/watir2/fixtures/images/circle.jpg",
+    "spec/watir2/fixtures/images/map.gif",
+    "spec/watir2/fixtures/images/map2.gif",
+    "spec/watir2/fixtures/images/minus.gif",
+    "spec/watir2/fixtures/images/originaltriangle.jpg",
+    "spec/watir2/fixtures/images/plus.gif",
+    "spec/watir2/fixtures/images/square.jpg",
+    "spec/watir2/fixtures/images/triangle.jpg",
+    "spec/watir2/fixtures/iso-2022-jp_text.html",
+    "spec/watir2/fixtures/javascript/helpers.js",
+    "spec/watir2/fixtures/jquery.html",
+    "spec/watir2/fixtures/latin1_text.html",
+    "spec/watir2/fixtures/multiple_ids.html",
+    "spec/watir2/fixtures/non_control_elements.html",
+    "spec/watir2/fixtures/parser_bug_001.html",
+    "spec/watir2/fixtures/prevent_form_submit.html",
+    "spec/watir2/fixtures/right_click.html",
+    "spec/watir2/fixtures/shift_jis_text.html",
+    "spec/watir2/fixtures/tables.html",
+    "spec/watir2/fixtures/timeout.html",
+    "spec/watir2/fixtures/timeout_window_location.html",
+    "spec/watir2/fixtures/tiny_mce.html",
+    "spec/watir2/fixtures/utf8_text.html",
+    "spec/watir2/fixtures/watirspec.css",
+    "spec/watir2/form_spec.rb",
+    "spec/watir2/forms_spec.rb",
+    "spec/watir2/frame_spec.rb",
+    "spec/watir2/frames_spec.rb",
+    "spec/watir2/guards.rb",
+    "spec/watir2/hidden_spec.rb",
+    "spec/watir2/hiddens_spec.rb",
+    "spec/watir2/hn_spec.rb",
+    "spec/watir2/hns_spec.rb",
+    "spec/watir2/image_spec.rb",
+    "spec/watir2/images_spec.rb",
+    "spec/watir2/ins_spec.rb",
+    "spec/watir2/inses_spec.rb",
+    "spec/watir2/label_spec.rb",
+    "spec/watir2/labels_spec.rb",
+    "spec/watir2/li_spec.rb",
+    "spec/watir2/link_spec.rb",
+    "spec/watir2/links_spec.rb",
+    "spec/watir2/lis_spec.rb",
+    "spec/watir2/map_spec.rb",
+    "spec/watir2/maps_spec.rb",
+    "spec/watir2/meta_spec.rb",
+    "spec/watir2/metas_spec.rb",
+    "spec/watir2/ol_spec.rb",
+    "spec/watir2/ols_spec.rb",
+    "spec/watir2/option_spec.rb",
+    "spec/watir2/p_spec.rb",
+    "spec/watir2/pre_spec.rb",
+    "spec/watir2/pres_spec.rb",
+    "spec/watir2/ps_spec.rb",
+    "spec/watir2/radio_spec.rb",
+    "spec/watir2/radios_spec.rb",
+    "spec/watir2/select_list_spec.rb",
+    "spec/watir2/select_lists_spec.rb",
+    "spec/watir2/server.rb",
+    "spec/watir2/span_spec.rb",
+    "spec/watir2/spans_spec.rb",
+    "spec/watir2/spec_helper.rb",
+    "spec/watir2/strong_spec.rb",
+    "spec/watir2/strongs_spec.rb",
+    "spec/watir2/table_bodies_spec.rb",
+    "spec/watir2/table_body_spec.rb",
+    "spec/watir2/table_cell_spec.rb",
+    "spec/watir2/table_cells_spec.rb",
+    "spec/watir2/table_footer_spec.rb",
+    "spec/watir2/table_footers_spec.rb",
+    "spec/watir2/table_header_spec.rb",
+    "spec/watir2/table_headers_spec.rb",
+    "spec/watir2/table_row_spec.rb",
+    "spec/watir2/table_rows_spec.rb",
+    "spec/watir2/table_spec.rb",
+    "spec/watir2/tables_spec.rb",
+    "spec/watir2/text_field_spec.rb",
+    "spec/watir2/text_fields_spec.rb",
+    "spec/watir2/ul_spec.rb",
+    "spec/watir2/uls_spec.rb",
+    "spec/watir2/watir_compatibility_spec.rb",
+    "spec/watir2/watirspec_helper.rb",
     "utils/Rakefile",
     "utils/formatters/operahelper_formatter.rb",
     "utils/formatters/spartan_formatter.rb"
   ]
-  s.homepage = %q{http://operasoftware.github.com/operawatir}
+  s.homepage = %q{http://www.opera.com/developer/tools/operawatir/}
   s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
   s.rubyforge_project = %q{operawatir}
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Toolkit for automating interactions with the Opera web browser.}
   s.test_files = [
     "spec/fire_event/fire_event.rb",
-    "spec/legacy_watirspec/area_spec.rb",
-    "spec/legacy_watirspec/areas_spec.rb",
-    "spec/legacy_watirspec/browser_spec.rb",
-    "spec/legacy_watirspec/button_spec.rb",
-    "spec/legacy_watirspec/buttons_spec.rb",
-    "spec/legacy_watirspec/checkbox_spec.rb",
-    "spec/legacy_watirspec/checkboxes_spec.rb",
-    "spec/legacy_watirspec/collections_spec.rb",
-    "spec/legacy_watirspec/dd_spec.rb",
-    "spec/legacy_watirspec/dds_spec.rb",
-    "spec/legacy_watirspec/del_spec.rb",
-    "spec/legacy_watirspec/dels_spec.rb",
-    "spec/legacy_watirspec/div_spec.rb",
-    "spec/legacy_watirspec/divs_spec.rb",
-    "spec/legacy_watirspec/dl_spec.rb",
-    "spec/legacy_watirspec/dls_spec.rb",
-    "spec/legacy_watirspec/dt_spec.rb",
-    "spec/legacy_watirspec/dts_spec.rb",
-    "spec/legacy_watirspec/element_spec.rb",
-    "spec/legacy_watirspec/em_spec.rb",
-    "spec/legacy_watirspec/ems_spec.rb",
-    "spec/legacy_watirspec/filefield_spec.rb",
-    "spec/legacy_watirspec/filefields_spec.rb",
-    "spec/legacy_watirspec/form_spec.rb",
-    "spec/legacy_watirspec/forms_spec.rb",
-    "spec/legacy_watirspec/frame_spec.rb",
-    "spec/legacy_watirspec/frames_spec.rb",
-    "spec/legacy_watirspec/guards.rb",
-    "spec/legacy_watirspec/hidden_spec.rb",
-    "spec/legacy_watirspec/hiddens_spec.rb",
-    "spec/legacy_watirspec/hn_spec.rb",
-    "spec/legacy_watirspec/hns_spec.rb",
-    "spec/legacy_watirspec/image_spec.rb",
-    "spec/legacy_watirspec/images_spec.rb",
-    "spec/legacy_watirspec/ins_spec.rb",
-    "spec/legacy_watirspec/inses_spec.rb",
-    "spec/legacy_watirspec/label_spec.rb",
-    "spec/legacy_watirspec/labels_spec.rb",
-    "spec/legacy_watirspec/li_spec.rb",
-    "spec/legacy_watirspec/link_spec.rb",
-    "spec/legacy_watirspec/links_spec.rb",
-    "spec/legacy_watirspec/lis_spec.rb",
-    "spec/legacy_watirspec/map_spec.rb",
-    "spec/legacy_watirspec/maps_spec.rb",
-    "spec/legacy_watirspec/meta_spec.rb",
-    "spec/legacy_watirspec/metas_spec.rb",
-    "spec/legacy_watirspec/ol_spec.rb",
-    "spec/legacy_watirspec/ols_spec.rb",
-    "spec/legacy_watirspec/option_spec.rb",
-    "spec/legacy_watirspec/p_spec.rb",
-    "spec/legacy_watirspec/pre_spec.rb",
-    "spec/legacy_watirspec/pres_spec.rb",
-    "spec/legacy_watirspec/ps_spec.rb",
-    "spec/legacy_watirspec/radio_spec.rb",
-    "spec/legacy_watirspec/radios_spec.rb",
-    "spec/legacy_watirspec/select_list_spec.rb",
-    "spec/legacy_watirspec/select_lists_spec.rb",
-    "spec/legacy_watirspec/server.rb",
-    "spec/legacy_watirspec/span_spec.rb",
-    "spec/legacy_watirspec/spans_spec.rb",
-    "spec/legacy_watirspec/spec_helper.rb",
-    "spec/legacy_watirspec/strong_spec.rb",
-    "spec/legacy_watirspec/strongs_spec.rb",
-    "spec/legacy_watirspec/table_bodies_spec.rb",
-    "spec/legacy_watirspec/table_body_spec.rb",
-    "spec/legacy_watirspec/table_cell_spec.rb",
-    "spec/legacy_watirspec/table_cells_spec.rb",
-    "spec/legacy_watirspec/table_footer_spec.rb",
-    "spec/legacy_watirspec/table_footers_spec.rb",
-    "spec/legacy_watirspec/table_header_spec.rb",
-    "spec/legacy_watirspec/table_headers_spec.rb",
-    "spec/legacy_watirspec/table_row_spec.rb",
-    "spec/legacy_watirspec/table_rows_spec.rb",
-    "spec/legacy_watirspec/table_spec.rb",
-    "spec/legacy_watirspec/tables_spec.rb",
-    "spec/legacy_watirspec/text_field_spec.rb",
-    "spec/legacy_watirspec/text_fields_spec.rb",
-    "spec/legacy_watirspec/ul_spec.rb",
-    "spec/legacy_watirspec/uls_spec.rb",
-    "spec/legacy_watirspec/watir_compatibility_spec.rb",
-    "spec/legacy_watirspec/watirspec_helper.rb",
-    "spec/new_watirspec/browser_spec.rb",
-    "spec/new_watirspec/clipboard_spec.rb",
-    "spec/new_watirspec/collection_spec.rb",
-    "spec/new_watirspec/element_spec.rb",
-    "spec/new_watirspec/guards.rb",
-    "spec/new_watirspec/keys_spec.rb",
-    "spec/new_watirspec/preferences_spec.rb",
-    "spec/new_watirspec/screenshot_spec.rb",
-    "spec/new_watirspec/server.rb",
-    "spec/new_watirspec/spatnav_spec.rb",
-    "spec/new_watirspec/watirspec_helper.rb",
-    "spec/new_watirspec/window_spec.rb"
+    "spec/operawatir/core/browser_spec.rb",
+    "spec/operawatir/core/element_spec.rb",
+    "spec/operawatir/core/preferences_spec.rb",
+    "spec/operawatir/core/screenshot_spec.rb",
+    "spec/operawatir/core/spatnav_spec.rb",
+    "spec/operawatir/core/window_spec.rb",
+    "spec/operawatir/desktop/desktopbrowser_spec.rb",
+    "spec/operawatir/desktop/quickaddressfield_spec.rb",
+    "spec/operawatir/desktop/quickbutton_spec.rb",
+    "spec/operawatir/desktop/quickcheckbox_spec.rb",
+    "spec/operawatir/desktop/quickdialogtab_spec.rb",
+    "spec/operawatir/desktop/quickdropdown_spec.rb",
+    "spec/operawatir/desktop/quickeditfield_spec.rb",
+    "spec/operawatir/desktop/quickfind_spec.rb",
+    "spec/operawatir/desktop/quickgriditem_spec.rb",
+    "spec/operawatir/desktop/quickgridlayout_spec.rb",
+    "spec/operawatir/desktop/quicklabel_spec.rb",
+    "spec/operawatir/desktop/quickradiobutton_spec.rb",
+    "spec/operawatir/desktop/quicksearchfield_spec.rb",
+    "spec/operawatir/desktop/quicktab_spec.rb",
+    "spec/operawatir/desktop/quickthumbnail_spec.rb",
+    "spec/operawatir/desktop/quicktreeitem_spec.rb",
+    "spec/operawatir/desktop/quicktreeview_spec.rb",
+    "spec/operawatir/desktop/quickwidget_spec.rb",
+    "spec/operawatir/desktop/quickwindow_spec.rb",
+    "spec/operawatir/desktop/shared/shared.rb",
+    "spec/operawatir/guards.rb",
+    "spec/operawatir/matchers.rb",
+    "spec/operawatir/server.rb",
+    "spec/operawatir/watirspec_desktophelper.rb",
+    "spec/operawatir/watirspec_helper.rb",
+    "spec/watir2/area_spec.rb",
+    "spec/watir2/areas_spec.rb",
+    "spec/watir2/browser_spec.rb",
+    "spec/watir2/button_spec.rb",
+    "spec/watir2/buttons_spec.rb",
+    "spec/watir2/checkbox_spec.rb",
+    "spec/watir2/checkboxes_spec.rb",
+    "spec/watir2/collections_spec.rb",
+    "spec/watir2/dd_spec.rb",
+    "spec/watir2/dds_spec.rb",
+    "spec/watir2/del_spec.rb",
+    "spec/watir2/dels_spec.rb",
+    "spec/watir2/div_spec.rb",
+    "spec/watir2/divs_spec.rb",
+    "spec/watir2/dl_spec.rb",
+    "spec/watir2/dls_spec.rb",
+    "spec/watir2/dt_spec.rb",
+    "spec/watir2/dts_spec.rb",
+    "spec/watir2/element_spec.rb",
+    "spec/watir2/em_spec.rb",
+    "spec/watir2/ems_spec.rb",
+    "spec/watir2/filefield_spec.rb",
+    "spec/watir2/filefields_spec.rb",
+    "spec/watir2/form_spec.rb",
+    "spec/watir2/forms_spec.rb",
+    "spec/watir2/frame_spec.rb",
+    "spec/watir2/frames_spec.rb",
+    "spec/watir2/guards.rb",
+    "spec/watir2/hidden_spec.rb",
+    "spec/watir2/hiddens_spec.rb",
+    "spec/watir2/hn_spec.rb",
+    "spec/watir2/hns_spec.rb",
+    "spec/watir2/image_spec.rb",
+    "spec/watir2/images_spec.rb",
+    "spec/watir2/ins_spec.rb",
+    "spec/watir2/inses_spec.rb",
+    "spec/watir2/label_spec.rb",
+    "spec/watir2/labels_spec.rb",
+    "spec/watir2/li_spec.rb",
+    "spec/watir2/link_spec.rb",
+    "spec/watir2/links_spec.rb",
+    "spec/watir2/lis_spec.rb",
+    "spec/watir2/map_spec.rb",
+    "spec/watir2/maps_spec.rb",
+    "spec/watir2/meta_spec.rb",
+    "spec/watir2/metas_spec.rb",
+    "spec/watir2/ol_spec.rb",
+    "spec/watir2/ols_spec.rb",
+    "spec/watir2/option_spec.rb",
+    "spec/watir2/p_spec.rb",
+    "spec/watir2/pre_spec.rb",
+    "spec/watir2/pres_spec.rb",
+    "spec/watir2/ps_spec.rb",
+    "spec/watir2/radio_spec.rb",
+    "spec/watir2/radios_spec.rb",
+    "spec/watir2/select_list_spec.rb",
+    "spec/watir2/select_lists_spec.rb",
+    "spec/watir2/server.rb",
+    "spec/watir2/span_spec.rb",
+    "spec/watir2/spans_spec.rb",
+    "spec/watir2/spec_helper.rb",
+    "spec/watir2/strong_spec.rb",
+    "spec/watir2/strongs_spec.rb",
+    "spec/watir2/table_bodies_spec.rb",
+    "spec/watir2/table_body_spec.rb",
+    "spec/watir2/table_cell_spec.rb",
+    "spec/watir2/table_cells_spec.rb",
+    "spec/watir2/table_footer_spec.rb",
+    "spec/watir2/table_footers_spec.rb",
+    "spec/watir2/table_header_spec.rb",
+    "spec/watir2/table_headers_spec.rb",
+    "spec/watir2/table_row_spec.rb",
+    "spec/watir2/table_rows_spec.rb",
+    "spec/watir2/table_spec.rb",
+    "spec/watir2/tables_spec.rb",
+    "spec/watir2/text_field_spec.rb",
+    "spec/watir2/text_fields_spec.rb",
+    "spec/watir2/ul_spec.rb",
+    "spec/watir2/uls_spec.rb",
+    "spec/watir2/watir_compatibility_spec.rb",
+    "spec/watir2/watirspec_helper.rb",
+    "spec/watir3/browser_spec.rb",
+    "spec/watir3/clipboard_spec.rb",
+    "spec/watir3/collection_spec.rb",
+    "spec/watir3/element_spec.rb",
+    "spec/watir3/guards.rb",
+    "spec/watir3/keys_spec.rb",
+    "spec/watir3/server.rb",
+    "spec/watir3/watirspec_helper.rb",
+    "spec/watir3/window_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -333,20 +407,17 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<bluecloth>, ["= 1.0.1"])
+      s.add_development_dependency(%q<BlueCloth>, ["= 1.0.1"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<mongrel>, [">= 1.1.5"])
       s.add_development_dependency(%q<sinatra>, [">= 1.1"])
       s.add_development_dependency(%q<rr>, [">= 0"])
       s.add_development_dependency(%q<clipboard>, [">= 0"])
-      s.add_runtime_dependency(%q<rspec>, ["= 2.4"])
-      s.add_runtime_dependency(%q<inifile>, [">= 0.3"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.1"])
+      s.add_runtime_dependency(%q<rspec>, [">= 2.4"])
       s.add_runtime_dependency(%q<deprecated>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<bluecloth>, ["= 1.0.1"])
+      s.add_development_dependency(%q<BlueCloth>, ["= 1.0.1"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<mongrel>, [">= 1.1.5"])
       s.add_development_dependency(%q<sinatra>, [">= 1.1"])
@@ -355,20 +426,17 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<bluecloth>, ["= 1.0.1"])
+      s.add_dependency(%q<BlueCloth>, ["= 1.0.1"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<mongrel>, [">= 1.1.5"])
       s.add_dependency(%q<sinatra>, [">= 1.1"])
       s.add_dependency(%q<rr>, [">= 0"])
       s.add_dependency(%q<clipboard>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["= 2.4"])
-      s.add_dependency(%q<inifile>, [">= 0.3"])
-      s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.1"])
+      s.add_dependency(%q<rspec>, [">= 2.4"])
       s.add_dependency(%q<deprecated>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<bluecloth>, ["= 1.0.1"])
+      s.add_dependency(%q<BlueCloth>, ["= 1.0.1"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<mongrel>, [">= 1.1.5"])
       s.add_dependency(%q<sinatra>, [">= 1.1"])
@@ -378,20 +446,17 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<bluecloth>, ["= 1.0.1"])
+    s.add_dependency(%q<BlueCloth>, ["= 1.0.1"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<mongrel>, [">= 1.1.5"])
     s.add_dependency(%q<sinatra>, [">= 1.1"])
     s.add_dependency(%q<rr>, [">= 0"])
     s.add_dependency(%q<clipboard>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["= 2.4"])
-    s.add_dependency(%q<inifile>, [">= 0.3"])
-    s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.1"])
+    s.add_dependency(%q<rspec>, [">= 2.4"])
     s.add_dependency(%q<deprecated>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<bluecloth>, ["= 1.0.1"])
+    s.add_dependency(%q<BlueCloth>, ["= 1.0.1"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<mongrel>, [">= 1.1.5"])
     s.add_dependency(%q<sinatra>, [">= 1.1"])