Merge dd181e5 into 346bd29

mfpiccolo · Oct 17, 2014 · 7cf3475 · 7cf3475
2 parents 346bd29 + dd181e5
commit 7cf3475
Show file tree

Hide file tree

Showing 11 changed files with 215 additions and 51 deletions.
diff --git a/lib/minitest-vcr/spec.rb b/lib/minitest-vcr/spec.rb
@@ -8,7 +8,7 @@ def self.configure!
       run_before = lambda do |example|
         if metadata[:vcr]
           options = metadata[:vcr].is_a?(Hash) ? metadata[:vcr] : {}
-          VCR.insert_cassette StringHelpers.vcr_path(example.class.name, example, spec_name), options
+          VCR.insert_cassette StringHelpers.vcr_path(example, spec_name), options
         end
       end
 
@@ -24,14 +24,22 @@ def self.configure!
 
   module StringHelpers
 
-    def self.vcr_path(example_class_name, example, spec_name)
-      prep(example.class.name).push(spec_name).join("/")
+    def self.vcr_path(example, spec_name)
+      description_stack(example).push(spec_name).join("/")
     end
 
     protected
 
-    def self.prep string
-      string.split("::").map {|e| e.sub(/[^\w]*$/, "")}.reject(&:empty?) - ["vcr"]
+    def self.description_stack(example)
+      frame = example.class
+      stack = []
+
+      while frame != Minitest::Spec do
+        stack.unshift frame.desc.to_s
+        frame = frame.superclass
+      end
+
+      return stack
     end
 
   end

diff --git a/...roup/uses_a_cassette_for_any_examples.yml → ...roup/uses_a_cassette_for_any_examples.yml b/...roup/uses_a_cassette_for_any_examples.yml → ...roup/uses_a_cassette_for_any_examples.yml
diff --git a/...ted_example_group/can_supply_metadata.yml → ...ted_example_group/can_supply_metadata.yml b/...ted_example_group/can_supply_metadata.yml → ...ted_example_group/can_supply_metadata.yml
diff --git a/...roup/uses_a_cassette_for_any_examples.yml → ...roup/uses_a_cassette_for_any_examples.yml b/...roup/uses_a_cassette_for_any_examples.yml → ...roup/uses_a_cassette_for_any_examples.yml
diff --git a/...d_describe/example_in_nested_describe.yml → ...d_describe/example_in_nested_describe.yml b/...d_describe/example_in_nested_describe.yml → ...d_describe/example_in_nested_describe.yml
diff --git a/...es/MinitestVcr/Spec/top_level_example.yml → ...es/MinitestVcr_Spec/top_level_example.yml b/...es/MinitestVcr/Spec/top_level_example.yml → ...es/MinitestVcr_Spec/top_level_example.yml
diff --git a/test/cassettes/Some_Crazy_Nested_RandomClass/nested_describe/example_in_nested_describe.yml b/test/cassettes/Some_Crazy_Nested_RandomClass/nested_describe/example_in_nested_describe.yml