delta_test 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a176739129c5821a3db48e783d057a02ac2e7d7f
-  data.tar.gz: 76065c7dd622c9b4077431e5a5662a97fbb27d80
+  metadata.gz: d14bb0fcf07a5b5d636080569681613af4c042df
+  data.tar.gz: 4545cf1bb2ed91db20065b5c646697a688337adb
 SHA512:
-  metadata.gz: 5b6a2b75604884e8c1d93929e4c4a3d179392c4df79ed581e7206e69e474553186413c49e1435bca207c905a20fe847435ed0ec2391a7bd3c954e9f7e5ba486a
-  data.tar.gz: 7a5df579dfe7ca4a60eebdd863094e7e75cb5584f4dbb5572bd58dd23ac30f3e56246a6a42cc916db6b4b51724b750a488b224e494320f8fddbc259ffeb431b6
+  metadata.gz: 7f707be5d9acce380728b7ae36fe87941861360a035362c8257feb343575675f78e241d744f23b5419fe005d03f96df511f28357cfa64dc8cb89a2118b4e2203
+  data.tar.gz: 4e0610584cca7b8e9a2c36535c7c4b8a821281811f64d2a8cd132f1a4ab16791687237dc61548f823ac69f96d374a1614a545311922e69c0b1c2461edbad1bc7

data/README.md

@@ -136,6 +136,12 @@ $ bundle exec delta_test exec parallel_test -t rspec -n 4 -- spec/features
 stats_path: tmp/delta_test_stats
 stats_life: 1000
 
+full_test_patterns:
+  - Gemfile.lock
+
+full_test_braches:
+  - master
+
 patterns:
   - lib/**/*.rb
   - app/**/*.rb
@@ -143,9 +149,6 @@ patterns:
 exclude_patterns:
   - lib/batch/*.rb
 
-full_test_patterns:
-  - Gemfile.lock
-
 custom_mappings:
   spec/features/i18n_spec.rb:
     - config/locales/**/*.yml

data/lib/delta_test/configuration.rb

@@ -53,9 +53,11 @@ module DeltaTest
 
       files
 
+      full_test_patterns
+      full_test_branches
+
       patterns
       exclude_patterns
-      full_test_patterns
       custom_mappings
     ])
 
@@ -88,6 +90,14 @@ module DeltaTest
       self.files.is_a?(Array)
     end
 
+    validate :full_test_patterns, 'need to be an array' do
+      self.full_test_patterns.is_a?(Array)
+    end
+
+    validate :full_test_branches, 'need to be an array' do
+      self.full_test_branches.is_a?(Array)
+    end
+
     validate :patterns, 'need to be an array' do
       self.patterns.is_a?(Array)
     end
@@ -96,10 +106,6 @@ module DeltaTest
       self.exclude_patterns.is_a?(Array)
     end
 
-    validate :full_test_patterns, 'need to be an array' do
-      self.full_test_patterns.is_a?(Array)
-    end
-
     validate :custom_mappings, 'need to be a hash' do
       self.custom_mappings.is_a?(Hash)
     end
@@ -116,9 +122,11 @@ module DeltaTest
 
         c.files     = []
 
+        c.full_test_patterns = []
+        c.full_test_branches = []
+
         c.patterns           = []
         c.exclude_patterns   = []
-        c.full_test_patterns = []
         c.custom_mappings    = {}
       end
     end

data/lib/delta_test/git.rb

@@ -42,6 +42,16 @@ module DeltaTest
       s.success? ? o.strip : nil
     end
 
+    ###
+    # Get name of the current branch
+    #
+    # @return {String}
+    ###
+    def current_branch
+      o, _, s = exec(%q{symbolic-ref --short HEAD})
+      s.success? ? o.strip : nil
+    end
+
     ###
     # Compare two rev names by their commit ids
     #

data/lib/delta_test/related_spec_list.rb

@@ -48,15 +48,16 @@ module DeltaTest
     ###
     def full_tests?
       return false unless @changed_files
+      return @full_tests if defined?(@full_tests)
 
-      @full_tests ||= if DeltaTest.config.full_test_patterns.empty?
-          false
-        else
-          Utils.files_grep(
-            @changed_files,
-            DeltaTest.config.full_test_patterns
-          ).any?
-        end
+      @full_tests = false
+      @full_tests ||= DeltaTest.config.full_test_branches.include?(@git.current_branch)
+      @full_tests ||= DeltaTest.config.full_test_patterns.any? && Utils.files_grep(
+        @changed_files,
+        DeltaTest.config.full_test_patterns
+      ).any?
+
+      @full_tests
     end
 
     ###

data/lib/delta_test/version.rb

@@ -2,7 +2,7 @@ module DeltaTest
 
   MAJOR    = 1
   MINOR    = 0
-  REVISION = 3
+  REVISION = 4
 
   VERSION = [MAJOR, MINOR, REVISION].compact.join('.')
 

data/spec/lib/delta_test/git_spec.rb

@@ -117,6 +117,36 @@ describe DeltaTest::Git do
 
   end
 
+  describe '#current_branch' do
+
+    let(:subcommand) { ['symbolic-ref --short HEAD'] }
+    let(:out)        { 'master' }
+
+    it 'should raise an error if the command is not exist' do
+      expect(git).to receive(:exec).with(*subcommand).and_call_original
+      allow(Open3).to receive(:capture3).and_raise
+
+      expect {
+        git.current_branch
+      }.to raise_error
+    end
+
+    it 'should return name of the current branch if success' do
+      expect(git).to receive(:exec).with(*subcommand).and_call_original
+      allow(Open3).to receive(:capture3).and_return(success_status)
+
+      expect(git.current_branch).to eq(out)
+    end
+
+    it 'should return nil if error' do
+      expect(git).to receive(:exec).with(*subcommand).and_call_original
+      allow(Open3).to receive(:capture3).and_return(error_status)
+
+      expect(git.current_branch).to be_nil
+    end
+
+  end
+
   describe '#same_commit?' do
 
     let(:map) do

data/spec/lib/delta_test/related_spec_list_spec.rb

@@ -36,11 +36,20 @@ describe DeltaTest::RelatedSpecList do
       ]
     end
 
+    let(:current_branch) { 'master' }
+
+    let(:full_test_branches) { [] }
+    let(:full_test_patterns) { [] }
+
     before do
       allow(DeltaTest::DependenciesTable).to receive(:load).with(Pathname.new(table_file_path)).and_return(table)
 
       allow(list.git).to receive(:git_repo?).and_return(true)
       allow(list.git).to receive(:changed_files).with(base_commit).and_return(changed_files)
+      allow(list.git).to receive(:current_branch).and_return(current_branch)
+
+      allow(DeltaTest.config).to receive(:full_test_branches).and_return(full_test_branches)
+      allow(DeltaTest.config).to receive(:full_test_patterns).and_return(full_test_patterns)
     end
 
   end
@@ -184,7 +193,46 @@ describe DeltaTest::RelatedSpecList do
 
     describe '#full_tests?' do
 
-      context 'No file in full test patterns is changed' do
+      context 'full_test_branches is empty' do
+
+        it 'should return false' do
+          expect(list.full_tests?).to be(false)
+        end
+
+      end
+
+      context 'the current branch is in full_test_branches' do
+
+        let(:current_branch)     { 'master' }
+        let(:full_test_branches) { ['master'] }
+
+        it 'should return true' do
+          expect(list.full_tests?).to be(true)
+        end
+
+      end
+
+      context 'the current branch is not in full_test_branches' do
+
+        let(:current_branch)     { 'master' }
+        let(:full_test_branches) { ['other_branch'] }
+        let(:changed_files)      { [] }
+
+        it 'should return false' do
+          expect(list.full_tests?).to be(false)
+        end
+
+      end
+
+      context 'full_test_patterns is empty' do
+
+        it 'should return false' do
+          expect(list.full_tests?).to be(false)
+        end
+
+      end
+
+      context 'no file in full_test_patterns is changed' do
 
         let(:changed_files) do
           [
@@ -198,7 +246,7 @@ describe DeltaTest::RelatedSpecList do
 
       end
 
-      context 'No file in full test patterns is changed' do
+      context 'no file in full_test_patterns is changed' do
 
         let(:full_test_patterns) do
           [
@@ -212,18 +260,6 @@ describe DeltaTest::RelatedSpecList do
           ]
         end
 
-        before do
-          DeltaTest.configure do |config|
-            config.full_test_patterns = full_test_patterns
-          end
-        end
-
-        after do
-          DeltaTest.configure do |config|
-            config.full_test_patterns = []
-          end
-        end
-
         it 'should return true' do
           expect(list.full_tests?).to be(true)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delta_test
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Yuki Iwanaga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler