rspec_expectation_count 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a89daebe2c66a3015e00e647acd86d455ef57821
-  data.tar.gz: 2019f766fd468afb7969311b4670a17356f67ba0
+  metadata.gz: fa910653f80c135dc5e3a8f963ed8c0242ea2642
+  data.tar.gz: f4633ef7cf7c2e938ef6ad5d2a8884a0fd1ee798
 SHA512:
-  metadata.gz: d052f7fe7ebb99145ada3897724f32d5312d3fff0905801c2304ee245ca7df14f5d2f69e413deb6887eb3b48dae3bb649a5e47e61a31fb94f01de47bb6ced4de
-  data.tar.gz: 35c427d364bb558a928127d7a715fa6ee12ee40778027b3cc088767623bea9da94e844201514c73ab232d517b9896bdad124307fe6f5a991a17aa99b42c3d415
+  metadata.gz: 63b3649d4c429c7f9ff8d441067c39ee992277dca14cbd40f6ad57e2a6b3c0b2d182f2255bf8c22aceb0b619b71cbc1aa48b243e2504cb6be62e62e2ba07d651
+  data.tar.gz: 6a7960b03ade8d07a9ad9e0beafad806de163d8b0a2660ef18c3915c91a40d899fba177f196315df89a8f3c5b1c6d04752d7a22a94d0aa2cb0a9afb103dafc28

data/lib/rspec_expectation_count/expectation_debug.rb

@@ -6,22 +6,41 @@ unless ::RSpec::Expectations.expectation_debug.is_a?(Array)
           @expectation_debug ||= []
         end
 
-        attr_accessor :last_spec_hash
+        attr_accessor :current_expect, :last_expect
+        attr_accessor :last_spec_line, :current_spec_line
+
+        PWD = Dir.pwd
 
         TracePoint.new do |trace|
           file_path = trace.path
-          if file_path.end_with?('_spec.rb')
+          if file_path.include?(PWD)
             line_number = trace.lineno
-            line        = IO.readlines(file_path)[line_number - 1]
-            if line.include?('expect') # expect() || expect { }
-              expect_hash = { file: file_path, line: line.strip, line_number: line_number }
-              ::RSpec::Expectations.last_spec_hash = expect_hash
+
+            # track last spec line for deduping expects
+            if file_path.end_with?('_spec.rb')
+              ::RSpec::Expectations.last_spec_line    = ::RSpec::Expectations.current_spec_line
+              ::RSpec::Expectations.current_spec_line = line_number
+            end
+
+            line = IO.readlines(file_path)[line_number - 1]
+            if line.match(/expect\s*[\{\(]/) # expect () || expect { }
+              expect_hash                          = { file: file_path, line: line.strip, line_number: line_number }
+              ::RSpec::Expectations.last_expect    = ::RSpec::Expectations.current_expect
+              ::RSpec::Expectations.current_expect = expect_hash
             end
           end
         end.enable
 
+        def update_expectation_count
+          # if we've previously seen the expect and haven't advanced to the next spec line
+          # then it's most likely a duplicate execution.
+          return if (current_expect == last_expect) && (last_spec_line == current_spec_line)
+          @expectation_count = expectation_count + 1
+          update_expectation_debug
+        end
+
         def update_expectation_debug
-          expectation_debug << last_spec_hash
+          expectation_debug << current_expect
         end
       end
     end

data/lib/rspec_expectation_count/rspec_expectation_count.rb

@@ -13,22 +13,26 @@ unless ::RSpec::Expectations.respond_to?(:expectation_count)
           @expectation_count ||= 0
         end
 
-        attr_writer :expectation_count
-
-        def update_expectation_debug
+        def update_expectation_count
+          @expectation_count = expectation_count + 1
         end
 
         def expectation_debug
         end
       end
 
+      # with waiting rspec matchers, it's not sufficient to just count
+      # the amount of times an expectation is handled. instead we need to
+      # dedupe and count each expectation exactly once (exluding retries)
+      #
+      # this logic relies on trace points so it's handled in the optional
+      # expectation_debug.rb file
       class PositiveExpectationHandler
         class << self
           alias_method :old_handle_matcher, :handle_matcher
 
           def handle_matcher(*args)
-            ::RSpec::Expectations.update_expectation_debug
-            ::RSpec::Expectations.expectation_count += 1
+            ::RSpec::Expectations.update_expectation_count
             old_handle_matcher(*args)
           end
         end
@@ -39,8 +43,7 @@ unless ::RSpec::Expectations.respond_to?(:expectation_count)
           alias_method :old_handle_matcher, :handle_matcher
 
           def handle_matcher(*args)
-            ::RSpec::Expectations.update_expectation_debug
-            ::RSpec::Expectations.expectation_count += 1
+            ::RSpec::Expectations.update_expectation_count
             old_handle_matcher(*args)
           end
         end

data/lib/rspec_expectation_count/version.rb

@@ -1,4 +1,4 @@
 module RSpecExpectationCount
-  VERSION = '0.0.3' unless defined? ::RSpecExpectationCount::VERSION
+  VERSION = '0.0.4' unless defined? ::RSpecExpectationCount::VERSION
   DATE    = '2015-11-09' unless defined? ::RSpecExpectationCount::DATE
 end

data/release_notes.md

@@ -1,3 +1,11 @@
+#### v0.0.4 2015-11-09
+
+- [6479112](https://github.com/bootstraponline/rspec_expectation_count/commit/64791121d66302fba64d2c526d12e0c9798dfb5f) Release 0.0.4
+- [6352584](https://github.com/bootstraponline/rspec_expectation_count/commit/63525847cc56f144dccd863429f8eba12cf51815) Clean up code
+- [4ba752a](https://github.com/bootstraponline/rspec_expectation_count/commit/4ba752a98b0fef9cd6a787e3749f410b74ee9b7b) Fix expectation dedupe detection
+- [17c2bd6](https://github.com/bootstraponline/rspec_expectation_count/commit/17c2bd60d89d38847ef8aec71aac0ff314d3e109) Track expects outside specs
+
+
 #### v0.0.3 2015-11-09
 
 - [ba31882](https://github.com/bootstraponline/rspec_expectation_count/commit/ba3188209ee245ecc42f7eb2963ebc9d754cd134) Release 0.0.3

data/rspec_expectation_count.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'thor', '>= 0.19.1'
   s.add_development_dependency 'pry', '>= 0.10.3'
   s.add_development_dependency 'rubocop', '~> 0.35.0'
+  s.add_development_dependency 'waiting_rspec_matchers', '~> 0.3'
 
   s.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})

data/spec3/assert.rb

@@ -0,0 +1,3 @@
+def assert_true
+  expect(1).to eq(1)
+end

data/spec3/assert_spec.rb

@@ -0,0 +1,9 @@
+require_relative '../lib/rspec_expectation_count'
+require_relative '../lib/rspec_expectation_count/expectation_debug'
+require_relative 'assert'
+
+describe 'count' do
+  it 'tracks expects outside spec files' do
+    assert_true
+  end
+end

data/spec3/dupe_spec.rb

@@ -0,0 +1,27 @@
+require_relative '../lib/rspec_expectation_count'
+require_relative '../lib/rspec_expectation_count/expectation_debug'
+require 'rubygems'
+require 'waiting_rspec_matchers'
+
+RSpec.configure { |c| c.include WaitingRspecMatchers }
+
+def assert_true
+  expect(1).to eq(1)
+end
+
+describe 'count' do
+  it 'rejects duplicate specs' do
+    @count = 0
+
+    # this should count as 1 expectation instead of 6
+    expect { @count += 1 }.to become_eq(5)
+
+    # these should count as one expectation each
+    assert_true
+    assert_true
+    assert_true
+    assert_true
+
+    # expectation count should be 5 (1 become_eq, 4 assert_true)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec_expectation_count
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - code@bootstraponline.com
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.35.0
+- !ruby/object:Gem::Dependency
+  name: waiting_rspec_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: Count the number of expectations used in an RSpec test suite.
 email:
 - code@bootstraponline.com
@@ -101,7 +115,10 @@ files:
 - release_notes.md
 - rspec_expectation_count.gemspec
 - spec2/count_spec.rb
+- spec3/assert.rb
+- spec3/assert_spec.rb
 - spec3/count_spec.rb
+- spec3/dupe_spec.rb
 homepage: https://github.com/bootstraponline/rspec_expectation_count
 licenses:
 - http://www.apache.org/licenses/LICENSE-2.0.txt