knapsack 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e0c6e0155db9874413db7e03df64a0f62c8f185
-  data.tar.gz: a668e3c36473d5c6422352974b546de613e12dca
+  metadata.gz: d2e90b914f73323de26c0539169858e4e0ce4dad
+  data.tar.gz: 5b2ab7f2a542048f0837b57c0064b021eae864b2
 SHA512:
-  metadata.gz: 62b7636c2a124a66bb7e794a55cf1af786f98a5991dbdec997a1ff9b0f8b4d189f2e12c11958598ecd68305e01df515e398eb59b0ce1bf88023033b2f6107df5
-  data.tar.gz: df7ac31711b33ea9b2252fe67fb2e88ec75db0679e43154adb74587456feaad26b7ad173705361ba7e7fd05547875b7392eb725e8644281b0deccbf711121861
+  metadata.gz: c1cefe0b4388e834ea2a4fcf1b3a11889f613263548b7fb2122bfb956afbb9292266a9c56b0779b416c2c1b4bad84fc0f13d7f6bfa4c2ae3e6ab2fb374f086d5
+  data.tar.gz: fbd8a0d55183b73e7f923d3cd55f272dd8c38ce1bc587023d90274df70e420e02799e55e0150ce3a916068a47005e24ef405f3a59adcebe20adef5492b38a953

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 * TODO
 
+### 1.6.0
+
+* Add support for Cucumber 2
+
+    https://github.com/ArturT/knapsack/issues/30
+
+https://github.com/ArturT/knapsack/compare/v1.5.1...v1.6.0
+
 ### 1.5.1
 
 * Add link to FAQ at the end of time offset warning

data/lib/knapsack/adapters/cucumber_adapter.rb

@@ -5,8 +5,8 @@ module Knapsack
       REPORT_PATH = 'knapsack_cucumber_report.json'
 
       def bind_time_tracker
-        Around do |scenario_or_outline_table, block|
-          Knapsack.tracker.test_path = CucumberAdapter.test_path(scenario_or_outline_table)
+        Around do |object, block|
+          Knapsack.tracker.test_path = CucumberAdapter.test_path(object)
           Knapsack.tracker.start_timer
           block.call
           Knapsack.tracker.stop_timer
@@ -30,11 +30,17 @@ module Knapsack
         end
       end
 
-      def self.test_path(scenario_or_outline_table)
-        if scenario_or_outline_table.respond_to?(:file)
-          scenario_or_outline_table.file
+      def self.test_path(object)
+        if Cucumber::VERSION.to_i >= 2
+          test_case = object
+          test_case.location.file
         else
-          scenario_or_outline_table.scenario_outline.file
+          scenario_or_outline_table = object
+          if scenario_or_outline_table.respond_to?(:file)
+            scenario_or_outline_table.file
+          else
+            scenario_or_outline_table.scenario_outline.file
+          end
         end
       end
 

data/lib/knapsack/version.rb

@@ -1,3 +1,3 @@
 module Knapsack
-  VERSION = '1.5.1'
+  VERSION = '1.6.0'
 end

data/spec/knapsack/adapters/cucumber_adapter_spec.rb

@@ -9,32 +9,59 @@ describe Knapsack::Adapters::CucumberAdapter do
   end
 
   describe 'bind methods' do
-    let(:file) { 'features/a.feature' }
-    let(:scenario) { double(file: file) }
-    let(:block) { double }
     let(:logger) { instance_double(Knapsack::Logger) }
-    let(:global_time) { 'Global time: 01m 05s' }
 
     before do
       expect(Knapsack).to receive(:logger).and_return(logger)
     end
 
     describe '#bind_time_tracker' do
+      let(:file) { 'features/a.feature' }
+      let(:block) { double }
+      let(:global_time) { 'Global time: 01m 05s' }
       let(:tracker) { instance_double(Knapsack::Tracker) }
 
-      it do
-        expect(subject).to receive(:Around).and_yield(scenario, block)
-        allow(Knapsack).to receive(:tracker).and_return(tracker)
-        expect(tracker).to receive(:test_path=).with(file)
-        expect(tracker).to receive(:start_timer)
-        expect(block).to receive(:call)
-        expect(tracker).to receive(:stop_timer)
+      context 'when Cucumber version 1' do
+        let(:scenario) { double(file: file) }
 
-        expect(::Kernel).to receive(:at_exit).and_yield
-        expect(Knapsack::Presenter).to receive(:global_time).and_return(global_time)
-        expect(logger).to receive(:info).with(global_time)
+        before { stub_const('Cucumber::VERSION', '1.3.20') }
+
+        it do
+          expect(subject).to receive(:Around).and_yield(scenario, block)
+          allow(Knapsack).to receive(:tracker).and_return(tracker)
+          expect(tracker).to receive(:test_path=).with(file)
+          expect(tracker).to receive(:start_timer)
+          expect(block).to receive(:call)
+          expect(tracker).to receive(:stop_timer)
+
+          expect(::Kernel).to receive(:at_exit).and_yield
+          expect(Knapsack::Presenter).to receive(:global_time).and_return(global_time)
+          expect(logger).to receive(:info).with(global_time)
+
+          subject.bind_time_tracker
+        end
+      end
+
+      context 'when Cucumber version 2' do
+        let(:test_case) { double(location: double(file: file)) }
+
+        # complex version name to ensure we can catch that too
+        before { stub_const('Cucumber::VERSION', '2.0.0.rc.5') }
+
+        it do
+          expect(subject).to receive(:Around).and_yield(test_case, block)
+          allow(Knapsack).to receive(:tracker).and_return(tracker)
+          expect(tracker).to receive(:test_path=).with(file)
+          expect(tracker).to receive(:start_timer)
+          expect(block).to receive(:call)
+          expect(tracker).to receive(:stop_timer)
 
-        subject.bind_time_tracker
+          expect(::Kernel).to receive(:at_exit).and_yield
+          expect(Knapsack::Presenter).to receive(:global_time).and_return(global_time)
+          expect(logger).to receive(:info).with(global_time)
+
+          subject.bind_time_tracker
+        end
       end
     end
 
@@ -68,22 +95,37 @@ describe Knapsack::Adapters::CucumberAdapter do
   end
 
   describe '.test_path' do
-    subject { described_class.test_path(scenario_or_outline_table) }
+    context 'when Cucumber version 1' do
+      subject { described_class.test_path(scenario_or_outline_table) }
 
-    context 'when scenario' do
-      let(:scenario_file) { 'features/scenario.feature' }
-      let(:scenario_or_outline_table) { double(file: scenario_file) }
+      before { stub_const('Cucumber::VERSION', '1') }
 
-      it { should eql scenario_file }
-    end
+      context 'when scenario' do
+        let(:scenario_file) { 'features/scenario.feature' }
+        let(:scenario_or_outline_table) { double(file: scenario_file) }
+
+        it { should eql scenario_file }
+      end
+
+      context 'when scenario outline' do
+        let(:scenario_outline_file) { 'features/scenario_outline.feature' }
+        let(:scenario_or_outline_table) do
+          double(scenario_outline: double(file: scenario_outline_file))
+        end
 
-    context 'when scenario outline' do
-      let(:scenario_outline_file) { 'features/scenario_outline.feature' }
-      let(:scenario_or_outline_table) do
-        double(scenario_outline: double(file: scenario_outline_file))
+        it { should eql scenario_outline_file }
       end
+    end
+
+    context 'when Cucumber version 2' do
+      let(:file) { 'features/a.feature' }
+      let(:test_case) { double(location: double(file: file)) } # Cucumber 2
+
+      subject { described_class.test_path(test_case) }
+
+      before { stub_const('Cucumber::VERSION', '2') }
 
-      it { should eql scenario_outline_file }
+      it { should eql file }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - ArturT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake