13023: Fixes related tests.

[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 45be6a151e21b07f5ab41e8632b919529b31091e..89e1506f4bf4163e5818f9eae0d209551e195d75 100644 (file)
--- 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,7 +42,21 @@ 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
 
   [
@@ -115,9 +133,9 @@ class ContainerRequestsControllerTest < ActionController::TestCase
     get :show, {id: cr['uuid']}, session_for(:active)
     assert_response :success
 
-    assert_includes @response.body, CGI.escapeHTML(cr['command'].to_s)
-    assert_includes @response.body, "href=\"\/collections/fa7aeb5140e2848d39b416daeef4ffc5+45%2Ffoo" # mount input1
-    assert_includes @response.body, "href=\"\/collections/fa7aeb5140e2848d39b416daeef4ffc5+45%2Fbar" # mount input2
+    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\""