knapsack 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e65fdc9823d7ad10bb38a4d96663526897528565
-  data.tar.gz: ac938b8d273c278c79b87b961a48edd716c0f8a5
+  metadata.gz: 7c687c34dd940bdf5c7594c114be9332548944ff
+  data.tar.gz: 38a10eaa09e1b6b87d4110a5c6173997f6dd73f2
 SHA512:
-  metadata.gz: 67cfb99f75768e27301dc1d0446c5950b8d97640eec3f98062832004d0c2be2931cc2f0421c641817ed50c713fb464a3ee059208fb4bb18d0e58065015f16a18
-  data.tar.gz: 70bf4d8fe18658b1dbeece948208c7b1d2d147384fe59564546976d2b8a1775638ae0cd113d3fc873143b5e3259f5d4e69355ae69d087ba13a6939a15f140c40
+  metadata.gz: 4f4784ef9d81e7b1110269a1b280fdc7fd9b4ce8c16c08612c91a6524754d4e1c35a9fe88512b7d5512d03c26423bd70d2bea7eea15949b06d7eebb728800077
+  data.tar.gz: 6121b44a1c65b71d0a3c44478889cdfd80104448defcefe1b65f0a294b03fb38d6cfb4742e759bc4162ca71d8e54c25375fcb1578a224c87f527d05b7f831cb3

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 * TODO
 
+### 1.0.3
+
+* Fix bug #11 - Track properly time when using Timecop gem in tests.
+
+    https://github.com/ArturT/knapsack/issues/11
+
+    https://github.com/ArturT/knapsack/issues/9
+
 ### 1.0.2
 
 * Fix bug #8 - Sort all tests just in case to avoid wrong order of files when running tests on machines where `Dir.glob` has different implementation.

data/lib/knapsack/tracker.rb

@@ -19,11 +19,11 @@ module Knapsack
     end
 
     def start_timer
-      @start_time = Time.now.to_f
+      @start_time = now_without_mock_time.to_f
     end
 
     def stop_timer
-      @execution_time = Time.now.to_f - @start_time
+      @execution_time = now_without_mock_time.to_f - @start_time
       update_global_time
       update_test_file_time
       @execution_time
@@ -79,5 +79,15 @@ module Knapsack
         ci_node_index: Knapsack::Config::Env.ci_node_index
       })
     end
+
+    private
+
+    def now_without_mock_time
+      if defined?(Timecop)
+        Time.now_without_mock_time
+      else
+        Time.now
+      end
+    end
   end
 end

data/lib/knapsack/version.rb

@@ -1,3 +1,3 @@
 module Knapsack
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/spec/knapsack/tracker_spec.rb

@@ -118,34 +118,67 @@ describe Knapsack::Tracker do
   end
 
   describe 'track time execution' do
-    let(:now) { Time.now }
     let(:test_paths) { ['a_spec.rb', 'b_spec.rb'] }
+    let(:delta) { 0.02 }
 
-    before do
-      test_paths.each_with_index do |test_path, index|
-        Timecop.freeze(now) do
+    shared_examples 'test tracker' do
+      it { expect(tracker.global_time).to be_within(delta).of(0.3) }
+      it { expect(tracker.test_files_with_time.keys.size).to eql 2 }
+      it { expect(tracker.test_files_with_time['a_spec.rb']).to be_within(delta).of(0.1) }
+      it { expect(tracker.test_files_with_time['b_spec.rb']).to be_within(delta).of(0.2) }
+    end
+
+    context 'without Timecop' do
+      before do
+        test_paths.each_with_index do |test_path, index|
           tracker.test_path = test_path
           tracker.start_timer
-        end
-
-        seconds = index + 1
-        Timecop.freeze(now+seconds) do
+          sleep index.to_f / 10 + 0.1
           tracker.stop_timer
         end
       end
+
+      it { expect(tracker.global_time).to be_within(delta).of(0.3) }
+      it { expect(tracker.test_files_with_time.keys.size).to eql 2 }
+      it { expect(tracker.test_files_with_time['a_spec.rb']).to be_within(delta).of(0.1) }
+      it { expect(tracker.test_files_with_time['b_spec.rb']).to be_within(delta).of(0.2) }
     end
 
-    it { expect(tracker.global_time).to eql 3.0 }
-    it do
-      expect(tracker.test_files_with_time).to eql({
-        'a_spec.rb' => 1.0,
-        'b_spec.rb' => 2.0,
-      })
+    context "with Timecop - Timecop shouldn't have impact on measured test time" do
+      let(:now) { Time.now }
+
+      before do
+        test_paths.each_with_index do |test_path, index|
+          Timecop.freeze(now) do
+            tracker.test_path = test_path
+            tracker.start_timer
+          end
+
+          delay = index + 1
+          Timecop.freeze(now+delay) do
+            tracker.stop_timer
+          end
+        end
+      end
+
+      it { expect(tracker.global_time).to be >= 0 }
+      it { expect(tracker.global_time).to be_within(delta).of(0) }
+      it { expect(tracker.test_files_with_time.keys.size).to eql 2 }
+      it { expect(tracker.test_files_with_time['a_spec.rb']).to be_within(delta).of(0) }
+      it { expect(tracker.test_files_with_time['b_spec.rb']).to be_within(delta).of(0) }
     end
+  end
 
-    context '#reset!' do
-      before { tracker.reset! }
-      it_behaves_like 'default trakcer attributes'
+  describe '#reset!' do
+    before do
+      tracker.test_path = 'a_spec.rb'
+      tracker.start_timer
+      sleep 0.1
+      tracker.stop_timer
+      expect(tracker.global_time).not_to eql 0
+      tracker.reset!
     end
+
+    it_behaves_like 'default trakcer attributes'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - ArturT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler