projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 10293-cr-log-and-output-in-wb
[arvados.git]
/
services
/
api
/
test
/
integration
/
crunch_dispatch_test.rb
diff --git
a/services/api/test/integration/crunch_dispatch_test.rb
b/services/api/test/integration/crunch_dispatch_test.rb
index 4abdcce03bdf8254f3e6a33db9bfb6c1d5a67942..a6f937bbda66c0efa3a52630e15a0b37278579b2 100644
(file)
--- a/
services/api/test/integration/crunch_dispatch_test.rb
+++ b/
services/api/test/integration/crunch_dispatch_test.rb
@@
-1,8
+1,8
@@
require 'test_helper'
require 'test_helper'
-
load 'test/functional/arvados/v1/git_setup.rb
'
+
require 'helpers/git_test_helper
'
class CrunchDispatchTest < ActionDispatch::IntegrationTest
class CrunchDispatchTest < ActionDispatch::IntegrationTest
- include Git
Setup
+ include Git
TestHelper
fixtures :all
fixtures :all
@@
-28,8
+28,8
@@
class CrunchDispatchTest < ActionDispatch::IntegrationTest
format: "json",
job: {
script: "log",
format: "json",
job: {
script: "log",
- repository: "
bar
",
- script_version: "
143fec09e988160673c63457fa12a0f70b5b8a2
6",
+ repository: "
active/crunchdispatchtest
",
+ script_version: "
f35f99b7d32bac257f5989df02b9f12ee1a9b0d
6",
script_parameters: "{}"
}
}, auth(:admin)
script_parameters: "{}"
}
}, auth(:admin)