Merge branch 'master' of github.com:gitlabhq/gitlabhq

a33d7a40 · Marin Jankovski · e586ee34 · d5c81a8d · a33d7a40
Commit a33d7a40 authored Sep 23, 2014 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

spec/lib/gitlab/satellite/action_spec.rb spec/lib/gitlab/satellite/action_spec.rb +1 -1

No files found.
--- a/spec/lib/gitlab/satellite/action_spec.rb
+++ b/spec/lib/gitlab/satellite/action_spec.rb
@@ -59,7 +59,7 @@ describe 'Gitlab::Satellite::Action' do
      called = false

      #set assumptions
-      File.rm(project.satellite.lock_file) unless !File.exists? project.satellite.lock_file
+      FileUtils.rm_f(project.satellite.lock_file)

      File.exists?(project.satellite.lock_file).should be_false