X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d694a717acb2e577afa396aea140e5284b7f763d..88a29cd091468feb98e5cd541c560f4d35bca716:/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 804263cd49..89e1506f4b 100644
--- a/apps/workbench/test/controllers/container_requests_controller_test.rb
+++ b/apps/workbench/test/controllers/container_requests_controller_test.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'test_helper'
 
 class ContainerRequestsControllerTest < ActionController::TestCase
@@ -13,7 +17,7 @@ class ContainerRequestsControllerTest < ActionController::TestCase
 
     assert_select "a", {:href=>"/collections/#{container['log']}", :text=>"Download the log"}
     assert_select "a", {:href=>"#{container['log']}/baz"}
-    assert_not_includes @response.body, '<div id="event_log_div"'
+    assert_not_includes @response.body, '<pre id="event_log_div"'
   end
 
   test "visit running container request log tab" do
@@ -26,7 +30,7 @@ class ContainerRequestsControllerTest < ActionController::TestCase
     get :show, {id: cr['uuid'], tab_pane: 'Log'}, session_for(:active)
     assert_response :success
 
-    assert_includes @response.body, '<div id="event_log_div"'
+    assert_includes @response.body, '<pre id="event_log_div"'
     assert_select 'Download the log', false
   end
 
@@ -38,17 +42,32 @@ class ContainerRequestsControllerTest < ActionController::TestCase
     get :show, {id: uuid}, session_for(:active)
     assert_response :success
 
-   assert_includes @response.body, "action=\"/container_requests/#{uuid}/copy\""
+    assert_includes @response.body, "action=\"/container_requests/#{uuid}/copy\""
+  end
+
+  test "cancel request for queued container" do
+    cr_fixture = api_fixture('container_requests')['queued']
+    post :cancel, {id: cr_fixture['uuid']}, session_for(:active)
+    assert_response 302
+
+    use_token 'active'
+    cr = ContainerRequest.find(cr_fixture['uuid'])
+    assert_equal 'Final', cr.state
+    assert_equal 0, cr.priority
+    c = Container.find(cr_fixture['container_uuid'])
+    assert_equal 'Queued', c.state
+    assert_equal 0, c.priority
   end
 
   [
     ['completed', false, false],
     ['completed', true, false],
-    ['completed-acr', false, true],
-    ['completed-acr', true, true],
+    ['completed-older', false, true],
+    ['completed-older', true, true],
   ].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
       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})
@@ -84,4 +103,41 @@ class ContainerRequestsControllerTest < ActionController::TestCase
       end
     end
   end
+
+  [
+    ['completed', true],
+    ['running', true],
+    ['queued', true],
+    ['uncommitted', false],
+  ].each do |cr_fixture, should_show|
+    test "provenance tab should #{should_show ? '' : 'not'} be shown on #{cr_fixture} container requests" do
+      cr = api_fixture('container_requests')[cr_fixture]
+      assert_not_nil cr
+      get(:show,
+          {id: cr['uuid']},
+          session_for(:active))
+      assert_response :success
+      if should_show
+        assert_includes @response.body, "href=\"#Provenance\""
+      else
+        assert_not_includes @response.body, "href=\"#Provenance\""
+      end
+    end
+  end
+
+  test "container request display" do
+    use_token 'active'
+
+    cr = api_fixture('container_requests')['completed_with_input_mounts']
+
+    get :show, {id: cr['uuid']}, session_for(:active)
+    assert_response :success
+
+    assert_match /hello/, @response.body
+    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+150" # mount workflow
+    assert_includes @response.body, "href=\"#Log\""
+    assert_includes @response.body, "href=\"#Provenance\""
+  end
 end