projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16306: Merge branch 'master'
[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 6e96839e25f617f6ffca29ca1a44e81065c0cce2..73d357f3a60f6a9da27db76a452a5ded6b0e3bd8 100644
(file)
--- a/
apps/workbench/test/controllers/container_requests_controller_test.rb
+++ b/
apps/workbench/test/controllers/container_requests_controller_test.rb
@@
-12,7
+12,7
@@
class ContainerRequestsControllerTest < ActionController::TestCase
container_uuid = cr['container_uuid']
container = Container.find(container_uuid)
container_uuid = cr['container_uuid']
container = Container.find(container_uuid)
- get :show,
{id: cr['uuid'], tab_pane: 'Log'},
session_for(:active)
+ get :show,
params: {id: cr['uuid'], tab_pane: 'Log'}, session:
session_for(:active)
assert_response :success
assert_select "a", {:href=>"/collections/#{container['log']}", :text=>"Download the log"}
assert_response :success
assert_select "a", {:href=>"/collections/#{container['log']}", :text=>"Download the log"}
@@
-27,7
+27,7
@@
class ContainerRequestsControllerTest < ActionController::TestCase
container_uuid = cr['container_uuid']
container = Container.find(container_uuid)
container_uuid = cr['container_uuid']
container = Container.find(container_uuid)
- get :show,
{id: cr['uuid'], tab_pane: 'Log'},
session_for(:active)
+ get :show,
params: {id: cr['uuid'], tab_pane: 'Log'}, session:
session_for(:active)
assert_response :success
assert_includes @response.body, '<pre id="event_log_div"'
assert_response :success
assert_includes @response.body, '<pre id="event_log_div"'
@@
-39,15
+39,15
@@
class ContainerRequestsControllerTest < ActionController::TestCase
uuid = api_fixture('container_requests')['completed']['uuid']
uuid = api_fixture('container_requests')['completed']['uuid']
- get :show,
{id: uuid},
session_for(:active)
+ get :show,
params: {id: uuid}, session:
session_for(:active)
assert_response :success
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
cr_fixture = api_fixture('container_requests')['queued']
end
test "cancel request for queued container" do
cr_fixture = api_fixture('container_requests')['queued']
- post :cancel,
{id: cr_fixture['uuid']},
session_for(:active)
+ post :cancel,
params: {id: cr_fixture['uuid']}, session:
session_for(:active)
assert_response 302
use_token 'active'
assert_response 302
use_token 'active'
@@
-60,25
+60,26
@@
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
end
- post(:copy,
copy_params,
session_for(:active))
+ post(:copy,
params: copy_params, session:
session_for(:active))
assert_response 302
copied_cr = assigns(:object)
assert_not_nil copied_cr
assert_equal 'Uncommitted', copied_cr[:state]
assert_equal "Copy of #{completed_cr['name']}", copied_cr['name']
assert_response 302
copied_cr = assigns(:object)
assert_not_nil copied_cr
assert_equal 'Uncommitted', copied_cr[:state]
assert_equal "Copy of #{completed_cr['name']}", copied_cr['name']
- assert_equal completed_cr['cmd'], copied_cr['cmd']
assert_equal completed_cr['runtime_constraints']['ram'], copied_cr['runtime_constraints'][:ram]
if reuse_enabled
assert copied_cr[:use_existing]
assert_equal completed_cr['runtime_constraints']['ram'], copied_cr['runtime_constraints'][:ram]
if reuse_enabled
assert copied_cr[:use_existing]
@@
-88,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
@@
-114,8
+114,8
@@
class ContainerRequestsControllerTest < ActionController::TestCase
cr = api_fixture('container_requests')[cr_fixture]
assert_not_nil cr
get(:show,
cr = api_fixture('container_requests')[cr_fixture]
assert_not_nil cr
get(:show,
- {id: cr['uuid']},
- session_for(:active))
+
params:
{id: cr['uuid']},
+ session
: session
_for(:active))
assert_response :success
if should_show
assert_includes @response.body, "href=\"#Provenance\""
assert_response :success
if should_show
assert_includes @response.body, "href=\"#Provenance\""
@@
-130,7
+130,7
@@
class ContainerRequestsControllerTest < ActionController::TestCase
cr = api_fixture('container_requests')['completed_with_input_mounts']
cr = api_fixture('container_requests')['completed_with_input_mounts']
- get :show,
{id: cr['uuid']},
session_for(:active)
+ get :show,
params: {id: cr['uuid']}, session:
session_for(:active)
assert_response :success
assert_match /hello/, @response.body
assert_response :success
assert_match /hello/, @response.body
@@
-138,7
+138,7
@@
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/
1fd08fc162a5c6413070a8bd0bffc818+15
0" # mount workflow
+ assert_includes @response.body, "href=\"\/collections/
f9ddda46bb293b6847da984e3aa735db+29
0" # 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