watirsplash 2.0.1.rc1 → 2.0.1.rc3

data/.gitignore

@@ -2,6 +2,5 @@ coverage/
 pkg/
 archive/
 results/
-.idea
 todo.txt
 rdoc/

data/.rspec

@@ -1,2 +1,5 @@
---require
-spec/environment.rb
+--require spec/spec_helper.rb
+--color
+--format documentation
+--require lib/watirsplash/html_formatter
+--format WatirSplash::HtmlFormatter

data/Gemfile

@@ -11,6 +11,7 @@ end
 gem "watir-webdriver", WatirSplash::Version::WATIR_WEBDRIVER
 gem "firewatir", WatirSplash::Version::WATIR
 gem "rspec", "~>2.6.0"
+gem "spork", "~>0.9.0.rc9"
 
 # add your project specific dependencies here:
 # gem "ruby-debug", "0.10.3"

data/lib/watirsplash/browser.rb

@@ -1,20 +1,13 @@
 module WatirSplash
   class Browser
     class << self
+
+      attr_accessor :current
+
       def new
         prepare Watir::Browser.new
       end    
 
-      @@current = nil
-
-      def current
-        @@current
-      end
-
-      def current= browser
-        @@current = browser
-      end
-
       private
 
       def prepare browser

data/lib/watirsplash/generators/templates/new_project/.rspec

@@ -1,2 +1,6 @@
---require
-environment
+--drb
+--require spec/spec_helper
+--color
+--format documentation
+--require watirsplash/html_formatter
+--format WatirSplash::HtmlFormatter

data/lib/watirsplash/generators/templates/new_project/spec/spec_helper.rb

@@ -0,0 +1,63 @@
+require 'rubygems'
+require "bundler"
+Bundler.setup
+require 'spork'
+
+Spork.prefork do
+    # Loading more in this block will cause your tests to run faster. However,
+  # if you change any configuration or code from libraries loaded here, you'll
+  # need to restart spork for it take effect.
+  ENV["WATIRSPLASH_RESULTS_PATH"] = "results/#{Time.now.strftime("%y%m%d_%H%M%S")}/index.html"
+  require "watirsplash"
+
+  # What framework to use? Possible values are:
+  #   * default
+  #   * watir
+  #   * firewatir
+  #   * watir-webdriver/ie
+  #   * watir-webdriver/firefox
+  #   * watir-webdriver/chrome
+  WatirSplash::Util.framework = "default"
+
+  # Load the framework specified by the environment variable WATIRSPLASH_FRAMEWORK or WatirSplash::Util.framework
+  WatirSplash::Util.load_framework
+
+  require_rel "../config.rb"
+
+  # Add all your require statements into this block to avoid unnecessary
+  # code in your spec files
+end
+
+Spork.each_run do
+  # This code will be run each time you run your specs.
+  require_all Dir.glob(File.join(File.dirname(__FILE__), "../lib/**/*.rb"))
+end
+
+# --- Instructions ---
+# Sort the contents of this file into a Spork.prefork and a Spork.each_run
+# block.
+#
+# The Spork.prefork block is run only once when the spork server is started.
+# You typically want to place most of your (slow) initializer code in here, in
+# particular, require'ing any 3rd-party gems that you don't normally modify
+# during development.
+#
+# The Spork.each_run block is run each time you run your specs.  In case you
+# need to load files that tend to change during development, require them here.
+# With Rails, your application modules are loaded automatically, so sometimes
+# this block can remain empty.
+#
+# Note: You can modify files loaded *from* the Spork.each_run block without
+# restarting the spork server.  However, this file itself will not be reloaded,
+# so if you change any of the code inside the each_run block, you still need to
+# restart the server.  In general, if you have non-trivial code in this file,
+# it's advisable to move it into a separate file so you can easily edit it
+# without restarting spork.  (For example, with RSpec, you could move
+# non-trivial code into a file spec/support/my_helper.rb, making sure that the
+# spec/support/* files are require'd from inside the each_run block.)
+#
+# Any code that is left outside the two blocks will be run during preforking
+# *and* during each_run -- that's probably not what you want.
+#
+# These instructions should self-destruct in 10 seconds.  If they don't, feel
+# free to delete them.

data/lib/watirsplash/html_formatter.rb

@@ -10,15 +10,16 @@ module WatirSplash
   # * saves all files generated/downloaded during the test and shows them in the report
   class HtmlFormatter < ::RSpec::Core::Formatters::HtmlFormatter
 
-    def initialize(output) # :nodoc:
-      @output_dir = File.expand_path(File.dirname(output))
-      archive_results
+    attr_reader :output_relative_path
 
-      puts "Results will be saved into the directory #{@output_dir}"
-      @files_dir = File.join(@output_dir, "files")
+    def initialize(output) # :nodoc:
+      @output_path = File.expand_path(ENV["WATIRSPLASH_RESULTS_PATH"] || (output.respond_to?(:path) ? output.path : "results/index.html"))
+      @output_relative_path = Pathname.new(@output_path).relative_path_from(Pathname.new(Dir.pwd))
+      puts "Results will be saved to #{@output_relative_path}"
+      @files_dir = File.join(File.dirname(@output_path), "files")
       FileUtils.mkdir_p(@files_dir)
       @files_saved_during_example = []
-      super(File.open(output, "w"))
+      super(File.open(@output_path, "w"))
     end
 
     def example_group_started(example_group) # :nodoc:
@@ -51,7 +52,7 @@ module WatirSplash
 
       description = file[:desc] ? file[:desc] : File.extname(file[:path]).upcase[1..-1]
       path = Pathname.new(file[:path])
-      "<a href='#{path.relative_path_from(Pathname.new(@output_dir))}'>#{description}</a>&nbsp;"
+      "<a href='#{path.relative_path_from(Pathname.new @output_path)}'>#{description}</a>&nbsp;"
     end
 
     def save_html # :nodoc:
@@ -85,14 +86,6 @@ module WatirSplash
 
     private
 
-    def archive_results
-      if File.exists?(@output_dir)
-        archive_dir = File.join(@output_dir, "../archive")
-        FileUtils.mkdir_p(archive_dir) unless File.exists?(archive_dir)
-        FileUtils.mv @output_dir, File.join(archive_dir, "#{File.basename(@output_dir)}_#{File.mtime(@output_dir).strftime("%y%m%d_%H%M%S")}")
-      end
-    end
-
     def append_extra_information_to_description(example_group)
       date = Time.now.strftime("%d.%m.%Y")
       spec_location, line_no = extract_example_group_metadata example_group.metadata[:example_group]

data/lib/watirsplash/rspec_patches.rb

@@ -1,15 +1,6 @@
 require 'rspec/core/formatters/html_formatter'
 require 'rspec/core/formatters/snippet_extractor'
 
-# make sure that UnkownObjectException constant exists
-module Watir
-  module Exception
-    class WatirException < RuntimeError  
-    end
-    class UnknownObjectException < WatirException; end
-  end
-end
-
 # patch for https://github.com/rspec/rspec-core/issues/#issue/214
 module RSpec
   module Core
@@ -155,25 +146,7 @@ RSpec::Matchers.constants.each do |const|
       alias_method :__matches?, :matches? 
 
       def matches?(actual)
-        if @within_timeout
-          Watir::Wait.until(@within_timeout) do
-            begin
-              __matches?(actual)
-            rescue Watir::Exception::UnknownObjectException
-              false
-            end
-          end rescue false
-        elsif @during_timeout
-          Watir::Wait.while(@during_timeout) do
-            begin
-              __matches?(actual)
-            rescue Watir::Exception::UnknownObjectException
-              false
-            end
-          end rescue true
-        else
-          __matches?(actual)
-        end
+        match_with_wait {__matches?(actual)}
       end
     end
 
@@ -181,47 +154,25 @@ RSpec::Matchers.constants.each do |const|
       alias_method :__does_not_match?, :does_not_match?
 
       def does_not_match?(actual)
-        if @within_timeout
-          Watir::Wait.until(@within_timeout) do
-            begin
-              __does_not_match?(actual)
-            rescue Watir::Exception::UnknownObjectException
-              false
-            end
-          end rescue false
-        elsif @during_timeout
-          Watir::Wait.while(@during_timeout) do
-            begin
-              __does_not_match?(actual)
-            rescue Watir::Exception::UnknownObjectException
-              false
-            end
-          end rescue true
-        else
-          __does_not_match?(actual)
-        end
+        match_with_wait {__does_not_match?(actual)}
       end
     elsif inst_methods.include? :matches?
       def does_not_match?(actual)
-        if @within_timeout
-          Watir::Wait.until(@within_timeout) do
-            begin
-              !__matches?(actual)
-            rescue Watir::Exception::UnknownObjectException
-              false
-            end
-          end rescue false
-        elsif @during_timeout
-          Watir::Wait.while(@during_timeout) do
-            begin
-              !__matches?(actual)
-            rescue Watir::Exception::UnknownObjectException
-              false
-            end
-          end rescue true
-        else
-          !__matches?(actual)
-        end
+        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

data/lib/watirsplash/util.rb

@@ -17,29 +17,21 @@ module WatirSplash
         File::ALT_SEPARATOR ? file_path.gsub(File::SEPARATOR, File::ALT_SEPARATOR) : file_path
       end
 
-      # configure RSpec to use documentation and WatirSplash::HtmlFormatter formatters
-      def configure_rspec_formatters
-        config = RSpec.configuration
-        config.color_enabled = true
-        results_path = ENV["WATIRSPLASH_RESULTS_PATH"] || "results/index.html"
-        @@html_formatter = WatirSplash::HtmlFormatter.new(results_path)
-        config.formatters.unshift(@@html_formatter)
-        config.add_formatter(:documentation)
-      end
-
       def formatter
-        @@html_formatter
+        @html_formatter ||= begin
+                              formatter = RSpec.configuration.formatters.find {|formatter| formatter.kind_of? WatirSplash::HtmlFormatter}
+                              raise "WatirSplash::HtmlFormatter is not loaded - are you sure that you have specified it in your .rspec file?" unless formatter
+                              formatter
+                            end
       end
 
-      @@framework = nil
-
       def framework= framework
         framework = framework.to_sym
-        @@framework = framework == :default ? default_framework : framework.to_sym
+        @framework = framework == :default ? default_framework : framework
       end
 
       def framework
-        @@framework
+        @framework
       end
 
       def load_framework

data/lib/watirsplash/version.rb

@@ -1,6 +1,6 @@
 module WatirSplash
   module Version
-    WATIRSPLASH = "2.0.1.rc1"
+    WATIRSPLASH = "2.0.1.rc3"
 
     # possible runtime dependencies
     WATIR = "1.9.1"

data/lib/watirsplash.rb

@@ -10,5 +10,3 @@ require_rel "watirsplash/util"
 require_rel "watirsplash/html_formatter"
 require_rel "watirsplash/frameworks/helper"
 require_rel "watirsplash/page/base"
-WatirSplash::Util.configure_rspec_formatters
-

data/spec/rspec_patches_spec.rb

@@ -5,31 +5,60 @@ 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"
+
         t = Time.now
         expect {
           link(:id => "toggle").click
         }.to change {div(:id => "div2").text}.from("Div is shown").to("Div is hidden").within(2)
-        (Time.now - t).should be <= 2
+        (Time.now - t).should be_between(1, 2)
+
+        div(:id => "div2").text.should == "Div is hidden"
       end
 
       it "will fail upon timeout" do
+        div(:id => "div2").text.should == "Div is shown"
+
         t = Time.now
         expect {
           expect {
             link(:id => "toggle").click
           }.to change {div(:id => "div2").text}.from("Div is shown").to("Div is hidden").within(0.5)
         }.to raise_exception(%q{result should have been changed to "Div is hidden", but is now "Div is shown"})
-        (Time.now - t).should be >= 0.5
+        (Time.now - t).should be_between(0.5, 0.7)
+
+        div(:id => "div2").text.should == "Div is shown"        
       end
 
       it "can be used with #make" do
+        div(:id => "div1").should be_present
+
         t = Time.now
         expect {
           link(:id => "toggle").click
-        }.to make {div(:id => "div1").present?}.within(2)
-        (Time.now - t).should be <= 2
+        }.to make {div(:id => "div1").present?}.from(true).to(false).within(2)
+        (Time.now - t).should be_between(1, 2)
+
+        div(:id => "div1").should_not be_present
       end
 
       it "handles #should_not via matcher's #matches?" do
@@ -37,7 +66,9 @@ describe "RSpec patches" do
         h = {:special => true}
         Thread.new {sleep 0.5; h.delete :special}
         h.should_not have_key(:special).within(1)
-        (Time.now - t).should be_between(0.5, 1)
+        (Time.now - t).should be_between(0.5, 0.7)
+
+        h.should_not have_key(:special)
       end
 
       it "fails when #should_not is not satisfied within timeout via matcher's #matches?" do
@@ -46,7 +77,7 @@ describe "RSpec patches" do
         expect {
           h.should_not have_key(:special).within(0.5)
         }.to raise_error
-        (Time.now - t).should be >= 0.5
+        (Time.now - t).should be_between(0.5, 0.7)
       end
 
       it "handles #should_not via matcher's #does_not_match?" do
@@ -60,7 +91,9 @@ describe "RSpec patches" do
         h = {:special => true}
         Thread.new {sleep 0.5; h.delete :special}
         h.should_not have_my_key(:special).within(1)
-        (Time.now - t).should be_between(0.5, 1)
+        (Time.now - t).should be_between(0.5, 0.7)
+
+        h.should_not have_key(:special)
       end
 
       it "fails when #should_not is not satisfied within timeout via matcher's #does_not_match?" do
@@ -75,7 +108,7 @@ describe "RSpec patches" do
         expect {
           h.should_not have_my_key(:special).within(0.5)
         }.to raise_error
-        (Time.now - t).should be >= 0.5
+        (Time.now - t).should be_between(0.5, 0.7)
       end
     end
 
@@ -83,14 +116,14 @@ describe "RSpec patches" do
       it "will pass upon timeout" do
         t = Time.now
         true.should be_true.during(0.5)
-        (Time.now - t).should be >= 0.5
+        (Time.now - t).should be_between(0.5, 0.7)
       end
 
       it "handles #should_not via matcher's #matches?" do
         t = Time.now
         h = {}
         h.should_not have_key(:special).during(1)
-        (Time.now - t).should be >= 1
+        (Time.now - t).should be_between(1, 1.2)
       end
 
       it "fails when #should_not is not satisfied during timeout via matcher's #matches?" do
@@ -100,7 +133,9 @@ describe "RSpec patches" do
         expect {
           h.should_not have_key(:special).during(1)
         }.to raise_error
-        (Time.now - t).should be_between(0.5, 1)
+        (Time.now - t).should be_between(0.5, 0.7)
+        
+        h.should have_key(:special)
       end
 
       it "handles #should_not via matcher's #does_not_match?" do
@@ -113,7 +148,7 @@ describe "RSpec patches" do
         t = Time.now
         h = {}
         h.should_not have_my_key(:special).during(1)
-        (Time.now - t).should be >= 1
+        (Time.now - t).should be_between(1, 1.2)
       end
 
       it "fails when #should_not is not satisfied within timeout via matcher's #does_not_match?" do
@@ -125,21 +160,19 @@ describe "RSpec patches" do
 
         t = Time.now
         h = {}
+        h.should_not have_my_key(:special)
+
         Thread.new {sleep 0.5; h[:special] = true}
         expect {
           h.should_not have_my_key(:special).during(1)
         }.to raise_error
-        (Time.now - t).should be_between(0.5, 1)
+        (Time.now - t).should be_between(0.5, 0.7)
       end
     end
 
     context "#soon" do
-      it "is an alias for #in(30)" do
-        t = Time.now
-        expect {
-          link(:id => "toggle").click
-        }.to make {div(:id => "div1").present?}.soon
-        (Time.now - t).should be <= 30
+      it "is an alias for #within(30)" do
+        RSpec::Matchers::Matcher.new(nil) {}.soon.instance_variable_get(:@within_timeout).should == 30
       end
     end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: watirsplash
 version: !ruby/object:Gem::Version 
-  hash: 15424095
+  hash: 15424091
   prerelease: 6
   segments: 
   - 2
   - 0
   - 1
   - rc
-  - 1
-  version: 2.0.1.rc1
+  - 3
+  version: 2.0.1.rc3
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 Z
+date: 2011-07-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -125,7 +125,7 @@ files:
 - lib/watirsplash/generators/page.rb
 - lib/watirsplash/generators/templates/new_project/.rspec
 - lib/watirsplash/generators/templates/new_project/config.rb.tt
-- lib/watirsplash/generators/templates/new_project/environment.rb.tt
+- lib/watirsplash/generators/templates/new_project/spec/spec_helper.rb
 - lib/watirsplash/generators/templates/page/lib/%formatted_namespace%/page/%formatted_page_name%.rb.tt
 - lib/watirsplash/generators/templates/page/spec/%formatted_namespace%/page/%formatted_page_name%_spec.rb.tt
 - lib/watirsplash/html_formatter.rb
@@ -136,11 +136,10 @@ files:
 - lib/watirsplash/util.rb
 - lib/watirsplash/version.rb
 - spec/browser_spec.rb
-- spec/environment.rb
 - spec/page_spec.rb
 - spec/rspec_patches_spec.rb
+- spec/spec_helper.rb
 - spec/spec_helper_spec.rb
-- spec/spec_match_array_spec.rb
 - spec/util_spec.rb
 - spec/watir_ie_spec.rb
 - watirsplash.gemspec
@@ -178,13 +177,12 @@ rubyforge_project:
 rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
-summary: watirsplash 2.0.1.rc1
+summary: watirsplash 2.0.1.rc3
 test_files: 
 - spec/browser_spec.rb
-- spec/environment.rb
 - spec/page_spec.rb
 - spec/rspec_patches_spec.rb
+- spec/spec_helper.rb
 - spec/spec_helper_spec.rb
-- spec/spec_match_array_spec.rb
 - spec/util_spec.rb
 - spec/watir_ie_spec.rb

data/lib/watirsplash/generators/templates/new_project/environment.rb.tt

@@ -1,15 +0,0 @@
-require "rubygems"
-require "bundler"
-Bundler.setup
-require "watirsplash"
-
-<%= frameworks_banner %>
-
-# Load the framework specified by the environment variable WATIRSPLASH_FRAMEWORK or WatirSplash::Util.framework
-WatirSplash::Util.load_framework
-
-require_all Dir.glob(File.join(File.dirname(__FILE__), "lib/**/*.rb"))
-require_rel "config.rb"
-
-# Add all your require statements into this file to avoid unnecessary
-# code in your spec files

data/spec/spec_match_array_spec.rb

@@ -1,18 +0,0 @@
-describe "Array match_array matcher" 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