vcr 2.1.0 → 2.1.1

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 ## In git
 
-[Full Changelog](http://github.com/myronmarston/vcr/compare/v2.0.1...master)
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v2.1.1...master)
+
+## 2.1.1 (April 24, 2012)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v2.1.0...v2.1.1)
+
+* Fix `:use_scenario_name` cucumber tag option so that it works properly
+  with multiple scenarios. Thanks to [Brent Snook](https://github.com/brentsnook)
+  for reporting this bug.
+* Fix `:use_scenario_name` cucumber tag option so that it only uses the
+  first line of the scenario feature name. Cucumber includes all of the
+  pre-amble text in the feature name but that can create a ridiculously
+  long cassette name. Thanks to [Brent Snook](https://github.com/brentsnook)
+  for reporting this bug.
+
+## 2.1.0 (April 19, 2012)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v2.0.1...v.2.1.0)
 
 * Add new `:use_scenario_name` option to the cucumber tags API. This
   allows you to use a generic tag (such as `@vcr`) and have the

data/features/test_frameworks/cucumber.feature

@@ -75,6 +75,10 @@ Feature: Usage with Cucumber
       """
       Feature: VCR example
 
+        Note: Cucumber treats the pre-amble as part of the feature name. When
+        using the :use_scenario_name option, VCR will only use the first line
+        of the feature name as the directory for the cassette.
+
         @localhost_request
         Scenario: tagged scenario
           When a request is made to "http://localhost:7777/localhost_request_1"

data/lib/vcr/test_frameworks/cucumber.rb

@@ -26,18 +26,23 @@ module VCR
     # @param [Array<String>] tag_names the cucumber scenario tags
     # @param [(optional) Hash] options the cassette options. Specify :use_scenario_name => true to automatically name the cassette according to the scenario name.
     def tags(*tag_names)
-      options = tag_names.last.is_a?(::Hash) ? tag_names.pop : {}
+      original_options = tag_names.last.is_a?(::Hash) ? tag_names.pop : {}
       tag_names.each do |tag_name|
         tag_name = "@#{tag_name}" unless tag_name =~ /\A@/
-        cassette_name = "cucumber_tags/#{tag_name.gsub(/\A@/, '')}"
 
         # It would be nice to use an Around hook here, but
         # cucumber has a bug: background steps do not run
         # within an around hook.
         # https://gist.github.com/652968
         @main_object.Before(tag_name) do |scenario|
-          options = options.dup
-          cassette_name = "#{scenario.feature.name}/#{scenario.name}" if options.delete(:use_scenario_name)
+          options = original_options.dup
+
+          cassette_name = if options.delete(:use_scenario_name)
+            "#{scenario.feature.name.split("\n").first}/#{scenario.name}"
+          else
+            "cucumber_tags/#{tag_name.gsub(/\A@/, '')}"
+          end
+
           VCR.insert_cassette(cassette_name, options)
         end
 

data/lib/vcr/version.rb

@@ -10,7 +10,7 @@ module VCR
   #   * `parts` [Array<Integer>] List of the version parts.
   def version
     @version ||= begin
-      string = '2.1.0'
+      string = '2.1.1'
 
       def string.parts
         split('.').map { |p| p.to_i }

data/spec/vcr/test_frameworks/cucumber_spec.rb

@@ -4,8 +4,12 @@ describe VCR::CucumberTags do
   subject { described_class.new(self) }
   let(:before_blocks_for_tags) { {} }
   let(:after_blocks_for_tags) { {} }
-  let(:current_scenario) { stub(:name => "My scenario name",
-                                :feature => stub(:name => "My feature name")) }
+
+  def scenario(name)
+    stub(:name => name, :feature => stub(:name => "My feature name\nThe preamble text is not included"))
+  end
+
+  let(:current_scenario) { scenario "My scenario name" }
 
   # define our own Before/After so we can test this in isolation from cucumber's implementation.
   def Before(tag, &block)
@@ -16,12 +20,12 @@ describe VCR::CucumberTags do
     after_blocks_for_tags[tag.sub('@', '')] = block
   end
 
-  def test_tag(cassette_attribute, tag, expected_value)
+  def test_tag(cassette_attribute, tag, expected_value, scenario=current_scenario)
     VCR.current_cassette.should be_nil
 
-    before_blocks_for_tags[tag].call(current_scenario)
+    before_blocks_for_tags[tag].call(scenario)
     VCR.current_cassette.send(cassette_attribute).should eq(expected_value)
-    after_blocks_for_tags[tag].call(current_scenario)
+    after_blocks_for_tags[tag].call(scenario)
 
     VCR.current_cassette.should be_nil
   end
@@ -73,6 +77,13 @@ describe VCR::CucumberTags do
           original_options[:use_scenario_name].should eq(true)
           original_options[:record].should eq(:none)
         end
+
+        it "works properly when multiple scenarios use the tag" do
+          subject.send(tag_method, 'tag1', :use_scenario_name => true)
+
+          test_tag(:name, 'tag1', 'My feature name/Foo', scenario("Foo"))
+          test_tag(:name, 'tag1', 'My feature name/Bar', scenario("Bar"))
+        end
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-19 00:00:00 Z
+date: 2012-04-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement