projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4523-full-text-search' into 5110-workbench-full-text-search
[arvados.git]
/
services
/
api
/
test
/
integration
/
serialized_encoding_test.rb
diff --git
a/services/api/test/integration/serialized_encoding_test.rb
b/services/api/test/integration/serialized_encoding_test.rb
index ed30fdb5df24a40db878a1869e6e7b5ca26a4573..8a1cb10004f2bcfedf379d3d944c4251828fd02f 100644
(file)
--- a/
services/api/test/integration/serialized_encoding_test.rb
+++ b/
services/api/test/integration/serialized_encoding_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 SerializedEncodingTest < ActionDispatch::IntegrationTest
class SerializedEncodingTest < ActionDispatch::IntegrationTest
- include Git
Setup
+ include Git
TestHelper
fixtures :all
fixtures :all
@@
-13,7
+13,7
@@
class SerializedEncodingTest < ActionDispatch::IntegrationTest
job: {
repository: 'foo',
job: {
repository: 'foo',
- runtime_constraints: {docker_image: 'arvados/
jobs
'},
+ runtime_constraints: {docker_image: 'arvados/
apitestfixture
'},
script: 'hash',
script_version: 'master',
script_parameters: {pattern: 'foobar'},
script: 'hash',
script_version: 'master',
script_parameters: {pattern: 'foobar'},