rspec-circleci-coverage 0.1.1110 → 0.1.1145

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da373f1ca732617969ed0c296eb75d4088264b62b3e110cbe06ffb7ba0846c57
-  data.tar.gz: 207dc74865df6bb8dc064ed0f87cf89fa95ee27fe25626906f56d9e994b7ed2e
+  metadata.gz: ec5359771f874dfe64a11041c2e0fc96ac0f93ea9dc82947e5ed5484e8b145b9
+  data.tar.gz: 48b64e6cb655382e26ed8b898750508bf661d070883d1cfead24cf78af19d9ad
 SHA512:
-  metadata.gz: 77154cb1574396b5729c7c059406edb38f258cf196566adbfd5f7cc519335af69adbd363d553b7a16364ea00006384d652c62600b74ffa6e695b91325b07e7bb
-  data.tar.gz: f4ebcaabfdaac8978a19c6e5bf03254279cae3784441421555c38be4235ef1c386636438b48a9ca4b1718f10bf6a95eb9cb4ef70a8fbb0800223001e8c7b5b65
+  metadata.gz: f87216653e41c7e3cd03a81ad395acfe36f4d140e09975c64f6df6e5d00fcc7895814136d95b91ddd9e42e8318f874442670eacbeb5e225c3a39da9a4900bce8
+  data.tar.gz: 71c958607b2a811ae419df88c6c1e2e3e8751f677a444ca72d65ac46986fed8cfd6f2b8d953c58723771bcf962d1058e8ced9c6e96fac4704dc55f554caf9935

data/lib/rspec/circleci/coverage.rb

@@ -20,6 +20,10 @@ module RSpec
       def initialize
         @coverage_data = Hash.new { |h, k| h[k] = {} }
         @before_coverage = {}
+        # Files each example group's before(:context) setup executed
+        @group_setup_files = {}
+        @setup_group = nil
+        @setup_start_coverage = nil
         @installed = false
       end
 
@@ -38,6 +42,9 @@ module RSpec
         RSpec.configure do |config|
           config.before(:suite) do
             $stdout.write("rspec-circleci-coverage: generating CircleCI coverage JSON...\n")
+            # Notify us as each group starts, nested groups included. Registered here
+            # rather than at install so the reporter is built after the formatters
+            config.reporter.register_listener(coverage_instance, :example_group_started, :example_started)
           end
 
           config.before(:each) do |_|
@@ -57,6 +64,20 @@ module RSpec
         end
       end
 
+      # Group setup (before(:context), let_it_be) runs outside example snapshots.
+      # It lasts from the group's start until its first example or nested group
+      # starts, closing before around hooks.
+      def example_group_started(notification)
+        snapshot = ::Coverage.peek_result
+        finish_group_setup(snapshot)
+        @setup_group = notification.group
+        @setup_start_coverage = snapshot
+      end
+
+      def example_started(_notification)
+        finish_group_setup(::Coverage.peek_result) if @setup_group
+      end
+
       def capture_coverage
         @before_coverage = ::Coverage.peek_result.dup
       end
@@ -67,10 +88,30 @@ module RSpec
 
         # Calculate which lines were executed during this test
         test_key = format_test_key(example)
+        files = executed_files(@before_coverage, after_coverage)
+
+        # Include the setup of the example's group and every group around it
+        example.example_group.ancestors.each do |group|
+          files.concat(@group_setup_files.fetch(group, []))
+        end
+
+        files.uniq.each { |file| @coverage_data[file][test_key] = true }
+      end
+
+      def finish_group_setup(coverage)
+        return unless @setup_group
+
+        files = executed_files(@setup_start_coverage, coverage)
+        @group_setup_files[@setup_group] = files unless files.empty?
+        @setup_group = nil
+        @setup_start_coverage = nil
+      end
+
+      def executed_files(before_coverage, after_coverage)
         # Read Dir.pwd (a system call) once per diff, not once per file
         project_root = Dir.pwd
 
-        after_coverage.each do |file, coverage|
+        after_coverage.filter_map do |file, coverage|
           # Skip files outside project scope, spec files, and rspec gem internals
           next unless in_project_scope?(file, project_root)
           next if file.end_with?('_spec.rb')
@@ -78,7 +119,7 @@ module RSpec
           lines = extract_lines(coverage)
           next if lines.nil?
 
-          before_lines = extract_lines(@before_coverage[file])
+          before_lines = extract_lines(before_coverage[file])
           # Skip unchanged files; Array#== runs in C, much faster than the loop below
           next if lines == before_lines
 
@@ -91,7 +132,7 @@ module RSpec
             count > before_count
           end
 
-          @coverage_data[relative_path(file)][test_key] = true if executed
+          relative_path(file) if executed
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-circleci-coverage
 version: !ruby/object:Gem::Version
-  version: 0.1.1110
+  version: 0.1.1145
 platform: ruby
 authors:
 - CircleCI