watirsplash 2.4.2 → 2.4.3

data/Gemfile

@@ -1,18 +1,22 @@
-source :rubygems
-
+source :rubygems 
 # load WatirSplash and it's dependencies
 gemspec
 
 platforms :mingw, :mswin do
-    gem "watir", WatirSplash::Version::WATIR
-    gem "win32screenshot", WatirSplash::Version::WIN32SCREENSHOT, :require => "win32/screenshot"
+  gem "watir", WatirSplash::Version::WATIR
+  gem "win32screenshot", WatirSplash::Version::WIN32SCREENSHOT
 end
 
 gem "watir-webdriver", WatirSplash::Version::WATIR_WEBDRIVER
-gem "firewatir", ">= 1.9.4"
-gem "rspec", "~>2.6.0"
-gem "spork", "~>0.9.0.rc9"
-gem "spork-local_process"
+gem "rspec", "~>2.9.0"
+gem "spork", "~>0.9.0"
+gem "spork-local_process", "~> 0.0.7"
 
 # add your project specific dependencies here:
-# gem "ruby-debug", "0.10.3"
+platforms :mri_18, :ruby_18, :mingw_18 do
+  # gem "ruby-debug", "0.10.3"
+end
+
+platforms :mri_19, :ruby_19, :mingw_19 do
+  # gem "ruby-debug19"
+end

data/Gemfile.lock

@@ -1,93 +1,94 @@
-PATH
-  remote: .
-  specs:
-    watirsplash (2.4.2)
-      bundler (~> 1.0)
-      rake (= 0.8.7)
-      require_all
-      syntax
-      thor (~> 0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    builder (3.0.0)
-    childprocess (0.2.2)
-      ffi (~> 1.0.6)
-    commonwatir (2.0.2)
-      user-choices
-    diff-lcs (1.1.3)
-    ffi (1.0.9-x86-mingw32)
-    firewatir (1.9.4)
-      commonwatir (>= 1.9.2)
-    hoe (2.12.3)
-      rake (~> 0.8)
-    json_pure (1.6.1)
-    mini_magick (3.2.1)
-      subexec (~> 0.0.4)
-    nokogiri (1.5.0-x86-mingw32)
-    rake (0.8.7)
-    rautomation (0.6.3)
-    require_all (1.2.0)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rubyzip (0.9.4)
-    s4t-utils (1.0.4)
-      hoe (>= 1.3.0)
-    selenium-webdriver (2.8.0)
-      childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
-      json_pure
-      rubyzip
-    spork (0.9.0.rc9-x86-mingw32)
-      win32-process
-    spork-local_process (0.0.6)
-      spork (~> 0.9.0.rc9)
-    subexec (0.0.4)
-    syntax (1.0.0)
-    thor (0.14.6)
-    user-choices (1.1.6.1)
-      builder (>= 2.1.2)
-      s4t-utils (>= 1.0.3)
-      xml-simple (>= 1.0.11)
-    watir (2.0.2)
-      commonwatir (= 2.0.2)
-      ffi (~> 1.0)
-      nokogiri
-      rautomation (~> 0.6.3)
-      win32-process (>= 0.5.5)
-      windows-pr (>= 0.6.6)
-    watir-webdriver (0.3.5)
-      selenium-webdriver (>= 0.2.2)
-    win32-api (1.4.8-x86-mingw32)
-    win32-process (0.6.5)
-      windows-pr (>= 1.1.2)
-    win32screenshot (1.0.5)
-      ffi (~> 1.0)
-      mini_magick (~> 3.2.0)
-      rautomation (~> 0.6.3)
-    windows-api (0.4.0)
-      win32-api (>= 1.4.5)
-    windows-pr (1.2.1)
-      win32-api (>= 1.4.5)
-      windows-api (>= 0.3.0)
-    xml-simple (1.1.0)
-
-PLATFORMS
-  x86-mingw32
-
-DEPENDENCIES
-  firewatir (>= 1.9.4)
-  rspec (~> 2.6.0)
-  spork (~> 0.9.0.rc9)
-  spork-local_process
-  watir (= 2.0.2)
-  watir-webdriver (~> 0.3.5)
-  watirsplash!
-  win32screenshot (~> 1.0.5)
+PATH
+  remote: .
+  specs:
+    watirsplash (2.4.3)
+      require_all
+      syntax
+      thor (~> 0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.7)
+    builder (3.0.0)
+    childprocess (0.3.2)
+      ffi (~> 1.0.6)
+    commonwatir (3.0.0)
+    diff-lcs (1.1.3)
+    ffi (1.0.11)
+    hoe (3.0.3)
+      rake (~> 0.8)
+    libwebsocket (0.1.3)
+      addressable
+    mini_magick (3.2.1)
+      subexec (~> 0.0.4)
+    multi_json (1.3.2)
+    nokogiri (1.5.2-x86-mingw32)
+    rake (0.9.2.2)
+    rautomation (0.7.2)
+    require_all (1.2.1)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rubyzip (0.9.7)
+    s4t-utils (1.0.4)
+      hoe (>= 1.3.0)
+    selenium-webdriver (2.21.2)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
+      rubyzip
+    spork (0.9.0-x86-mingw32)
+      win32-process
+    spork-local_process (0.0.7)
+      spork (~> 0.9.0)
+    subexec (0.0.4)
+    syntax (1.0.0)
+    thor (0.14.6)
+    user-choices (1.1.6.1)
+      builder (>= 2.1.2)
+      s4t-utils (>= 1.0.3)
+      xml-simple (>= 1.0.11)
+    watir (3.0.0)
+      commonwatir (= 3.0.0)
+      watir-classic (~> 3)
+    watir-classic (3.0.0)
+      ffi (~> 1.0)
+      nokogiri
+      rautomation (~> 0.7.2)
+      user-choices
+      win32-process (>= 0.5.5)
+      windows-pr (>= 0.6.6)
+    watir-webdriver (0.5.5)
+      selenium-webdriver (>= 2.18.0)
+    win32-api (1.4.8-x86-mingw32)
+    win32-process (0.6.5)
+      windows-pr (>= 1.1.2)
+    win32screenshot (1.0.7)
+      ffi (~> 1.0)
+      mini_magick (~> 3.2.1)
+      rautomation (~> 0.7.0)
+    windows-api (0.4.1)
+      win32-api (>= 1.4.5)
+    windows-pr (1.2.1)
+      win32-api (>= 1.4.5)
+      windows-api (>= 0.3.0)
+    xml-simple (1.1.1)
+
+PLATFORMS
+  x86-mingw32
+
+DEPENDENCIES
+  rspec (~> 2.9.0)
+  spork (~> 0.9.0)
+  spork-local_process (~> 0.0.7)
+  watir (~> 3.0.0)
+  watir-webdriver (~> 0.5.5)
+  watirsplash!
+  win32screenshot (~> 1.0.7)

data/History.rdoc

@@ -1,3 +1,12 @@
+=== 2.4.3 / 2012-04-23
+
+  * Add support for Watir 3
+  * Add support for file downloads in IE9 with Watir 3
+  * Add support for RSpec 2.9
+  * Remove rake and bundler as gem dependencies
+  * Remove Firewatir support
+  * Remove RSpec #match_array matcher
+
 === 2.4.2 / 2011-10-17
 
   * Fix Page::Base.url to use instance variable instead of class variable

data/License.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2010-2011 Jarmo Pertman
+Copyright (c) 2010-2012 Jarmo Pertman
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.rdoc

@@ -3,7 +3,7 @@
 * Web: http://github.com/jarmo/WatirSplash
 * Author: Jarmo Pertman (mailto:jarmo.p[at]gmail.com)
 
-== DESCRIPTION
+{<img alt="Click here to lend your support to: WatirSplash and make a donation at www.pledgie.com !" src="https://www.pledgie.com/campaigns/16193.png?skin_name=chrome" />}[https://www.pledgie.com/campaigns/16193]
 
 WatirSplash makes browser-based web page testing in Ruby splashin' easy.
 It combines Watir, FireWatir or Watir-WebDriver for controlling the browser, 
@@ -17,7 +17,7 @@ testing right away!
 
 == GETTING STARTED
 
-1) Install Ruby (version 1.8.7 is recommended)
+1) Install Ruby (version 1.9.3 is recommended)
 
 2) Install WatirSplash
     C:\my_project>gem install watirsplash
@@ -119,13 +119,12 @@ testing right away!
 == SUPPORTED PLATFORMS & BROWSERS
 
 WatirSplash supports different frameworks/browsers on different operating systems:
-* Linux & OS X - watir-webdriver/firefox, watir-webdriver/chrome and firewatir
-* Windows - watir, watir-webdriver/firefox, watir-webdriver/chrome, watir-webdriver/ie and firewatir
+* Linux & OS X - watir-webdriver/firefox and watir-webdriver/chrome
+* Windows - watir, watir-webdriver/firefox, watir-webdriver/chrome and watir-webdriver/ie
 
 Each framework drives a specific browser:
 * Watir - IE
 * Watir-WebDriver - Chrome, IE and Firefox
-* FireWatir - Firefox
 
 It is possible to specify what framework to use in spec_helper.rb file:
     WatirSplash::Util.framework = "watir-webdriver/firefox"
@@ -143,4 +142,4 @@ You can read more information about the usage and features from the wiki at http
 
 == COPYRIGHT
 
-Copyright © 2010-2011 Jarmo Pertman. See LICENSE for details.
+Copyright © Jarmo Pertman. See LICENSE for details.

data/Rakefile

@@ -11,7 +11,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "WatirSplash #{WatirSplash::Version::WATIRSPLASH}"

data/lib/watirsplash/browser.rb

@@ -4,12 +4,13 @@ module WatirSplash
   class Browser
     # raises an error if any JavaScript errors were found
     JAVASCRIPT_ERRORS_CHECKER = lambda do |browser| 
-      error_message = browser.execute_script "#{browser.respond_to?(:driver) ? "return ": nil}window.__browserErrorMessage"
+      error_message = browser.execute_script %q[
+        var msg = window.__browserErrorMessage;
+        window.__browserErrorMessage = undefined;
+        return msg;
+      ]
 
-      if error_message && !error_message.empty? && error_message != "undefined"
-        browser.execute_script "window.__browserErrorMessage = undefined"
-        raise JavaScriptError, "JavaScript error: #{error_message}"
-      end
+      raise JavaScriptError, "JavaScript error: #{error_message}" if error_message
 
       browser.execute_script %q[
         if (!window.onErrorFn) {

data/lib/watirsplash/frameworks/watir.rb

@@ -1,6 +1,6 @@
-WatirSplash::Frameworks::Helper.load_gems "watir", "win32/screenshot"
+WatirSplash::Frameworks::Helper.load_gems "watir-classic", "win32/screenshot"
 require "watirsplash/mini_magick_patch"
-require "watir/ie"
+require "watir-classic/ie"
 
 # patches for Watir
 module Watir
@@ -24,7 +24,7 @@ module Watir
     # saves a file with the browser
     #
     # clicking the button opens a browser's save as dialog and saves the file document.pdf
-    #  button(:id => "something").download("c:/document.pdf") # => c:/document.pdf
+    #  button(:id => "something").save_as("c:/document.pdf") # => c:/document.pdf
     #
     # * raises an exception if saving the file is unsuccessful
     # * returns saved file path
@@ -32,9 +32,16 @@ module Watir
       path = Pathname.new(file_path)
       raise "path to #{file_path} has to be absolute!" unless path.absolute?
       self.click_no_wait
-      RAutomation::Window.new(:title => "File Download").button(:value => "&Save").click
 
-      save_as_window = RAutomation::Window.new(:title => "Save As")
+      browser_window = page_container.rautomation
+      
+      if page_container.class.version.to_i >= 9
+        browser_window.child(:title => "Windows Internet Explorer").button(:value => "Save &as").click
+      else
+        browser_window.child(:title => "File Download").button(:value => "&Save").click
+      end
+
+      save_as_window = browser_window.child(:title => "Save As")
       save_as_window.text_field(:class => "Edit", :index => 0).set(WatirSplash::Util.file_native_path(file_path))
       save_as_window.button(:value => "&Save").click
 
@@ -43,15 +50,4 @@ module Watir
     end
   end
 
-  class FileField < InputElement
-    def set(file_path)
-      raise "#{file_path} has to exist to set!" unless File.exists?(file_path)
-      assert_exists
-      self.click_no_wait
-      window = RAutomation::Window.new(:title => /choose file( to upload)?/i)
-      window.text_field(:class => "Edit", :index => 0).set(WatirSplash::Util.file_native_path(file_path))
-      window.button(:value => "&Open").click
-    end
-  end
-
 end

data/lib/watirsplash/generators/helper.rb

@@ -2,7 +2,7 @@ module WatirSplash
   module Generators
     module Helper
       def supported_frameworks
-        %w[default watir firewatir watir-webdriver/ie watir-webdriver/firefox watir-webdriver/chrome]
+        %w[default watir watir-webdriver/ie watir-webdriver/firefox watir-webdriver/chrome]
       end
 
       def frameworks_banner

data/lib/watirsplash/page/base.rb

@@ -4,16 +4,13 @@ module WatirSplash
       include SpecHelper
 
       class << self
-        @url = "about:blank"
-
         def url url
           @url = url
         end
 
         def _url
-          @url
+          @url || "about:blank"
         end
-
       end
 
       def initialize(browser=nil)

data/lib/watirsplash/rspec_patches.rb

@@ -1,179 +1,132 @@
-require 'rspec/core/formatters/html_formatter'
-require 'rspec/core/formatters/snippet_extractor'
-
-# patch for https://github.com/rspec/rspec-core/issues/#issue/214
-module RSpec
-  module Core
-    module Formatters
-      class HtmlFormatter < BaseTextFormatter
-        def extra_failure_content(exception)
-          require 'rspec/core/formatters/snippet_extractor'
-          backtrace = exception.backtrace.map {|line| backtrace_line(line)}
-          backtrace.compact!
-          @snippet_extractor ||= SnippetExtractor.new
-          "    <pre class=\"ruby\"><code>#{@snippet_extractor.snippet(backtrace)}</code></pre>"
-        end
-      end
-
-      class SnippetExtractor
-        def snippet(backtrace)
-          raw_code, line = snippet_for(backtrace[0])
-          highlighted = @@converter.convert(raw_code, false)
-          highlighted << "\n<span class=\"comment\"># gem install syntax to get syntax highlighting</span>" if @@converter.is_a?(NullConverter)
-          post_process(highlighted, line)
-        end
-      end
-    end
-  end
-end
-
-RSpec.configure do |config| #:nodoc:
-  config.include(WatirSplash::SpecHelper)
-end
-
-module RSpec #:nodoc:all
-  module Core
-    class ExampleGroup
-      subject {self}
-    end
-  end
-end
-
-# match_array is useful for matching arrays where some elements are regular expressions.
-#    expected_array = ["1", "2", /\d+/, "3"]
-#
-#    ["1", "2", "66", "3"].should match_array(expected_array)
-#    table(:id => "table_id").to_a.should match_array(expected_array)
-RSpec::Matchers.define :match_array do |array2|
-  match do |array1|
-    raise "match_array works only with Array objects!" unless array1.is_a?(Array) && array2.is_a?(Array)
-    match?(array1, array2)
-  end
-
-  def match?(array1, array2)
-    array2.each_with_index do |element, i|
-      if element.is_a?(Array)
-        return false unless match?(array1[i], element)
-      elsif element.is_a?(Regexp)
-        return false unless array1[i] =~ element
-      else
-        return false unless array1[i] == element
-      end
-    end
-
-    true
-  end
-end
-
-# patch for #in(timeout) method
-module RSpec::Matchers
-  class Change
-    def matches?(event_proc)
-      raise_block_syntax_error if block_given?
-
-      # to make #change work with #in(timeout) method
-      unless defined? @actual_before
-        @actual_before = evaluate_value_proc
-        event_proc.call
-      end
-      @actual_after = evaluate_value_proc
-
-      (!change_expected? || changed?) && matches_before? && matches_after? && matches_expected_delta? && matches_min? && matches_max?
-    end
-  end
-
-  alias_method :make, :change
-end
-
-# add #in(timeout) method for every matcher for allowing to wait until some condition.
+# add #within(timeout) and #during(timeout) methods for every matcher for allowing to wait until some condition.
 #     div.click
-#     another_div.should be_present.in(5)
+#     another_div.should be_present.within(5)
 #
 #     expect {
 #       div.click
-#     }.to change {another_div.text}.from("before").to("after").in(5)
+#     }.to change {another_div.text}.from("before").to("after").within(5)
 #
 #     expect {
 #       div.click
-#     }.to make {another_div.present?}.in(5)
+#     }.to make {another_div.present?}.within(5)
 #
 #     expect {
 #       div.click
 #     }.to change {another_div.text}.soon
 #
-# use with ActiveSupport to use descriptive methods for numbers:
-#     require "active_support"
-#     another_div.should exist.in(5.minutes)
-RSpec::Matchers.constants.each do |const|
-  RSpec::Matchers.const_get(const).class_eval do
 
-    inst_methods = instance_methods.map {|m| m.to_sym}
+module WatirSplash
+  module RSpecPatches
 
-    if !(inst_methods.include?(:__matches?) || inst_methods.include?(:__does_not_match?)) && 
-      (inst_methods.include?(:matches?) || inst_methods.include?(:does_not_match?))
+    ::RSpec.configure do |config| #:nodoc:
+      config.include(WatirSplash::SpecHelper)
+    end
 
-      def within(timeout)
-        @within_timeout = timeout
-        self
-      end
+    class ::RSpec::Core::ExampleGroup
+      subject {self}
+    end
 
-      def during(timeout)
-        @during_timeout = timeout
-        self
-      end
+    def self.bootstrap const
+      const.class_eval do
 
-      def soon 
-        within(30)
-      end      
+        inst_methods = instance_methods.map &:to_sym
 
-      def seconds
-        # for syntactic sugar
-        self
-      end
+        if !(inst_methods.include?(:__matches?) || inst_methods.include?(:__does_not_match?)) && 
+          (inst_methods.include?(:matches?) || inst_methods.include?(:does_not_match?))
 
-      alias_method :second, :seconds
+          def within(timeout)
+            @within_timeout = timeout
+            self
+          end
 
-      def minutes
-        @within_timeout *= 60 if @within_timeout
-        @during_timeout *= 60 if @during_timeout
-        self
-      end
+          def during(timeout)
+            @during_timeout = timeout
+            self
+          end
 
-      alias_method :minute, :minutes
-    end
+          def soon 
+            within(30)
+          end      
+
+          def seconds
+            # for syntactic sugar
+            self
+          end
 
-    if inst_methods.include? :matches?
-      alias_method :__matches?, :matches? 
+          alias_method :second, :seconds
+
+          def minutes
+            @within_timeout *= 60 if @within_timeout
+            @during_timeout *= 60 if @during_timeout
+            self
+          end
+
+          alias_method :minute, :minutes
+        end
 
-      def matches?(actual)
-        match_with_wait {__matches?(actual)}
+        if inst_methods.include? :matches?
+          alias_method :__matches?, :matches? 
+
+          def matches?(actual)
+            match_with_wait {__matches?(actual)}
+          end
+        end
+
+        if inst_methods.include? :does_not_match?
+          alias_method :__does_not_match?, :does_not_match?
+
+          def does_not_match?(actual)
+            match_with_wait {__does_not_match?(actual)}
+          end
+        elsif inst_methods.include? :matches?
+          def does_not_match?(actual)
+            match_with_wait {!__matches?(actual)}
+          end
+        end
+
+        private
+
+        def match_with_wait
+          if @within_timeout
+            timeout = @within_timeout; @within_timeout = nil
+            Watir::Wait.until(timeout) {yield} rescue false
+          elsif @during_timeout
+            timeout = @during_timeout; @during_timeout = nil
+            Watir::Wait.while(timeout) {yield} rescue true        
+          else
+            yield
+          end
+        end
       end
     end
 
-    if inst_methods.include? :does_not_match?
-      alias_method :__does_not_match?, :does_not_match?
+    # patch for #within(timeout) method
+    module ::RSpec::Matchers
+      class BuiltIn::Change
+        def matches?(event_proc)
+          raise_block_syntax_error if block_given?
 
-      def does_not_match?(actual)
-        match_with_wait {__does_not_match?(actual)}
-      end
-    elsif inst_methods.include? :matches?
-      def does_not_match?(actual)
-        match_with_wait {!__matches?(actual)}
+          # to make #change work with #in(timeout) method
+          unless defined? @actual_before
+            @actual_before = evaluate_value_proc
+            event_proc.call
+          end
+          @actual_after = evaluate_value_proc
+
+          (!change_expected? || changed?) && matches_before? && matches_after? && matches_expected_delta? && matches_min? && matches_max?
+        end
       end
+
+      alias_method :make, :change
     end
 
-    private
-
-    def match_with_wait
-      if @within_timeout
-        timeout = @within_timeout; @within_timeout = nil
-        Watir::Wait.until(timeout) {yield} rescue false
-      elsif @during_timeout
-        timeout = @during_timeout; @during_timeout = nil
-        Watir::Wait.while(timeout) {yield} rescue true        
-      else
-        yield
-      end
+    matchers = ::RSpec::Matchers::BuiltIn.constants
+    matchers.delete :BaseMatcher
+    matchers.each do |const|
+      bootstrap ::RSpec::Matchers::BuiltIn.const_get const
     end
+
+    bootstrap ::RSpec::Matchers::DSL::Matcher
   end
 end
+

data/lib/watirsplash/version.rb

@@ -1,10 +1,10 @@
 module WatirSplash
   module Version
-    WATIRSPLASH = "2.4.2"
+    WATIRSPLASH = "2.4.3"
 
     # possible runtime dependencies
-    WATIR = "2.0.2"
-    WIN32SCREENSHOT = "~>1.0.5"
-    WATIR_WEBDRIVER = "~>0.3.5"
+    WATIR = "~>3.0.0"
+    WIN32SCREENSHOT = "~>1.0.7"
+    WATIR_WEBDRIVER = "~>0.5.5"
   end
 end

data/spec/browser_spec.rb

@@ -19,12 +19,12 @@ describe WatirSplash::Browser do
   it "detects JavaScript errors" do
     browser = WatirSplash::Browser.new
     browser.goto "http://dl.dropbox.com/u/2731643/WatirSplash/test.html"
-    browser.execute_script("window.originalOnErrorExecuted").should_not be_true
+    browser.execute_script("return window.originalOnErrorExecuted").should be_nil
 
     expect {
       browser.link(:id => "errorLink").click
     }.to raise_error(WatirSplash::JavaScriptError, /JavaScript error:.*unexistingVar/)
-    browser.execute_script("window.originalOnErrorExecuted").should be_true    
+    browser.execute_script("return window.originalOnErrorExecuted").should be_true    
 
     expect {
       browser.link(:id => "toggle").click

data/spec/rspec_patches_spec.rb

@@ -5,23 +5,6 @@ describe "RSpec patches" do
   end
 
   context "RSpec::Matchers" do
-    context "Array#match_array" do
-      it "matches other arrays with regexps" do
-        expected_ary = ["1", "2", "3", /\d/]
-        ["1", "2", "3", "5"].should match_array(expected_ary)
-
-        expected_ary = ["1", ["2", /\d+/], /3/]
-        ["1", [], "4"].should_not match_array(expected_ary)
-        ["1", ["2", "55"], "3"].should match_array(expected_ary)
-      end
-
-      it "doesn't work with other objects except Array" do
-        lambda {"".should match_array("")}.should raise_exception
-        lambda {[].should match_array("")}.should raise_exception
-        lambda {"".should match_array([])}.should raise_exception
-      end
-    end
-
     context "#within" do
       it "can be used with #change" do
         div(:id => "div2").text.should == "Div is shown"
@@ -172,7 +155,7 @@ describe "RSpec patches" do
 
     context "#soon" do
       it "is an alias for #within(30)" do
-        RSpec::Matchers::Matcher.new(nil) {}.soon.instance_variable_get(:@within_timeout).should == 30
+        RSpec::Matchers::DSL::Matcher.new(nil) {}.soon.instance_variable_get(:@within_timeout).should == 30
       end
     end
 
@@ -186,25 +169,25 @@ describe "RSpec patches" do
 
     context "#seconds" do
       it "is for syntactic sugar" do
-        RSpec::Matchers::Matcher.new(nil) {}.within(2).seconds.instance_variable_get(:@within_timeout).should == 2
-        RSpec::Matchers::Matcher.new(nil) {}.during(3).seconds.instance_variable_get(:@during_timeout).should == 3
+        RSpec::Matchers::DSL::Matcher.new(nil) {}.within(2).seconds.instance_variable_get(:@within_timeout).should == 2
+        RSpec::Matchers::DSL::Matcher.new(nil) {}.during(3).seconds.instance_variable_get(:@during_timeout).should == 3
       end
 
       it "has #second as an alias" do
-        RSpec::Matchers::Matcher.new(nil) {}.within(1).second.instance_variable_get(:@within_timeout).should == 1
-        RSpec::Matchers::Matcher.new(nil) {}.during(2).second.instance_variable_get(:@during_timeout).should == 2
+        RSpec::Matchers::DSL::Matcher.new(nil) {}.within(1).second.instance_variable_get(:@within_timeout).should == 1
+        RSpec::Matchers::DSL::Matcher.new(nil) {}.during(2).second.instance_variable_get(:@during_timeout).should == 2
       end
     end
 
     context "#minutes" do
       it "converts timeout into minutes" do
-        RSpec::Matchers::Matcher.new(nil) {}.within(2).minutes.instance_variable_get(:@within_timeout).should == 2*60
-        RSpec::Matchers::Matcher.new(nil) {}.during(3).minutes.instance_variable_get(:@during_timeout).should == 3*60
+        RSpec::Matchers::DSL::Matcher.new(nil) {}.within(2).minutes.instance_variable_get(:@within_timeout).should == 2*60
+        RSpec::Matchers::DSL::Matcher.new(nil) {}.during(3).minutes.instance_variable_get(:@during_timeout).should == 3*60
       end
 
       it "has #minute as an alias" do
-        RSpec::Matchers::Matcher.new(nil) {}.within(1).minute.instance_variable_get(:@within_timeout).should == 1*60
-        RSpec::Matchers::Matcher.new(nil) {}.during(2).minute.instance_variable_get(:@during_timeout).should == 2*60
+        RSpec::Matchers::DSL::Matcher.new(nil) {}.within(1).minute.instance_variable_get(:@within_timeout).should == 1*60
+        RSpec::Matchers::DSL::Matcher.new(nil) {}.during(2).minute.instance_variable_get(:@during_timeout).should == 2*60
       end
     end
 

data/watirsplash.gemspec

@@ -16,8 +16,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency("rake", "0.8.7")
-  s.add_dependency("bundler", "~>1.0")
   s.add_dependency("thor", "~>0")
   s.add_dependency("require_all")
   s.add_dependency("syntax")

metadata

@@ -1,104 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: watirsplash
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 2.4.3
   prerelease: 
-  segments: 
-  - 2
-  - 4
-  - 2
-  version: 2.4.2
 platform: ruby
-authors: 
+authors:
 - Jarmo Pertman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+date: 2012-04-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: require_all
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: syntax
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: syntax
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-description: WatirSplash makes testing of web applications splashin' easy by combining best features of Watir, RSpec and Ruby!
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: WatirSplash makes testing of web applications splashin' easy by combining
+  best features of Watir, RSpec and Ruby!
 email: jarmo.p@gmail.com
-executables: 
+executables:
 - watirsplash
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -111,7 +79,6 @@ files:
 - lib/watirsplash.rb
 - lib/watirsplash/browser.rb
 - lib/watirsplash/cli.rb
-- lib/watirsplash/frameworks/firewatir.rb
 - lib/watirsplash/frameworks/helper.rb
 - lib/watirsplash/frameworks/watir-webdriver.rb
 - lib/watirsplash/frameworks/watir-webdriver/chrome.rb
@@ -143,38 +110,29 @@ files:
 - watirsplash.gemspec
 homepage: http://github.com/jarmo/WatirSplash
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.4
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: watirsplash 2.4.2
-test_files: 
+summary: watirsplash 2.4.3
+test_files:
 - spec/browser_spec.rb
 - spec/page_spec.rb
 - spec/rspec_patches_spec.rb

data/lib/watirsplash/frameworks/firewatir.rb

@@ -1,9 +0,0 @@
-WatirSplash::Frameworks::Helper.load_gem "firewatir"
-
-module FireWatir #:nodoc:all
-  class Firefox
-    def save_screenshot(params)
-      # currently not yet supported
-    end
-  end
-end