flakey_spec_catcher 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1be370079a94e8f578e03be6e8683cd76ff8d1f5656422427c8ca3920856b38c
-  data.tar.gz: 6dddff4adf5e7f452a366bff7b67a50e8e4a04e64a9165c80e9318235afcae33
+  metadata.gz: 6a88793e18d2fc8a483639620b2876b4955f3fc8a5425f41a25cc2e3509cd6e0
+  data.tar.gz: f4c0a38a03eb0fabcde7111f3bf8bfc3698a7c5c576a106fb7c7b4337ed782b8
 SHA512:
-  metadata.gz: b49520ad8fe8a9115ae04bf90c93159694c0bcbbae087acaa9953aac26927b61efb68e3531d9097ea86b5b60d8bf6f84df685baf6798c95bcd0f5e560c752af5
-  data.tar.gz: 927b24f3283dfdd8575c3210a560c21a63f315bc98ada713390b15ac1d3dea0773534d761bf51ca5216eaee03567f7602e50615dc85fdab52620ab78ea456070
+  metadata.gz: 8c033294dc195ab6784dc22919ff986f7e646657b85a7efe6a5780333b666b4a7c7bba5f10ab41839ee9574cd9f4307a6f9b6c276f5da4f9144b5828dd1f2e06
+  data.tar.gz: 00a950c3296e05a81c8294c2005d6c84b454296de2f697b7ef2152ec6f29ef02c6305b3749d3a2d1449436fa1b6fb6ac0ccc2d9e3f5ae9db7ebef04043db2b96

data/lib/flakey_spec_catcher/change_capsule.rb

@@ -24,23 +24,30 @@ module FlakeySpecCatcher
       @change_contexts.map(&:rerun_info)
     end
 
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
     def fill_contexts
       change_context_stack = []
       ignore_scope_closure = 0
       lines_in_file = File.read(@file_name).split("\n")
       lines_in_file.each_with_index do |line, index|
+        shared_example_identified = false
+
         # Check if line matches an rspec example or examplegroup format
         if line =~ spec_scope
           handle_change_context(line, index, change_context_stack)
         # Else, ignore other blocks that might pollute context stack
+        elsif line =~ shared_example_scope
+          handle_change_context(line, index, change_context_stack)
+          shared_example_identified = true
         elsif line_matches_method_or_block(line)
           ignore_scope_closure += 1
         end
 
         fill_context(line, index, change_context_stack)
 
-        # Note - some things use do-like loops and we need to be able to ignore those
-        if line =~ pop_scope
+        if shared_example_identified
+          change_context_stack.pop
+        elsif line =~ pop_scope
           if ignore_scope_closure.positive?
             ignore_scope_closure -= 1
           else
@@ -49,6 +56,7 @@ module FlakeySpecCatcher
         end
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
     private
 
@@ -70,14 +78,15 @@ module FlakeySpecCatcher
     end
 
     def spec_scope
-      # Not sure if we need to check for description in quotes
-      # spec_scope = /^\s*(#{SCOPE_SPECIFIERS.join("|")})\s*('.*'|".*").*do\s*$/
-
       /\s*(#{SCOPE_SPECIFIERS.join("|")}).*\s+do.*$/
     end
 
+    def shared_example_scope
+      /\s*(#{SHARED_EXAMPLES.join("|")}).*\s+.*$/
+    end
+
     def line_matches_method_or_block(line)
-      return true if line =~ /\s*do(\s+|$)/ || line =~ /^\s*def\s+/ || line =~ /^\s*if\s+/
+      return true if line =~ /\s*do(\s+|$)/ || line =~ /^\s*def\s+/ || line =~ /^\s*if\s+/ || line =~ /^\s*class\s+/
 
       false
     end

data/lib/flakey_spec_catcher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FlakeySpecCatcher
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flakey_spec_catcher
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Brian Watson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec