Merge branch '8650-container-work-unit' into 9318-dashboard-uses-work-units

Conflicts:
	apps/workbench/app/views/work_unit/_progress.html.erb
	apps/workbench/test/unit/work_unit_test.rb

diff --cc apps/workbench/app/models/proxy_work_unit.rb
Simple merge

diff --cc apps/workbench/app/models/work_unit.rb
Simple merge

diff --cc apps/workbench/app/views/work_unit/_progress.html.erb
index 27f19ec58a2102b27135b681c838eb9c38250713,e06bad6afb450d312152978c3964e40f001a556b..69a37884c42d4d52a291b04a6662e96c9ec33937
--- 1/apps/workbench/app/views/work_unit/_progress.html.erb
--- 2/apps/workbench/app/views/work_unit/_progress.html.erb
+++ b/apps/workbench/app/views/work_unit/_progress.html.erb
@@@ -1,5 -1,5 +1,5 @@@
- <% if wu.state_label == 'Running' %>
+ <% if wu.is_running? %>
 -  <% if @object.uuid == wu.uuid and wu.progress == 0.0 %>
 +  <% if @object.andand.uuid == wu.uuid and wu.progress == 0.0 %>
      <span class="label label-<%= wu.state_bootstrap_class %>"> Active </span>
    <% else%>
      <div class="progress" style="margin-bottom: 0px">

diff --cc apps/workbench/test/unit/work_unit_test.rb
index 974002c8029050d8ebc8dae6a5a1453e32ee0a49,f00644ee3ef1d03c6f54e486293923f2011e02cb..cc3334db50b5c416c81c310c6e51cb59464612f7
--- 1/apps/workbench/test/unit/work_unit_test.rb
--- 2/apps/workbench/test/unit/work_unit_test.rb
+++ b/apps/workbench/test/unit/work_unit_test.rb
@@@ -6,11 -10,11 +10,11 @@@ class WorkUnitTest < ActiveSupport::Tes
      [PipelineInstance, 'pipeline_in_running_state', nil, 1, "Running", nil, 0.0],
      [PipelineInstance, 'has_component_with_completed_jobs', nil, 3, "Complete", true, 1.0],
      [PipelineInstance, 'pipeline_with_tagged_collection_input', "pwu", 1, "Ready", nil, 0.0],
 -    [Container, 'requester', 'cwu', 3, "Complete", true, 1.0],
 +    [Container, 'requester', 'cwu', 5, "Complete", true, 1.0],
-   ].each do |type, name, label, num_children, state, success, progress|
-     test "children of #{name}" do
-       use_token 'admin'
-       obj = find_fixture(type, name)
+   ].each do |type, fixture, label, num_children, state, success, progress|
+     test "children of #{fixture}" do
 -      use_token 'admin'
++      use_token 'active'
+       obj = find_fixture(type, fixture)
        wu = obj.work_unit(label)
  
        if label != nil

diff --cc services/api/test/fixtures/containers.yml
index febd3df305a05343f3d27f338a7dffb9c8ee63b7,4c8c8c1f426b3c52f9792b2827bf287b52371776..5f358b78136cc044032926955660af3c18e6e567
--- 1/services/api/test/fixtures/containers.yml
--- 2/services/api/test/fixtures/containers.yml
+++ b/services/api/test/fixtures/containers.yml
@@@ -102,7 -48,7 +102,7 @@@ completed_older
  
  requester:
    uuid: zzzzz-dz642-requestingcntnr
--  owner_uuid: zzzzz-tpzed-000000000000000
++  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
    state: Complete
    priority: 1
    created_at: 2016-01-11 11:11:11.111111111 Z

diff --cc services/api/test/fixtures/pipeline_instances.yml
Simple merge