site_prism.vcr 0.1.0 → 0.1.1

data/spec/unit/applier_spec.rb

@@ -76,7 +76,6 @@ describe SPV::Applier do
     context 'when an event is shifted' do
       let(:cloned_options)    { 'cloned options' }
       let(:options)           { instance_double('SPV::Options', clone_options: cloned_options) }
-      let(:waiter)            { instance_double('SPV::Waiter', wait: true) }
       let(:prepared_fixtures) { 'prepared_fixtures by adjuster' }
 
       let(:adjuster) do
@@ -89,7 +88,7 @@ describe SPV::Applier do
 
       before do
         SPV::DSL::Adjuster.stub(:new).and_return(adjuster)
-        SPV::Waiter.stub(:new).and_return(waiter)
+        SPV::Waiter.stub(:wait)
 
         applier.shift_event { node.click }
       end
@@ -117,16 +116,6 @@ describe SPV::Applier do
         applier.apply_vcr
       end
 
-      it 'initializes the waiter' do
-        expect(SPV::Waiter).to receive(:new).with(
-          node,
-          fixtures_manager,
-          cloned_options
-        ).and_return(waiter)
-
-        applier.apply_vcr
-      end
-
       it 'does the click action over a node' do
         expect(node).to receive(:click)
 
@@ -134,7 +123,11 @@ describe SPV::Applier do
       end
 
       it 'waits until all HTTP interactions are finished' do
-        expect(waiter).to receive(:wait)
+        expect(SPV::Waiter).to receive(:wait).with(
+          node,
+          fixtures_manager,
+          cloned_options
+        )
 
         applier.apply_vcr
       end

data/spec/unit/dsl/adjuster_spec.rb

@@ -24,53 +24,6 @@ describe SPV::DSL::Adjuster do
 
   subject { described_class.new(options, fixtures) }
 
-  describe '#prepare_fixtures' do
-    context 'when the replace action is defined' do
-      let(:replaced_fixtures) { 'replaced fixtures' }
-
-      before do
-        fixtures.stub(:replace).and_return(replaced_fixtures)
-
-        subject.replace
-      end
-
-      it 'replaces fixtures' do
-        expect(fixtures).to receive(:replace).with(raw_fixtures)
-
-        subject.prepare_fixtures
-      end
-
-      it 'returns a new container with fixtures' do
-        expect(subject.prepare_fixtures).to eq(replaced_fixtures)
-      end
-    end
-
-    context 'when the union action is defined' do
-      let(:new_fixtures) { 'new fixtures' }
-
-      before do
-        fixtures.stub(:union).and_return(new_fixtures)
-        subject.union
-      end
-
-      it 'joins fixtures' do
-        expect(fixtures).to receive(:union).with(raw_fixtures)
-
-        subject.prepare_fixtures
-      end
-
-      it 'returns a new container with fixtures' do
-        expect(subject.prepare_fixtures).to eq(new_fixtures)
-      end
-    end
-
-    it 'the replace action is used as a default' do
-      expect(fixtures).to receive(:replace).with(raw_fixtures)
-
-      subject.prepare_fixtures
-    end
-  end
-
   describe '#exchange' do
     def exchange
       subject.exchange(
@@ -149,4 +102,82 @@ describe SPV::DSL::Adjuster do
       subject.waiter_options(my: 'options')
     end
   end
+
+  describe '#prepare_fixtures' do
+    context 'when the replace action is defined' do
+      let(:replaced_fixtures) { 'replaced fixtures' }
+
+      before do
+        fixtures.stub(:replace).and_return(replaced_fixtures)
+
+        subject.replace
+      end
+
+      it 'replaces fixtures' do
+        expect(fixtures).to receive(:replace).with(raw_fixtures)
+
+        subject.prepare_fixtures
+      end
+
+      it 'returns a new container with fixtures' do
+        expect(subject.prepare_fixtures).to eq(replaced_fixtures)
+      end
+    end
+
+    context 'when the union action is defined' do
+      let(:new_fixtures) { 'new fixtures' }
+
+      before do
+        fixtures.stub(:union).and_return(new_fixtures)
+        subject.union
+      end
+
+      it 'joins fixtures' do
+        expect(fixtures).to receive(:union).with(raw_fixtures)
+
+        subject.prepare_fixtures
+      end
+
+      it 'returns a new container with fixtures' do
+        expect(subject.prepare_fixtures).to eq(new_fixtures)
+      end
+    end
+
+    it 'the replace action is used as a default' do
+      expect(fixtures).to receive(:replace).with(raw_fixtures)
+
+      subject.prepare_fixtures
+    end
+  end
+
+  # This case is common for the replace and union action
+  describe '#replace' do
+    context 'when an action is redefined' do
+      it 'raises an error' do
+        subject.union
+        expect{ subject.replace }.to raise_error(
+          SPV::DSL::DoubleActionError,
+          'You cannot use "replace" and "union" actions together. It may lead to unexpected behavior.'
+        )
+      end
+    end
+
+    context 'when the same action is used a few times' do
+      context 'union' do
+        it 'does not raises any error' do
+          subject.union
+
+          expect{ subject.union }.to_not raise_error
+        end
+      end
+
+      context 'replace' do
+        it 'does not raises any error' do
+          subject.replace
+
+          expect{ subject.replace }.to_not raise_error
+        end
+      end
+    end
+  end
 end

data/spec/unit/dsl/initial_adjuster_spec.rb

@@ -28,11 +28,13 @@ describe SPV::DSL::InitialAdjuster do
   end
 
   describe '#fixtures' do
-    let(:raw_fixtures)       { 'some fixtures' }
-    let(:home_path_modifier) { double('home path modifier') }
+    let(:raw_fixtures)           { 'some fixtures' }
+    let(:home_path_modifier)     { double('home path modifier') }
+    let(:relative_path_modifier) { double('relative path modifier') }
 
     before do
       SPV::Fixtures::Modifiers::HomePath.stub(:new).and_return(home_path_modifier)
+      SPV::Fixtures::Modifiers::RelativePath.stub(:new).and_return(relative_path_modifier)
     end
 
     it 'initializes the home path modifier' do
@@ -41,10 +43,19 @@ describe SPV::DSL::InitialAdjuster do
       subject.fixtures(raw_fixtures)
     end
 
+    it 'initializes the relative path modifier' do
+      expect(SPV::Fixtures::Modifiers::RelativePath).to receive(:new).with(options)
+
+      subject.fixtures(raw_fixtures)
+    end
+
     it 'handles raw fixtures' do
       expect(fixtures_handler).to receive(:handle_raw).with(
         raw_fixtures,
-        [home_path_modifier]
+        [
+          home_path_modifier,
+          relative_path_modifier
+        ]
       )
 
       subject.fixtures(raw_fixtures)

data/spec/unit/fixture_spec.rb

@@ -1,13 +1,42 @@
 require 'spec_helper'
 
 describe SPV::Fixture do
-  describe '#add_path' do
-    subject { described_class.new('some name') }
+  describe '#name' do
+    subject { described_class.new(name) }
 
-    it 'have added path to a name of fixture' do
-      subject.add_path('some path/')
+    context 'when there is only a name' do
+      let(:name) { 'test' }
 
-      expect(subject.name).to eq('some path/some name')
+      it 'has correct name' do
+        expect(subject.name).to eq('test')
+      end
+    end
+
+    context 'when there is a name with path' do
+      let(:name) { 'parent_dir/test' }
+
+      it 'has correct name' do
+        expect(subject.name).to eq('parent_dir/test')
+      end
+    end
+
+    context 'when there is a name with a home path' do
+      let(:name) { '~/test' }
+
+      it 'has correct name' do
+        expect(subject.name).to eq('~/test')
+      end
+    end
+  end
+
+  describe '#path=' do
+    subject { described_class.new('somename') }
+
+    it 'have a path object' do
+      subject.path = 'somepath/'
+
+      expect(subject.path).to be_an_instance_of(Pathname)
+      expect(subject.path.to_path).to eq('somepath/')
     end
   end
 
@@ -15,9 +44,17 @@ describe SPV::Fixture do
     subject { described_class.new('~/fixture_name') }
 
     it 'defines a new name with replaced home path symbol' do
+      expect(subject).to receive(:path=).with('my_home_path/')
+
       subject.set_home_path('my_home_path/')
+    end
+
+    it 'defines a new name with replaced home path symbol and keeps a path to subdirectory' do
+      fixture = described_class.new('~/sub/fixture_name')
+
+      expect(fixture).to receive(:path=).with('my_home_path/sub')
 
-      expect(subject.name).to eq('my_home_path/fixture_name')
+      fixture.set_home_path('my_home_path/')
     end
   end
 

data/spec/unit/fixtures/manager_spec.rb

@@ -8,7 +8,12 @@ describe SPV::Fixtures::Manager do
       instance_double(
         'SPV::Fixture',
         name: 'arya_stark',
-        options: {erb: {testvar: true}}
+        options: {
+          erb: {
+            testvar: true,
+            port:    123
+          }
+        }
       )
     end
 
@@ -32,23 +37,37 @@ describe SPV::Fixtures::Manager do
         VCR.eject_cassette
       end
 
-      it 'VCR holds the first fixture' do
-        manager.inject(fixtures)
+      context 'when VCR holds the first fixture' do
+        before do
+          manager.inject(fixtures)
 
-        VCR.eject_cassette
-        fixture = VCR.eject_cassette
+          VCR.eject_cassette
+          @fixture = VCR.eject_cassette
+        end
+
+        it 'has a right fixture name' do
+          expect(@fixture.name).to eq('arya_stark')
+        end
 
-        expect(fixture.name).to eq('arya_stark')
-        expect(fixture.erb).to eq({testvar: true})
+        it 'has custom erb variables' do
+          expect(@fixture.erb).to eq(testvar: true, port: 123)
+        end
       end
 
-      it 'VCR holds the second fixture' do
-        manager.inject(fixtures)
+      context 'when VCR holds the second fixture' do
+        before do
+          manager.inject(fixtures)
+
+          @fixture = VCR.eject_cassette
+        end
 
-        fixture = VCR.eject_cassette
+        it 'has a right fixture name' do
+          expect(@fixture.name).to eq('jon_snow')
+        end
 
-        expect(fixture.name).to eq('jon_snow')
-        expect(fixture.erb).to be_nil
+        it 'has no custom erb variables which was defined for the first fixture' do
+          expect(@fixture.erb).to_not eq(testvar: true, port: 123)
+        end
       end
     end
 

data/spec/unit/fixtures/modifiers/path_spec.rb

@@ -10,7 +10,7 @@ describe SPV::Fixtures::Modifiers::Path do
 
     context 'when the path does not end with slash symbol' do
       it 'adds a given path to the fixture with additional slash symbol' do
-        expect(fixture).to receive(:add_path).with(path + '/')
+        expect(fixture).to receive(:path=).with(path + '/')
 
         subject
       end
@@ -20,7 +20,7 @@ describe SPV::Fixtures::Modifiers::Path do
       let(:path) { 'some path/' }
 
       it 'adds a given path to the fixture without additional slash symbol' do
-        expect(fixture).to receive(:add_path).with(path)
+        expect(fixture).to receive(:path=).with(path)
 
         subject
       end

data/spec/unit/fixtures/modifiers/relative_path_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe SPV::Fixtures::Modifiers::RelativePath do
+  describe '#modify' do
+    let(:fixture) { instance_double('SPV::Fixture', path: 'top_dir/next_dir/../') }
+
+    subject { described_class.new(double) }
+
+    it 'moves up on one level in the hierarchy of directories' do
+      expect(fixture).to receive(:path=).with('top_dir')
+
+      subject.modify(fixture)
+    end
+
+    it 'moves up on 2 levels in the hierarchy of directories' do
+      fixture.stub(:path).and_return('parent_dir/some_dir/next_dir/../../')
+
+      expect(fixture).to receive(:path=).with('parent_dir')
+
+      subject.modify(fixture)
+    end
+  end
+end

data/spec/unit/waiter_spec.rb

@@ -17,63 +17,97 @@ describe SPV::Waiter do
     )
   }
 
-  subject(:waiter)       { described_class.new(node, fixtures_manager, options) }
+  context 'class methods' do
+    describe '.wait' do
+      def wait
+        described_class.wait(node, fixtures_manager, options)
+      end
 
-  describe '#wait' do
-    context 'when a waiter is defined' do
-      let(:node) { double('node of DOM', wait_for_content: true) }
+      let(:waiter) { instance_double('SPV::Waiter', wait: true) }
 
       before do
-        options.stub(:waiter).and_return(proc { self.wait_for_content })
+        described_class.stub(:new).and_return(waiter)
       end
 
-      it 'calls the waiter to wait until all HTTP interactions are finished' do
-        expect(node).to receive(:wait_for_content)
+      it 'initializes a new instance of the waiter' do
+        expect(described_class).to receive(:new).with(
+          node, fixtures_manager, options
+        )
 
-        waiter.wait
+        wait
       end
 
-      context 'when the option disallowing fixtures ejection is not passed' do
-        it 'ejects fixtures' do
-          expect(fixtures_manager).to receive(:eject)
+      it 'the waiter waits :)' do
+        expect(waiter).to receive(:wait)
 
-          waiter.wait
-        end
+        wait
       end
 
-      context 'when the option disallowing fixtures ejection is passed' do
+      it 'returns the waiter' do
+        expect(wait).to eq(waiter)
+      end
+    end
+  end
+
+  context 'instance methods' do
+    subject(:waiter) { described_class.new(node, fixtures_manager, options) }
+
+    describe '#wait' do
+      context 'when a waiter is defined' do
+        let(:node) { double('node of DOM', wait_for_content: true) }
+
         before do
-          options.stub(:waiter_options).and_return(eject_cassettes: false)
+          options.stub(:waiter).and_return(proc { self.wait_for_content })
         end
 
-        it 'does not eject fixtures' do
-          expect(fixtures_manager).to_not receive(:eject)
+        it 'calls the waiter to wait until all HTTP interactions are finished' do
+          expect(node).to receive(:wait_for_content)
 
           waiter.wait
         end
+
+        context 'when the option disallowing fixtures ejection is not passed' do
+          it 'ejects fixtures' do
+            expect(fixtures_manager).to receive(:eject)
+
+            waiter.wait
+          end
+        end
+
+        context 'when the option disallowing fixtures ejection is passed' do
+          before do
+            options.stub(:waiter_options).and_return(eject_cassettes: false)
+          end
+
+          it 'does not eject fixtures' do
+            expect(fixtures_manager).to_not receive(:eject)
+
+            waiter.wait
+          end
+        end
       end
-    end
 
-    context 'when a waiter is not defined' do
-      it 'the fixtures handler does not eject fixtures' do
-        expect(fixtures_manager).to_not receive(:eject)
+      context 'when a waiter is not defined' do
+        it 'the fixtures handler does not eject fixtures' do
+          expect(fixtures_manager).to_not receive(:eject)
 
-        waiter.wait
+          waiter.wait
+        end
       end
     end
-  end
 
-  describe '#with_new_options' do
-    let(:new_options) { 'some new options' }
+    describe '#with_new_options' do
+      let(:new_options) { 'some new options' }
 
-    it 'initializes a new instance of the waiter' do
-      subject
+      it 'initializes a new instance of the waiter' do
+        subject
 
-      expect(described_class).to receive(:new).with(
-        node, fixtures_manager, new_options
-      )
+        expect(described_class).to receive(:new).with(
+          node, fixtures_manager, new_options
+        )
 
-      waiter.with_new_options(new_options)
+        waiter.with_new_options(new_options)
+      end
     end
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: site_prism.vcr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dmitriy Nesteryuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: site_prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem integrates VCR library into SitePrism
@@ -59,9 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -79,8 +79,10 @@ files:
 - lib/site_prism_vcr/fixtures/converter.rb
 - lib/site_prism_vcr/fixtures/handler.rb
 - lib/site_prism_vcr/fixtures/manager.rb
+- lib/site_prism_vcr/fixtures/modifiers/base.rb
 - lib/site_prism_vcr/fixtures/modifiers/home_path.rb
 - lib/site_prism_vcr/fixtures/modifiers/path.rb
+- lib/site_prism_vcr/fixtures/modifiers/relative_path.rb
 - lib/site_prism_vcr/fixtures/tmp_keeper.rb
 - lib/site_prism_vcr/options.rb
 - lib/site_prism_vcr/options_with_path.rb
@@ -103,6 +105,7 @@ files:
 - spec/integration/pages/load_spec.rb
 - spec/spec_helper.rb
 - spec/spec_integration_helper.rb
+- spec/support/server.rb
 - spec/support/shared/integration/custom_fixtures.rb
 - spec/support/shared/integration/exchange.rb
 - spec/support/shared/integration/home_path.rb
@@ -129,6 +132,7 @@ files:
 - spec/unit/fixtures/manager_spec.rb
 - spec/unit/fixtures/modifiers/home_path_spec.rb
 - spec/unit/fixtures/modifiers/path_spec.rb
+- spec/unit/fixtures/modifiers/relative_path_spec.rb
 - spec/unit/fixtures/tmp_keeper_spec.rb
 - spec/unit/fixtures_spec.rb
 - spec/unit/options_spec.rb
@@ -136,7 +140,7 @@ files:
 - spec/unit/patches/page_spec.rb
 - spec/unit/vcr_helpers_spec.rb
 - spec/unit/waiter_spec.rb
-homepage: https://github.com/nestd/site_prism.vcr
+homepage: http://github.com/dnesteryuk/site_prism.vcr
 licenses:
 - MIT
 metadata: {}
@@ -146,17 +150,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: VCR and SitePrism are awesome libraries. But, it is a bit difficult to work
@@ -178,6 +182,7 @@ test_files:
 - spec/integration/pages/load_spec.rb
 - spec/spec_helper.rb
 - spec/spec_integration_helper.rb
+- spec/support/server.rb
 - spec/support/shared/integration/custom_fixtures.rb
 - spec/support/shared/integration/exchange.rb
 - spec/support/shared/integration/home_path.rb
@@ -204,6 +209,7 @@ test_files:
 - spec/unit/fixtures/manager_spec.rb
 - spec/unit/fixtures/modifiers/home_path_spec.rb
 - spec/unit/fixtures/modifiers/path_spec.rb
+- spec/unit/fixtures/modifiers/relative_path_spec.rb
 - spec/unit/fixtures/tmp_keeper_spec.rb
 - spec/unit/fixtures_spec.rb
 - spec/unit/options_spec.rb