fix breaking git_control_spec test; update rubocop

wearefine · Feb 23, 2015 · 7746b98 · 7746b98
1 parent b9ee9b2
commit 7746b98
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/maximus.gemspec b/maximus.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "git", "~> 1.2.9"
   spec.add_runtime_dependency "scss-lint", "~> 0.33.0"
   spec.add_runtime_dependency "rainbow", "2.0.0"
-  spec.add_runtime_dependency "rubocop", "~> 0.28"
+  spec.add_runtime_dependency "rubocop", "~> 0.29"
   spec.add_runtime_dependency "rails_best_practices", "~> 1.15"
   spec.add_runtime_dependency "brakeman", "~> 3.0.1"
   spec.add_runtime_dependency "wraith", "~> 2.3"

diff --git a/spec/maximus/git_control_spec.rb b/spec/maximus/git_control_spec.rb
@@ -99,7 +99,7 @@
       context 'last is supplied' do
         let(:config) { { commit: 'last' } }
         it 'should return the previous_commit sha' do
-          expect( git.send(:define_psuedo_commit) ).to eq `git -C #{Dir.pwd} rev-parse HEAD^`.strip!
+          expect( git.send(:define_psuedo_commit) ).to eq `git -C #{Dir.pwd} rev-list --max-count=2 HEAD --reverse | head -n1`.strip!
         end
       end