watir-rspec 1.1.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53a815c2800e2c39ece1da6f15c968e2721106d4
-  data.tar.gz: 02d82629c228ec9fe0db971c8abe1eb64fbfa3fe
+  metadata.gz: b7e334fd2ce8294279e7c24f43373a308a135a37
+  data.tar.gz: 88728d14f335c70a8a6ebd3469064e83f893ae48
 SHA512:
-  metadata.gz: 934b490d98fe0b59536cb5b3193e8de02524ab1eaaf6ecf0b78343f4f4af708e852587282100a628a5c430f678a80e664c7232bd7035389b51fcd5af3846868e
-  data.tar.gz: cc000c8faa40fe8f79b47e7687c1db280840ee20777dc45017d88ea3f75c8e4ad15cb7654a5fe908a304e888171b9053f4c6c95f9ae1ea513dba4395b48861b8
+  metadata.gz: 5616334b3367d00836dffbfe0dd506ad0724754cdad5ee3b7e437d1600703543e8a28cce1f739fce6383b82b3fc99cf94f733bd32076afd711fc057166034cf6
+  data.tar.gz: 7f4563629337a557767228aff261f2fe0f2a92bf1270b022aed96091f48c741fb10ad2ef15ec1f3da9dd26411bfd82713220fcc5a604a1988af0174a369bf3e2

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 2.0.0 - 2015/03/18
+
+* Add support for RSpec 3.x. RSpec 2.x is not supported anymore (PR #10).
+
 ### 1.1.3 - 2015/03/11
 
 * Fix `Watir::RSpec.file_path` to not discard description (PR #11).

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2013 Jarmo Pertman
+Copyright (c) Jarmo Pertman
 
 MIT License
 

data/lib/watir/rspec/cli.rb

@@ -88,6 +88,7 @@ RSpec.configure do |config|
 end
   ]
           end
+          
         end
 
         def already_installed?

data/lib/watir/rspec/helper.rb

@@ -21,10 +21,19 @@ module Watir
         if browser.respond_to?(name)
           Helper.module_eval %Q[
             def #{name}(*args)
-              browser.send(:#{name}, *args) {yield}
+              if block_given?
+                browser.send(:#{name}, *args) {yield}
+              else
+                browser.send(:#{name}, *args)
+              end
             end
           ]
-          self.send(name, *args) {yield}
+
+          if block_given?
+            self.send(name, *args) {yield}
+          else
+            self.send(name, *args)
+          end
         else
           super
         end

data/lib/watir/rspec/html_formatter.rb

@@ -1,3 +1,4 @@
+require 'rspec/core/formatters'
 require 'rspec/core/formatters/html_formatter'
 require 'pathname'
 require 'fileutils'
@@ -9,6 +10,9 @@ module Watir
     # * saves html of the browser upon test failure
     # * saves all files generated/downloaded during the test and shows them in the report
     class HtmlFormatter < ::RSpec::Core::Formatters::HtmlFormatter
+
+      ::RSpec::Core::Formatters.register self, *(::RSpec::Core::Formatters::Loader.formatters[::RSpec::Core::Formatters::HtmlFormatter])
+
       # @private
       def initialize(output)
         @output_path = File.expand_path(ENV["WATIR_RESULTS_PATH"] || (output.respond_to?(:path) ? output.path : "tmp/spec-results/index.html"))
@@ -36,21 +40,6 @@ module Watir
         super
       end
 
-      # @private
-      def extra_failure_content(exception)
-        browser = example_group.before_all_ivars[:@browser] || $browser
-        return super unless browser && browser.exists?
-
-        save_screenshot browser
-        save_html browser
-
-        content = []
-        content << "<span>"
-        @files_saved_during_example.each {|f| content << link_for(f)}
-        content << "</span>"
-        super + content.join($/)
-      end
-
       # Generate unique file path for the current spec. If the file
       # will be created during that spec and spec fails then it will be
       # shown automatically in the html report.
@@ -68,6 +57,22 @@ module Watir
 
       private
 
+      # @private
+      def extra_failure_content(exception)
+        return super unless example_group  # apparently there are cases where rspec failures are encountered and the example_group is not set (i.e. nil)
+        browser = example_group.before_context_ivars[:@browser] || $browser
+        return super unless browser && browser.exists?
+
+        save_screenshot browser
+        save_html browser
+
+        content = []
+        content << "<span>"
+        @files_saved_during_example.each {|f| content << link_for(f)}
+        content << "</span>"
+        super + content.join($/)
+      end
+
       def link_for(file)
         return unless File.exists?(file[:path])
 

data/lib/watir/rspec/matchers.rb

@@ -10,17 +10,17 @@ module Watir
     # result should be true for the whole specified time period.
     #
     # @example Wait for 2 seconds until element is present (element exists and is visible)
-    #   text_field.should be_present.within(2)
+    #   expect(text_field).to be_present.within(2)
     #   
     # @example Wait for 2 seconds until element is visible
-    #   text_field.should be_visible.within(2)
+    #   expect(text_field).to be_visible.within(2)
     #
     # @example Wait for 2 seconds until element exists
-    #   text_field.should exist.within(2)
+    #   expect(text_field).to exist.within(2)
     #
     # @example Make sure that container is visible for the whole time during 2 seconds
     #   button.click
-    #   div.should be_visible.during(2)
+    #   expect(text_field).to be_visible.during(2)
     module Matchers
       def be_present
         BaseMatcher.new :present?

data/lib/watir/rspec/version.rb

@@ -1,5 +1,5 @@
-module Watir
-  class RSpec
-    VERSION = "1.1.3"
-  end
-end
+module Watir
+  class RSpec
+    VERSION = "2.0.0"
+  end
+end

data/spec/watir/rspec/active_record_shared_connection_spec.rb

@@ -8,19 +8,19 @@ describe TestModel do
     before { described_class.class_variable_set :@@shared_connection, nil }
 
     it "reuses the connection" do
-      described_class.should_receive(:retrieve_connection).once.and_return(:established_connection)
+      expect(described_class).to receive(:retrieve_connection).once.and_return(:established_connection)
 
-      2.times { described_class.connection.should == :established_connection }
+      2.times { expect(described_class.connection).to be_eql :established_connection }
     end
 
     it "uses mutex" do
-      described_class.should_receive(:retrieve_connection).once { sleep 0.1; :established_connection }
+      expect(described_class).to receive(:retrieve_connection).once { sleep 0.1; :established_connection }
 
       thr = Thread.new { described_class.connection }
 
       t = Time.now
       described_class.connection
-      (Time.now - t).should be >= 0.1
+      expect(Time.now - t).to be >= 0.1
       thr.join
     end
   end

data/spec/watir/rspec/helper_spec.rb

@@ -7,50 +7,50 @@ describe Watir::RSpec::Helper do
   context "#browser" do
     it "delegates to @browser if exists" do
       @browser = :browser
-      browser.should == @browser
+      expect(browser).to be @browser
     end
 
     it "delegates to @browser if @browser exists even if $browser exists" do
       @browser = :browser
       $browser = :global_browser
-      browser.should == @browser
+      expect(browser).to be @browser
     end
 
     it "delegates to $browser if @browser does not exist" do
       $browser = :global_browser
-      browser.should == $browser
+      expect(browser).to be $browser
     end
   end
 
   context "#method_missing" do
     it "redirects missing methods to browser if method exists" do
       @browser = double("browser", coolness_factor: :very)
-      coolness_factor.should == :very
+      expect(coolness_factor).to eql :very
     end
 
     it "raises error when browser does not have method" do
       @browser = double("browser")
-      described_class.should_not be_method_defined :not_existing_method
+      expect(described_class).not_to be_method_defined :not_existing_method
 
       expect do
         self.not_existing_method
       end.to raise_error(NoMethodError)
-
-      described_class.should_not be_method_defined :not_existing_method
+      expect(described_class).not_to be_method_defined  :not_existing_method
     end
 
     it "adds browser methods to the helper" do
       @browser = double("browser", method_to_be_defined: :done)
-      described_class.should_not be_method_defined :method_to_be_defined
-      method_to_be_defined.should == :done
-      described_class.should be_method_defined :method_to_be_defined
+
+      expect(described_class).not_to be_method_defined :method_to_be_defined
+      expect(method_to_be_defined).to eql :done
+      expect(described_class).to be_method_defined :method_to_be_defined
     end
   end
 
   it "#p is delegated to the browser" do
     @browser = double("browser", p: "#p")
-    described_class.should_not_receive(:method_missing)
+    expect(described_class).not_to receive(:method_missing)
 
-    p.should == "#p"
+    expect(p).to eql "#p"
   end
 end

data/spec/watir/rspec/matchers/base_matcher_spec.rb

@@ -5,25 +5,25 @@ describe Watir::RSpec::Matchers::BaseMatcher do
 
   it "#matches?" do
     object = double("element", foo?: true)
-    object.should be_foo
+    expect(object).to be_foo
   end
 
   it "#matches? with error" do
     object = double("element", foo?: false)
     expect {
-      object.should be_foo
+      expect(object).to be_foo
     }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
   end
 
   it "#does_not_match?" do
     object = double("element", foo?: false)
-    object.should_not be_foo
+    expect(object).not_to be_foo
   end
 
   it "#does_not_match? with error" do
     object = double("element", foo?: true)
     expect {
-      object.should_not be_foo
+      expect(object).not_to be_foo
     }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
   end
 
@@ -33,10 +33,10 @@ describe Watir::RSpec::Matchers::BaseMatcher do
     it "#matches?" do
       object = double("element")
       @result = false
-      object.stub(:foo?) { @result }
+      allow(object).to receive (:foo?) { @result }
       thr = Thread.new { sleep 0.1; @result = true }
 
-      object.should be_foo.within(1)
+      expect(object).to be_foo.within(1)
       thr.join
     end
 
@@ -44,14 +44,14 @@ describe Watir::RSpec::Matchers::BaseMatcher do
       object = double("element", foo?: false)
 
       expect {
-        object.should be_foo.within(0.1)
+        expect(object).to be_foo.within(0.1)
       }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
     end
 
     it "#matches? with some other error" do
       object = double("element")
       raised = false
-      object.stub(:foo?) do
+      allow(object).to receive (:foo?) do
         unless raised
           raised = true
           raise "Some unexpected exception"
@@ -61,17 +61,17 @@ describe Watir::RSpec::Matchers::BaseMatcher do
         end
       end
 
-      object.should be_foo.within(1)
-      raised.should be_true
+      expect(object).to be_foo.within(1)
+      expect(raised).to be true
     end
 
     it "#does_not_match?" do
       object = double("element")
       @result = true
-      object.stub(:foo?) { @result }
+      allow(object).to receive (:foo?) { @result }
       thr = Thread.new { sleep 0.1; @result = false }
 
-      object.should_not be_foo.within(1)
+      expect(object).not_to be_foo.within(1)
       thr.join
     end    
 
@@ -79,14 +79,14 @@ describe Watir::RSpec::Matchers::BaseMatcher do
       object = double("element", foo?: true)
 
       expect {
-        object.should_not be_foo.within(0.1)
+        expect(object).not_to be_foo.within(0.1)
       }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
     end
 
     it "#does_not_match? with some other error" do
       object = double("element")
       raised = false
-      object.stub(:foo?) do
+      allow(object).to receive (:foo?) do
         unless raised
           raised = true
           raise "Some unexpected exception"
@@ -96,8 +96,8 @@ describe Watir::RSpec::Matchers::BaseMatcher do
         end
       end
 
-      object.should_not be_foo.within(1)
-      raised.should be_true
+      expect(object).not_to be_foo.within(1)
+      expect(raised).to be true
     end
   end
 
@@ -107,17 +107,17 @@ describe Watir::RSpec::Matchers::BaseMatcher do
     it "#matches?" do
       object = double("element", foo?: true)
 
-      object.should be_foo.during(0.1)
+      expect(object).to be_foo.during(0.1)
     end
 
     it "#matches? with timeout error" do
       object = double("element")
       @result = true
-      object.stub(:foo?) { @result }
+      allow(object).to receive (:foo?) { @result }
       thr = Thread.new { sleep 0.1; @result = false }
 
       expect {
-        object.should be_foo.during(1)
+        expect(object).to be_foo.during(1)
       }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
       thr.join
     end
@@ -125,7 +125,7 @@ describe Watir::RSpec::Matchers::BaseMatcher do
     it "#matches? with some other error" do
       object = double("element")
       raised = false
-      object.stub(:foo?) do
+      allow(object).to receive (:foo?) do
         unless raised
           raised = true
           raise "Some unexpected exception"
@@ -134,24 +134,24 @@ describe Watir::RSpec::Matchers::BaseMatcher do
         end
       end
 
-      object.should be_foo.during(0.1)
-      raised.should be_true
+      expect(object).to be_foo.during(0.1)
+      expect(raised).to be true
     end
 
     it "#does_not_match?" do
       object = double("element", foo?: false)
 
-      object.should_not be_foo.during(0.1)
+      expect(object).not_to be_foo.during(0.1)
     end    
 
     it "#does_not_match? with timeout error" do
       object = double("element")
       @result = false
-      object.stub(:foo?) { @result }
+      allow(object).to receive (:foo?) { @result }
       thr = Thread.new { sleep 0.1; @result = true }
 
       expect {
-        object.should_not be_foo.during(1)
+        expect(object).not_to be_foo.during(1)
       }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
       thr.join
     end
@@ -159,7 +159,7 @@ describe Watir::RSpec::Matchers::BaseMatcher do
     it "#does_not_match? with some other error" do
       object = double("element")
       raised = false
-      object.stub(:foo?) do
+      allow(object).to receive (:foo?) do
         unless raised
           raised = true
           raise "Some unexpected exception"
@@ -168,14 +168,14 @@ describe Watir::RSpec::Matchers::BaseMatcher do
         end
       end
 
-      object.should_not be_foo.during(0.1)
-      raised.should be_true
+      expect(object).not_to be_foo.during(0.1)
+      expect(raised).to be true
     end    
   end
 
   def should_take_at_least(seconds)
     t = Time.now
     yield
-    (Time.now - t).should be >= seconds
+    expect(Time.now - t).to be >= seconds
   end
 end

data/spec/watir/rspec/matchers_spec.rb

@@ -5,19 +5,19 @@ describe Watir::RSpec::Matchers do
 
   it "#be_present" do
     matcher = be_present
-    matcher.should == Watir::RSpec::Matchers::BaseMatcher
-    matcher.instance_variable_get(:@predicate).should == :present?
+    expect(matcher).to be_a Watir::RSpec::Matchers::BaseMatcher
+    expect(matcher.instance_variable_get(:@predicate)).to eql :present?
   end
 
   it "#be_visible" do
     matcher = be_visible
-    matcher.should == Watir::RSpec::Matchers::BaseMatcher
-    matcher.instance_variable_get(:@predicate).should == :visible?
+    expect(matcher).to be_a Watir::RSpec::Matchers::BaseMatcher
+    expect(matcher.instance_variable_get(:@predicate)).to eql  :visible?
   end
 
   it "#exist" do
     matcher = exist
-    matcher.should == Watir::RSpec::Matchers::BaseMatcher
-    matcher.instance_variable_get(:@predicate).should == :exist?
+    expect(matcher).to be_a Watir::RSpec::Matchers::BaseMatcher
+    expect(matcher.instance_variable_get(:@predicate)).to eql :exist?
   end  
 end

data/spec/watir/rspec_spec.rb

@@ -4,18 +4,18 @@ describe Watir::RSpec do
   context "#file_path" do
     it "without description" do
       formatter = double("formatter", file_path: "file-path")
-      Watir::RSpec.stub(formatter: formatter)
-      formatter.should_receive(:file_path).with("name", nil)
+      allow(Watir::RSpec).to receive (:formatter) {formatter}
+      expect(formatter).to receive(:file_path).with("name", nil)
 
-      Watir::RSpec.file_path("name").should == "file-path"
+      expect(Watir::RSpec.file_path("name")).to be == "file-path"
     end
 
     it "with description" do
       formatter = double("formatter", file_path: "file-path")
-      Watir::RSpec.stub(formatter: formatter)
-      formatter.should_receive(:file_path).with("name", "description")
+      allow(Watir::RSpec).to receive (:formatter) {formatter}
+      expect(formatter).to receive(:file_path).with("name", "description")
 
-      Watir::RSpec.file_path("name", "description").should == "file-path"
+      expect(Watir::RSpec.file_path("name", "description")).to be == "file-path"
     end
   end
 end

data/watir-rspec.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Watir::RSpec::VERSION
 
-  gem.add_dependency "rspec", "~>2.0"
+  gem.add_dependency "rspec", "~>3.0"
   gem.add_dependency "watir", "~>5.0"
 
   gem.add_development_dependency "yard"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-rspec
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Jarmo Pertman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement