summaryrefslogtreecommitdiff
path: root/lib/tasks/spinach.rake
diff options
context:
space:
mode:
Diffstat (limited to 'lib/tasks/spinach.rake')
-rw-r--r--lib/tasks/spinach.rake8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/tasks/spinach.rake b/lib/tasks/spinach.rake
index da255f5464b..8dbfa7751dc 100644
--- a/lib/tasks/spinach.rake
+++ b/lib/tasks/spinach.rake
@@ -34,21 +34,19 @@ task :spinach do
run_spinach_tests(nil)
end
-def run_command(cmd)
+def run_system_command(cmd)
system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
end
def run_spinach_command(args)
- run_command(%w(spinach -r rerun) + args)
+ run_system_command(%w(spinach -r rerun) + args)
end
def run_spinach_tests(tags)
- #run_command(%w(rake gitlab:setup)) or raise('gitlab:setup failed!')
-
success = run_spinach_command(%W(--tags #{tags}))
3.times do |_|
break if success
- break unless File.exists?('tmp/spinach-rerun.txt')
+ break unless File.exist?('tmp/spinach-rerun.txt')
tests = File.foreach('tmp/spinach-rerun.txt').map(&:chomp)
puts ''