[ARVADOS] updated: 1.1.0-41-gc5d42c4

[Git user]

Summary of changes:
 apps/workbench/app/views/projects/_show_dashboard.html.erb  | 13 +------------
 apps/workbench/test/controllers/projects_controller_test.rb |  4 ++--
 2 files changed, 3 insertions(+), 14 deletions(-)

       via  c5d42c41795106305f6b965be77d94a935f5b0d3 (commit)
      from  ea2c309720610298ba23312290aeb788c80e9dcc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c5d42c41795106305f6b965be77d94a935f5b0d3
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Nov 13 14:57:29 2017 -0500

    12513: Update tests, remove more unused code.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index fd58de5..db31501 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -12,22 +12,11 @@ SPDX-License-Identifier: AGPL-3.0 %>
 
   # fetch children of all the active crs in one call, if there are any
   active_crs = recent_crs.each {|cr| cr if (cr.priority.andand > 0 and cr.state != 'Final' and cr.container_uuid)}
-  active_cr_uuids = active_crs.map(&:uuid)
-  active_cr_containers = active_crs.map {|cr| cr.container_uuid}.compact.uniq
-  cr_children = {}
-  if active_cr_containers.any?
-    active_cr_containers.each { |c| cr_children[c] = []}
-    cols = ContainerRequest.columns.map(&:name) - %w(id updated_at mounts)
-  end
 
   wus = {}
   outputs = []
   recent_procs.each do |p|
-    if p.uuid.in?(active_cr_uuids)
-      wu = p.work_unit(nil, child_objects=cr_children[p.container_uuid])
-    else
-      wu = p.work_unit
-    end
+    wu = p.work_unit
 
     wus[p] = wu
     outputs << wu.outputs
diff --git a/apps/workbench/test/controllers/projects_controller_test.rb b/apps/workbench/test/controllers/projects_controller_test.rb
index bdf983f..61c882d 100644
--- a/apps/workbench/test/controllers/projects_controller_test.rb
+++ b/apps/workbench/test/controllers/projects_controller_test.rb
@@ -439,7 +439,7 @@ class ProjectsControllerTest < ActionController::TestCase
         {
           fixture: 'container_requests',
           state: 'running',
-          selectors: [['div.progress', true]]
+          selectors: [['.label-info', true, 'Running']]
         },
         {
           fixture: 'pipeline_instances',
@@ -450,7 +450,7 @@ class ProjectsControllerTest < ActionController::TestCase
         {
           fixture: 'pipeline_instances',
           state: 'pipeline_in_running_state',
-          selectors: [['div.progress', true]]
+          selectors: [['.label-info', true, 'Running']]
         },
       ].each do |c|
         uuid = api_fixture(c[:fixture])[c[:state]]['uuid']

-----------------------------------------------------------------------


hooks/post-receive
--