rspec-wait 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8de02581ff92b52a5e1bb18a295912344b2fc87c
-  data.tar.gz: ce87d11fd20e6b19ecd4f5792a2836c0f0e55967
+  metadata.gz: fa62ab1f0470b41980bbda0f946388a78f785fd5
+  data.tar.gz: ee13ca8d70502950209cea78026b457f946671ca
 SHA512:
-  metadata.gz: 172c31ce4a7d6eb87832d2a55f4642e029ff9ab90457163a42ceef008d0080b1a8d50271df0ae1f0b826da864c50b04f45bc9c424058f12889e064ae0fbda8d2
-  data.tar.gz: bc4abe75a8f37f274e92ba924e82b85afc9bd145f92d102891cbc4a54783d64f9f09985c5b0403801d7d54254479a80698b7ce7a1b60d90737c01a8cc099ffea
+  metadata.gz: 879ebe4b4dda20745cb76f6d243f29056e21ffbe12e34d6cbe01ff292d7285258034c7df0792ba6e6f9cccd861b45a1d07ab980723c58cbf670192b67002dd34
+  data.tar.gz: ca29a21677137114dff82a800942082577c6be3efa2029862917e4d7bc7366431733e6ac8752ba23bcfab069e2b525429d7ca3a77aeba01a28e9420b97a8fd2e

data/.travis.yml

@@ -3,6 +3,12 @@ before_install:
 branches:
   only:
     - master
+env:
+  global:
+    - secure: | # CODECLIMATE_REPO_TOKEN
+        lK3tYDk/63jRamEfGKbC27mPAoV7XsebCurx6doeisv1r4926lyPY4B9ZoSu
+        OeVmjXQWHX9U7IgPH1C+zoIh1wVHVA8h5FVuqlGUMlA6IJi2xaI+ChEo3WeD
+        FRlk1Q5fGhgp1mt59sMn3GZZ/mv31v+sd9iYC3AVIM0KrlMGGZQ=
 gemfile:
   - gemfiles/rspec_2_11.gemfile
   - gemfiles/rspec_2_12.gemfile
@@ -13,17 +19,8 @@ language: ruby
 matrix:
   allow_failures:
     - rvm: ruby-head
-  include:
-    - env:
-        secure: | # CODECLIMATE_REPO_TOKEN
-          lK3tYDk/63jRamEfGKbC27mPAoV7XsebCurx6doeisv1r4926lyPY4B9ZoSu
-          OeVmjXQWHX9U7IgPH1C+zoIh1wVHVA8h5FVuqlGUMlA6IJi2xaI+ChEo3WeD
-          FRlk1Q5fGhgp1mt59sMn3GZZ/mv31v+sd9iYC3AVIM0KrlMGGZQ=
-      gemfile: Gemfile
-      rvm: "2.1"
 rvm:
   - 1.9.3
-  - 2.0.0
+  - "2.0"
   - "2.1"
   - ruby-head
-script: bundle exec rspec

data/CHANGELOG.md

@@ -1,3 +1,8 @@
-## 0.0.1 / 2014-04-18
+## 0.0.2 / 2014-06-11
+
+* [ENHANCEMENT] Allow `wait_for` to accept either a value or block target
+* [BUGFIX] Ensure blocks are re-evaluated with each iteration
+
+## 0.0.1 / 2014-04-19
 
 * Initial release!

data/Gemfile

@@ -1,5 +1,3 @@
 source "https://rubygems.org"
 
 gemspec
-
-gem "codeclimate-test-reporter", require: false

data/README.md

@@ -2,11 +2,11 @@
 
 Wait for conditions in RSpec
 
-[![Gem Version](https://img.shields.io/gem/v/rspec-wait.svg)](http://badge.fury.io/rb/rspec-wait)
-[![Build Status](https://img.shields.io/travis/laserlemon/rspec-wait/master.svg)](https://travis-ci.org/laserlemon/rspec-wait)
-[![Code Climate](https://img.shields.io/codeclimate/github/laserlemon/rspec-wait.svg)](https://codeclimate.com/github/laserlemon/rspec-wait)
-[![Coverage Status](https://img.shields.io/codeclimate/coverage/github/laserlemon/rspec-wait.svg)](https://codeclimate.com/github/laserlemon/rspec-wait)
-[![Dependency Status](https://img.shields.io/gemnasium/laserlemon/rspec-wait.svg)](https://gemnasium.com/laserlemon/rspec-wait)
+[![Gem Version](https://img.shields.io/gem/v/rspec-wait.svg?style=flat)](https://rubygems.org/gems/rspec-wait)
+[![Build Status](https://img.shields.io/travis/laserlemon/rspec-wait/master.svg?style=flat)](https://travis-ci.org/laserlemon/rspec-wait)
+[![Code Climate](https://img.shields.io/codeclimate/github/laserlemon/rspec-wait.svg?style=flat)](https://codeclimate.com/github/laserlemon/rspec-wait)
+[![Coverage Status](https://img.shields.io/codeclimate/coverage/github/laserlemon/rspec-wait.svg?style=flat)](https://codeclimate.com/github/laserlemon/rspec-wait)
+[![Dependency Status](https://img.shields.io/gemnasium/laserlemon/rspec-wait.svg?style=flat)](https://gemnasium.com/laserlemon/rspec-wait)
 
 ## Why does RSpec::Wait exist?
 
@@ -26,8 +26,10 @@ RSpec::Wait will keep trying until your assertion passes or times out.
 
 ### Example
 
-RSpec::Wait's `wait_for` assertions are drop-in replacements for RSpec's
-`expect` assertions.
+RSpec::Wait's `wait_for` assertions are nearly drop-in replacements for RSpec's
+`expect` assertions. The major difference is that the `wait_for` method always
+accepts a block because it may evaluate the content of that block multiple times
+while waiting.
 
 ```ruby
 describe Ticker do
@@ -39,13 +41,13 @@ describe Ticker do
     end
 
     it "starts a blank tape" do
-      expect(ticker.tape).to eq("")
+      expect { ticker.tape }.to eq("")
     end
 
     it "writes the message one letter at a time" do
-      wait_for(ticker.tape).to eq("··-·")
-      wait_for(ticker.tape).to eq("··-· ---")
-      wait_for(ticker.tape).to eq("··-· --- ---")
+      wait_for { ticker.tape }.to eq("··-·")
+      wait_for { ticker.tape }.to eq("··-· ---")
+      wait_for { ticker.tape }.to eq("··-· --- ---")
     end
   end
 end
@@ -56,7 +58,7 @@ elements like JavaScript interactions or remote requests.
 
 ```ruby
 feature "User Login" do
-  let!(:user) { create(:user, name: "John Doe", email: "john@example.com", password: "secret") }
+  let!(:user) { create(:user, email: "john@example.com", password: "secret") }
 
   scenario "A user can log in successfully" do
     visit new_session_path
@@ -66,7 +68,7 @@ feature "User Login" do
     click_button "Log In"
 
     wait_for { current_path }.to eq(account_path)
-    expect(page).to have_content("John Doe")
+    expect(page).to have_content("Welcome back!")
   end
 end
 ```

data/gemfiles/rspec_2_11.gemfile

@@ -3,3 +3,7 @@ source "https://rubygems.org"
 gemspec path: ".."
 
 gem "rspec", "~> 2.11.0"
+
+group :test do
+  gem "codeclimate-test-reporter", require: false
+end

data/gemfiles/rspec_2_12.gemfile

@@ -3,3 +3,7 @@ source "https://rubygems.org"
 gemspec path: ".."
 
 gem "rspec", "~> 2.12.0"
+
+group :test do
+  gem "codeclimate-test-reporter", require: false
+end

data/gemfiles/rspec_2_13.gemfile

@@ -3,3 +3,7 @@ source "https://rubygems.org"
 gemspec path: ".."
 
 gem "rspec", "~> 2.13.0"
+
+group :test do
+  gem "codeclimate-test-reporter", require: false
+end

data/gemfiles/rspec_2_14.gemfile

@@ -3,3 +3,7 @@ source "https://rubygems.org"
 gemspec path: ".."
 
 gem "rspec", "~> 2.14.0"
+
+group :test do
+  gem "codeclimate-test-reporter", require: false
+end

data/gemfiles/rspec_3_0.gemfile

@@ -2,4 +2,8 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
-gem "rspec", "~> 3.0.0.beta"
+gem "rspec", "~> 3.0.0"
+
+group :test do
+  gem "codeclimate-test-reporter", require: false
+end

data/lib/rspec/wait.rb

@@ -6,11 +6,9 @@ require "rspec/wait/target"
 
 module RSpec
   module Wait
-    # From: https://github.com/rspec/rspec-expectations/blob/v2.14.5/lib/rspec/expectations/syntax.rb#L83-L87
-    def wait_for(*target, &target_block)
-      target << target_block if block_given?
-      raise ArgumentError.new("You must pass an argument or a block to #wait_for but not both.") unless target.size == 1
-      Target.new(target.first)
+    # From: https://github.com/rspec/rspec-expectations/blob/v3.0.0/lib/rspec/expectations/syntax.rb#L72-L74
+    def wait_for(value = Target::UndefinedValue, &block)
+      Target.for(value, block)
     end
   end
 end

data/lib/rspec/wait/handler.rb

@@ -9,16 +9,14 @@ module RSpec
       TIMEOUT = 10
       DELAY = 0.1
 
-      # From: https://github.com/rspec/rspec-expectations/blob/v2.14.5/lib/rspec/expectations/handler.rb#L16-L64
-      def handle_matcher(actual, *)
+      def handle_matcher(target, *args, &block)
         failure = nil
 
         Timeout.timeout(TIMEOUT) do
           loop do
-            actual = actual.call if actual.respond_to?(:call)
-
             begin
-              super
+              actual = target.respond_to?(:call) ? target.call : target
+              super(actual, *args, &block)
               break
             rescue RSpec::Expectations::ExpectationNotMetError => failure
               sleep DELAY
@@ -31,10 +29,12 @@ module RSpec
       end
     end
 
+    # From: https://github.com/rspec/rspec-expectations/blob/v3.0.0/lib/rspec/expectations/handler.rb#L44-L63
     class PositiveHandler < RSpec::Expectations::PositiveExpectationHandler
       extend Handler
     end
 
+    # From: https://github.com/rspec/rspec-expectations/blob/v3.0.0/lib/rspec/expectations/handler.rb#L66-L93
     class NegativeHandler < RSpec::Expectations::NegativeExpectationHandler
       extend Handler
     end

data/lib/rspec/wait/target.rb

@@ -5,15 +5,33 @@ require "rspec/wait/handler"
 module RSpec
   module Wait
     class Target < RSpec::Expectations::ExpectationTarget
-      # From: https://github.com/rspec/rspec-expectations/blob/v2.14.5/lib/rspec/expectations/expectation_target.rb#L32-L35
+      # From: https://github.com/rspec/rspec-expectations/blob/v3.0.0/lib/rspec/expectations/expectation_target.rb#L22
+      UndefinedValue = Module.new
+
+      # From: https://github.com/rspec/rspec-expectations/blob/v3.0.0/lib/rspec/expectations/expectation_target.rb#L30-L41
+      def self.for(value, block)
+        if UndefinedValue.equal?(value)
+          unless block
+            raise ArgumentError, "You must pass either an argument or a block to `wait_for`."
+          end
+          new(block)
+        elsif block
+          raise ArgumentError, "You cannot pass both an argument and a block to `wait_for`."
+        else
+          new(value)
+        end
+      end
+      #
+      #
+      # From: https://github.com/rspec/rspec-expectations/blob/v3.0.0/lib/rspec/expectations/expectation_target.rb#L53-L54
       def to(matcher = nil, message = nil, &block)
-        prevent_operator_matchers(:to, matcher)
+        prevent_operator_matchers(:to, matcher) unless matcher
         PositiveHandler.handle_matcher(@target, matcher, message, &block)
       end
 
-      # From: https://github.com/rspec/rspec-expectations/blob/v2.14.5/lib/rspec/expectations/expectation_target.rb#L45-L48
+      # From: https://github.com/rspec/rspec-expectations/blob/v3.0.0/lib/rspec/expectations/expectation_target.rb#L66-L67
       def not_to(matcher = nil, message = nil, &block)
-        prevent_operator_matchers(:not_to, matcher)
+        prevent_operator_matchers(:not_to, matcher) unless matcher
         NegativeHandler.handle_matcher(@target, matcher, message, &block)
       end
     end

data/rspec-wait.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name    = "rspec-wait"
-  spec.version = "0.0.1"
+  spec.version = "0.0.2"
 
   spec.author      = "Steve Richert"
   spec.email       = "steve.richert@gmail.com"

data/spec/wait_for_spec.rb

@@ -15,25 +15,25 @@ describe "wait_for" do
   context "to" do
     it "passes immediately" do
       expect {
-        wait_for(progress).to eq("")
+        wait_for { progress }.to eq("")
       }.not_to raise_error
     end
 
     it "waits for the matcher to pass" do
       expect {
-        wait_for(progress).to eq(".")
+        wait_for { progress }.to eq(".")
       }.not_to raise_error
     end
 
-    it "accepts a block" do
+    it "re-evaluates the actual value" do
       expect {
-        wait_for { progress }.to eq(".")
+        wait_for { progress.dup }.to eq(".")
       }.not_to raise_error
     end
 
     it "fails if the matcher never passes" do
       expect {
-        wait_for(progress).to eq("...")
+        wait_for { progress }.to eq("...")
       }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
     end
 
@@ -48,30 +48,42 @@ describe "wait_for" do
         wait_for { raise RuntimeError }.to eq("..")
       }.to raise_error(RuntimeError)
     end
+
+    it "prevents operator matchers" do
+      expect {
+        wait_for { progress }.to == "."
+      }.to raise_error(ArgumentError)
+    end
+
+    it "accepts a value rather than a block" do
+      expect {
+        wait_for(progress).to eq(".")
+      }.not_to raise_error
+    end
   end
 
   context "not_to" do
     it "passes immediately" do
       expect {
-        wait_for(progress).not_to eq("..")
+        wait_for { progress }.not_to eq("..")
       }.not_to raise_error
     end
 
     it "waits for the matcher not to pass" do
       expect {
-        wait_for(progress).not_to eq("")
+        wait_for { progress }.not_to eq("")
       }.not_to raise_error
     end
 
-    it "accepts a block" do
+    it "re-evaluates the actual value" do
       expect {
-        wait_for { progress }.not_to eq("")
+        wait_for { progress.dup }.not_to eq("")
       }.not_to raise_error
     end
 
     it "fails if the matcher always passes" do
       expect {
-        wait_for(progress).not_to be_a(String)
+        wait_for { progress }.not_to be_a(String)
       }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
     end
 
@@ -89,7 +101,19 @@ describe "wait_for" do
 
     it "respects the to_not alias" do
       expect {
-        wait_for(progress).to_not eq("..")
+        wait_for { progress }.to_not eq("..")
+      }.not_to raise_error
+    end
+
+    it "prevents operator matchers" do
+      expect {
+        wait_for { progress }.not_to == ".."
+      }.to raise_error(ArgumentError)
+    end
+
+    it "accepts a value rather than a block" do
+      expect {
+        wait_for(progress).not_to eq("..")
       }.not_to raise_error
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-wait
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Steve Richert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec