watir-rspec 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c93cfce42f3922548d20d13cb93232cdc6dad73
-  data.tar.gz: 9e0e2bd728c501cfc68292485c5a3211b9420b59
+  metadata.gz: 3fe29b37229f959db5b8b6b466d9e4fb7d88b5c8
+  data.tar.gz: 6a9a31c3b8df8a13e6754f5f0613f1f001911af5
 SHA512:
-  metadata.gz: a428ec56427abb202f5b2670ec65c8dbc1d0d161e4528a9281a144be6b3ab73efa7343019c96fb72608cff40c8739f0dfc7d23f35e3c25e1ea0b45f5c9fe1dee
-  data.tar.gz: 3a39c9439e98b0306740a30fcf6ee7803ed69e9dfe1e9bdba3995bafd333e007d9c3606c5eb27c44dcfb9d64c6ace204a184acd2e27f08c0daf2b3a20305595d
+  metadata.gz: 70f3fe05b402535b0a8d320af933537d785b2b625ebff64150d71f6afb2c0b09dd22d5e0fbf788a95b79032dd9291cab6e63dd2a39b8ddba2765fc43e26b9687
+  data.tar.gz: 55cd37ecf601751480795f34671511679a54d6bef57aa90f5f2f0bcaef54e928e4afb283906380992c90f7394278a5e7e0d518df6023e93ca5188b1b992b2942

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 2.0.2 - 2015/03/21
+
+* Fix delegating methods to browser with blocks having parameters. Closes #12.
+
 ### 2.0.1 - 2015/03/18
 
 * Add license into gemspec (issue #6).

data/lib/watir/rspec/helper.rb

@@ -1,48 +1,49 @@
-require "forwardable"
-
-module Watir
-  class RSpec
-    module Helper
-      extend Forwardable
-
-      # @return [Watir::Browser] a current browser instance if it is initialized with 
-      #   @browser or $browser variable name.
-      def browser
-        @browser || $browser
-      end
-
-      # Will dispatch all missing methods to the {#browser} instance.
-      # @example Makes it possible to use Watir::Browser methods without specifying the browser instance in the specs like this:
-      #  it "should do something" do
-      #    # notice that we're calling Watir::Browser#text_field here directly
-      #    text_field(:id => "foo").should be_present
-      #  end
-      def method_missing(name, *args)
-        if browser.respond_to?(name)
-          Helper.module_eval %Q[
-            def #{name}(*args)
-              if block_given?
-                browser.send(:#{name}, *args) {yield}
-              else
-                browser.send(:#{name}, *args)
-              end
-            end
-          ]
-
-          if block_given?
-            self.send(name, *args) {yield}
-          else
-            self.send(name, *args)
-          end
-        else
-          super
-        end
-      end
-
-      # make sure that using method 'p' will be invoked on browser
-      # and not Kernel
-      # use Kernel.p if you need to dump some variable 
-      def_delegators :browser, :p
-    end
-  end
-end
+require "forwardable"
+
+module Watir
+  class RSpec
+    module Helper
+      extend Forwardable
+
+      # @return [Watir::Browser] a current browser instance if it is initialized with 
+      #   @browser or $browser variable name.
+      def browser
+        @browser || $browser
+      end
+
+      # Will dispatch all missing methods to the {#browser} instance.
+      # @example Makes it possible to use Watir::Browser methods without specifying the browser instance in the specs like this:
+      #  it "should do something" do
+      #    # notice that we're calling Watir::Browser#text_field here directly
+      #    text_field(:id => "foo").should be_present
+      #  end
+      def method_missing(name, *args)
+        if browser.respond_to?(name)
+          Helper.module_eval %Q[
+            def #{name}(*args)
+              if block_given?
+                browser.send(:#{name}, *args, &Proc.new)
+              else
+                browser.send(:#{name}, *args)
+              end
+            end
+          ]
+
+          if block_given?
+            self.send(name, *args, &Proc.new)
+          else
+            self.send(name, *args)
+          end
+        else
+          super
+        end
+      end
+
+
+      # make sure that using method 'p' will be invoked on browser
+      # and not Kernel
+      # use Kernel.p if you need to dump some variable 
+      def_delegators :browser, :p
+    end
+  end
+end

data/lib/watir/rspec/version.rb

@@ -1,5 +1,5 @@
 module Watir
   class RSpec
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
   end
 end

data/spec/watir/rspec/helper_spec.rb

@@ -1,56 +1,74 @@
-require "spec_helper"
-
-describe Watir::RSpec::Helper do
-  before { self.send :extend, described_class }
-  after { $browser = @browser = nil }
-
-  context "#browser" do
-    it "delegates to @browser if exists" do
-      @browser = :browser
-      expect(browser).to be @browser
-    end
-
-    it "delegates to @browser if @browser exists even if $browser exists" do
-      @browser = :browser
-      $browser = :global_browser
-      expect(browser).to be @browser
-    end
-
-    it "delegates to $browser if @browser does not exist" do
-      $browser = :global_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)
-      expect(coolness_factor).to eql :very
-    end
-
-    it "raises error when browser does not have method" do
-      @browser = double("browser")
-      expect(described_class).not_to be_method_defined :not_existing_method
-
-      expect do
-        self.not_existing_method
-      end.to raise_error(NoMethodError)
-      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)
-
-      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")
-    expect(described_class).not_to receive(:method_missing)
-
-    expect(p).to eql "#p"
-  end
-end
+require "spec_helper"
+
+describe Watir::RSpec::Helper do
+  before { self.send :extend, described_class }
+  after { $browser = @browser = nil }
+
+  context "#browser" do
+    it "delegates to @browser if exists" do
+      @browser = :browser
+      expect(browser).to be @browser
+    end
+
+    it "delegates to @browser if @browser exists even if $browser exists" do
+      @browser = :browser
+      $browser = :global_browser
+      expect(browser).to be @browser
+    end
+
+    it "delegates to $browser if @browser does not exist" do
+      $browser = :global_browser
+      expect(browser).to be $browser
+    end
+
+    context "methods with block" do
+      before { @browser = double("browser") }
+
+      it "are delegated to browser" do
+        expect(@browser).to receive(:window).with(title: "my_window") { |&block| block.call }
+
+        block_parameter = lambda { "my block content" }
+        expect(window(title: "my_window", &block_parameter)).to be == "my block content"
+      end
+
+      it "having parameters are properly delegated to browser" do
+        expect(@browser).to receive(:window).with(:title => "my_window").and_yield("first", "second")
+
+        block_parameter = lambda { |parameter_1, parameter_2| [parameter_1, parameter_2] }
+        expect(window(title: "my_window", &block_parameter)).to be == ["first", "second"]
+      end
+    end
+  end
+
+  context "#method_missing" do
+    it "redirects missing methods to browser if method exists" do
+      @browser = double("browser", coolness_factor: :very)
+      expect(coolness_factor).to eql :very
+    end
+
+    it "raises error when browser does not have method" do
+      @browser = double("browser")
+      expect(described_class).not_to be_method_defined :not_existing_method
+
+      expect do
+        self.not_existing_method
+      end.to raise_error(NoMethodError)
+      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)
+
+      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")
+    expect(described_class).not_to receive(:method_missing)
+
+    expect(p).to eql "#p"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-rspec
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Jarmo Pertman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Use Watir with RSpec with ease.