projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15430-fts-operator-removal' into main. Closes #15430
[arvados.git]
/
apps
/
workbench
/
test
/
controllers
/
container_requests_controller_test.rb
diff --git
a/apps/workbench/test/controllers/container_requests_controller_test.rb
b/apps/workbench/test/controllers/container_requests_controller_test.rb
index 140b59fa5e7d0d2c923d974a3537ff501e0647af..c8709df3c35154e172898e060a9cb526196ef064 100644
(file)
--- a/
apps/workbench/test/controllers/container_requests_controller_test.rb
+++ b/
apps/workbench/test/controllers/container_requests_controller_test.rb
@@
-42,7
+42,7
@@
class ContainerRequestsControllerTest < ActionController::TestCase
get :show, params: {id: uuid}, session: session_for(:active)
assert_response :success
get :show, params: {id: uuid}, session: session_for(:active)
assert_response :success
- assert_includes @response.body, "action
=\"/container_requests/#{uuid}/copy\"
"
+ assert_includes @response.body, "action
_href=%2Fcontainer_requests%2F#{uuid}%2Fcopy
"
end
test "cancel request for queued container" do
end
test "cancel request for queued container" do
@@
-60,17
+60,19
@@
class ContainerRequestsControllerTest < ActionController::TestCase
end
[
end
[
- ['completed', false, false],
- ['completed', true, false],
+ ['completed', false, false],
+ ['completed', true, false],
+ ['completed', nil, false],
['completed-older', false, true],
['completed-older', false, true],
- ['completed-older', true, true],
+ ['completed-older', true, true],
+ ['completed-older', nil, true],
].each do |cr_fixture, reuse_enabled, uses_acr|
].each do |cr_fixture, reuse_enabled, uses_acr|
- test "container request #{uses_acr ? '' : 'not'} using arvados-cwl-runner copy #{reuse_enabled
? 'with' : 'without'
} reuse enabled" do
+ test "container request #{uses_acr ? '' : 'not'} using arvados-cwl-runner copy #{reuse_enabled
.nil? ? 'nil' : (reuse_enabled ? 'with' : 'without')
} reuse enabled" do
completed_cr = api_fixture('container_requests')[cr_fixture]
# Set up post request params
copy_params = {id: completed_cr['uuid']}
completed_cr = api_fixture('container_requests')[cr_fixture]
# Set up post request params
copy_params = {id: completed_cr['uuid']}
- if
reuse_enabled
- copy_params.merge!({use_existing:
true
})
+ if
!reuse_enabled.nil?
+ copy_params.merge!({use_existing:
reuse_enabled
})
end
post(:copy, params: copy_params, session: session_for(:active))
assert_response 302
end
post(:copy, params: copy_params, session: session_for(:active))
assert_response 302
@@
-87,12
+89,11
@@
class ContainerRequestsControllerTest < ActionController::TestCase
# If the CR's command is arvados-cwl-runner, the appropriate flag should
# be passed to it
if uses_acr
# If the CR's command is arvados-cwl-runner, the appropriate flag should
# be passed to it
if uses_acr
- if reuse_enabled
- # arvados-cwl-runner's default behavior is to enable reuse
- assert_includes copied_cr['command'], '
arvados-cwl-runner
'
+ assert_equal copied_cr['command'][0], 'arvados-cwl-runner'
+ if reuse_enabled.nil? || reuse_enabled
+ assert_includes copied_cr['command'], '
--enable-reuse
'
assert_not_includes copied_cr['command'], '--disable-reuse'
else
assert_not_includes copied_cr['command'], '--disable-reuse'
else
- assert_includes copied_cr['command'], 'arvados-cwl-runner'
assert_includes copied_cr['command'], '--disable-reuse'
assert_not_includes copied_cr['command'], '--enable-reuse'
end
assert_includes copied_cr['command'], '--disable-reuse'
assert_not_includes copied_cr['command'], '--enable-reuse'
end
@@
-137,7
+138,6
@@
class ContainerRequestsControllerTest < ActionController::TestCase
assert_includes @response.body, "href=\"\/collections/fa7aeb5140e2848d39b416daeef4ffc5+45/foobar\?" # locator on command
assert_includes @response.body, "href=\"\/collections/fa7aeb5140e2848d39b416daeef4ffc5+45/foo" # mount input1
assert_includes @response.body, "href=\"\/collections/fa7aeb5140e2848d39b416daeef4ffc5+45/bar" # mount input2
assert_includes @response.body, "href=\"\/collections/fa7aeb5140e2848d39b416daeef4ffc5+45/foobar\?" # locator on command
assert_includes @response.body, "href=\"\/collections/fa7aeb5140e2848d39b416daeef4ffc5+45/foo" # mount input1
assert_includes @response.body, "href=\"\/collections/fa7aeb5140e2848d39b416daeef4ffc5+45/bar" # mount input2
- assert_includes @response.body, "href=\"\/collections/f9ddda46bb293b6847da984e3aa735db+290" # mount workflow
assert_includes @response.body, "href=\"#Log\""
assert_includes @response.body, "href=\"#Provenance\""
end
assert_includes @response.body, "href=\"#Log\""
assert_includes @response.body, "href=\"#Provenance\""
end