[ARVADOS] updated: 2e319c5e3ebd1bf61f74b01646b755fffccb984c

[Git user]

Summary of changes:
 .../test/controllers/projects_controller_test.rb       | 17 +++++++++++++++++
 .../test/integration/application_layout_test.rb        |  4 ++--
 services/api/test/fixtures/container_requests.yml      | 18 +++++++++---------
 3 files changed, 28 insertions(+), 11 deletions(-)

       via  2e319c5e3ebd1bf61f74b01646b755fffccb984c (commit)
       via  6b88953ebd4911bc03b73bad9c354800f07ce44f (commit)
      from  69963d8ac67ce1a0711cb3e92a75b2961cbc76b9 (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 2e319c5e3ebd1bf61f74b01646b755fffccb984c
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Wed Sep 21 18:20:20 2016 -0300

    10037: Fixed test because of the fixture dates changes made to allow some containers to appear on the recent pipelines and processes list on the dashboard

diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index 93827a9..c840a41 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -256,8 +256,8 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       end
 
       within('.recent-processes') do
-        assert_text 'running_with_job'
-        within('.row-zzzzz-d1hrv-runningpipeline') do
+        assert_text 'pipeline_with_job'
+        within('.row-zzzzz-d1hrv-1yfj6xkidf2muk3') do
           assert_text 'foo'
         end
 

commit 6b88953ebd4911bc03b73bad9c354800f07ce44f
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Wed Sep 21 18:19:23 2016 -0300

    10037: Added test to check for progress bar showing only on running containers

diff --git a/apps/workbench/test/controllers/projects_controller_test.rb b/apps/workbench/test/controllers/projects_controller_test.rb
index fa87e84..7848444 100644
--- a/apps/workbench/test/controllers/projects_controller_test.rb
+++ b/apps/workbench/test/controllers/projects_controller_test.rb
@@ -410,6 +410,23 @@ class ProjectsControllerTest < ActionController::TestCase
     end
   end
 
+  test "in dashboard the progress bar should only show on running containers" do
+    get :index, {}, session_for(:active)
+    assert_select 'div.panel-body.recent-processes' do
+      [
+        ['completed', false],
+        ['uncommitted', false],
+        ['queued', false],
+        ['running', true],
+      ].each do |cr_state, should_show|
+        uuid = api_fixture('container_requests')[cr_state]['uuid']
+        assert_select "div.dashboard-panel-info-row.row-#{uuid}" do
+          assert_select 'div.progress', should_show
+        end
+      end
+    end
+  end
+
   test "visit a public project and verify the public projects page link exists" do
     Rails.configuration.anonymous_user_token = api_fixture('api_client_authorizations')['anonymous']['api_token']
     uuid = api_fixture('groups')['anonymously_accessible_project']['uuid']
diff --git a/services/api/test/fixtures/container_requests.yml b/services/api/test/fixtures/container_requests.yml
index 49a1fae..f22cc3f 100644
--- a/services/api/test/fixtures/container_requests.yml
+++ b/services/api/test/fixtures/container_requests.yml
@@ -4,9 +4,9 @@ queued:
   name: queued
   state: Committed
   priority: 1
-  created_at: 2016-01-11 11:11:11.111111111 Z
-  updated_at: 2016-01-11 11:11:11.111111111 Z
-  modified_at: 2016-01-11 11:11:11.111111111 Z
+  created_at: <%= 2.minute.ago.to_s(:db) %>
+  updated_at: <%= 1.minute.ago.to_s(:db) %>
+  modified_at: <%= 1.minute.ago.to_s(:db) %>
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   container_image: test
   cwd: test
@@ -23,9 +23,9 @@ running:
   name: running
   state: Committed
   priority: 1
-  created_at: 2016-01-11 11:11:11.111111111 Z
-  updated_at: 2016-01-11 11:11:11.111111111 Z
-  modified_at: 2016-01-11 11:11:11.111111111 Z
+  created_at: <%= 2.minute.ago.to_s(:db) %>
+  updated_at: <%= 1.minute.ago.to_s(:db) %>
+  modified_at: <%= 1.minute.ago.to_s(:db) %>
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   container_image: test
   cwd: test
@@ -193,9 +193,9 @@ uncommitted:
   uuid: zzzzz-xvhdp-cr4uncommittedc
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   name: uncommitted
-  created_at: 2016-01-11 11:11:11.111111111 Z
-  updated_at: 2016-01-11 11:11:11.111111111 Z
-  modified_at: 2016-01-11 11:11:11.111111111 Z
+  created_at: <%= 2.minute.ago.to_s(:db) %>
+  updated_at: <%= 1.minute.ago.to_s(:db) %>
+  modified_at: <%= 1.minute.ago.to_s(:db) %>
   modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
   command: ["arvados-cwl-runner", "--local", "--api=containers",
             "/var/lib/cwl/workflow.json", "/var/lib/cwl/cwl.input.json"]

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


hooks/post-receive
--