projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3686-sharing-repositories
[arvados.git]
/
apps
/
workbench
/
test
/
test_helper.rb
diff --git
a/apps/workbench/test/test_helper.rb
b/apps/workbench/test/test_helper.rb
index 8acb2bfeaf3dbcbca499b02d0a66b8f748ab67d2..7c454c9877b2bbb4c97c417cf5406cf433924ca3 100644
(file)
--- a/
apps/workbench/test/test_helper.rb
+++ b/
apps/workbench/test/test_helper.rb
@@
-160,6
+160,10
@@
class ApiServerForTests
'--pid-file', @pidfile)
else
make_ssl_cert
'--pid-file', @pidfile)
else
make_ssl_cert
+ if ENV['ARVADOS_TEST_API_INSTALLED'].blank?
+ _system('bundle', 'exec', 'rake', 'db:test:load')
+ _system('bundle', 'exec', 'rake', 'db:fixtures:load')
+ end
_system('bundle', 'exec', 'passenger', 'start', '-d', '-p3000',
'--pid-file', @pidfile,
'--ssl',
_system('bundle', 'exec', 'passenger', 'start', '-d', '-p3000',
'--pid-file', @pidfile,
'--ssl',
@@
-309,3
+313,6
@@
if ENV["RAILS_ENV"].eql? 'test'
ApiServerForTests.new.run
ApiServerForTests.new.run ["--websockets"]
end
ApiServerForTests.new.run
ApiServerForTests.new.run ["--websockets"]
end
+
+# Reset fixtures now (i.e., before any tests run).
+ActiveSupport::TestCase.reset_api_fixtures_now