10078: Since we are not fetching components for pipeline instances (at least until...

we will no longer see the running and queued jobs listed within each pipeline instance row in dashboard. Hence, update
test to look for these for a container request row instead of for a pipeline instance row.

diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index b0a842e8c3da816bd33b531bbb0c6bc9d92b70b0..c4eb941b08894bb4cf58c88f75ba7e721e120f3f 100644 (file)
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -257,8 +257,9 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
 
       within('.recent-processes') do
         assert_text 'pipeline_with_job'
-        within('.row-zzzzz-d1hrv-1yfj6xkidf2muk3') do
-          assert_text 'foo'
+
+        within('.row-zzzzz-xvhdp-cr4runningcntnr') do
+          assert_text 'requester_for_running_cr'
         end
 
         assert_text 'zzzzz-d1hrv-twodonepipeline'

diff --git a/apps/workbench/test/integration/work_units_test.rb b/apps/workbench/test/integration/work_units_test.rb
index eded53e2166a2efbba45dfdbeb859c22e5bca359..b1d5a2158909d68cae12ab58512168df8167fbaa 100644 (file)
--- a/apps/workbench/test/integration/work_units_test.rb
+++ b/apps/workbench/test/integration/work_units_test.rb
@@ -74,12 +74,14 @@ class WorkUnitsTest < ActionDispatch::IntegrationTest
       visit page_with_token "active", "/#{type}/#{obj['uuid']}"
 
       assert_text 'created_at'
+
       if cancelable
+        assert_text 'priority: 1' if type.include?('container')
         assert_selector 'button', text: 'Cancel'
-        click_button 'Cancel'
+        first('a,button', text: 'Cancel').click
         wait_for_ajax
       end
-      assert_no_selector 'button', text: 'Cancel'
+      assert_text 'priority: 0' if cancelable and type.include?('container')
     end
   end
 

diff --git a/apps/workbench/test/unit/work_unit_test.rb b/apps/workbench/test/unit/work_unit_test.rb
index 550f2188c1a98a6762871abde0c438a9fb505d84..e59d30d19a9ed0b3d9087150d76fc5abdb18a273 100644 (file)
--- a/apps/workbench/test/unit/work_unit_test.rb
+++ b/apps/workbench/test/unit/work_unit_test.rb
@@ -15,7 +15,7 @@ class WorkUnitTest < ActiveSupport::TestCase
     [ContainerRequest, 'queued', 'cwu', 0, "Queued", nil, 0.0],   # priority 1
     [ContainerRequest, 'canceled_with_queued_container', 'cwu', 0, "Ready", nil, 0.0],
     [ContainerRequest, 'canceled_with_locked_container', 'cwu', 0, "Ready", nil, 0.0],
-    [ContainerRequest, 'canceled_with_running_container', 'cwu', 0, "Running", nil, 0.0],
+    [ContainerRequest, 'canceled_with_running_container', 'cwu', 1, "Running", nil, 0.0],
   ].each do |type, fixture, label, num_children, state, success, progress|
     test "children of #{fixture}" do
       use_token 'active'

diff --git a/services/api/test/fixtures/container_requests.yml b/services/api/test/fixtures/container_requests.yml
index 1daccda55802ece4b18ca3d273bda7789ea5cab4..acacf4023829756085caf1feb269845887043d4d 100644 (file)
--- a/services/api/test/fixtures/container_requests.yml
+++ b/services/api/test/fixtures/container_requests.yml
@@ -36,6 +36,26 @@ running:
     vcpus: 1
     ram: 123
 
+requester_for_running:
+  uuid: zzzzz-xvhdp-req4runningcntr
+  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  name: requester_for_running_cr
+  state: Committed
+  priority: 1
+  created_at: <%= 2.minute.ago.to_s(:db) %>
+  updated_at: <%= 2.minute.ago.to_s(:db) %>
+  modified_at: <%= 2.minute.ago.to_s(:db) %>
+  modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  container_image: test
+  cwd: test
+  output_path: test
+  command: ["echo", "hello"]
+  container_uuid: zzzzz-dz642-logscontainer03
+  requesting_container_uuid: zzzzz-dz642-runningcontainr
+  runtime_constraints:
+    vcpus: 1
+    ram: 123
+
 running_older:
   uuid: zzzzz-xvhdp-cr4runningcntn2
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz