[ARVADOS] updated: 37a349fc026e4559072e5b53c8855be42bf91dcd

[git at public.curoverse.com]

Summary of changes:
 .../workbench/app/assets/javascripts/log_viewer.js |  2 +-
 .../app/controllers/collections_controller.rb      | 28 +++++++-
 apps/workbench/app/views/jobs/_show_log.html.erb   | 48 ++++++++++---
 apps/workbench/config/application.default.yml      |  3 +
 .../workbench/test/integration/collections_test.rb | 62 +++++++++-------
 apps/workbench/test/integration/jobs_test.rb       | 56 +++++++++++++++
 services/api/script/crunch-dispatch.rb             | 82 ++++++++++++----------
 services/api/test/fixtures/collections.yml         | 14 ++++
 services/api/test/fixtures/jobs.yml                |  9 +++
 services/api/test/fixtures/links.yml               | 14 ++++
 services/fuse/tests/test_mount.py                  |  3 +-
 11 files changed, 245 insertions(+), 76 deletions(-)

       via  37a349fc026e4559072e5b53c8855be42bf91dcd (commit)
       via  b1d1c5acf6f237d5e2a02414dd59e92cdb862237 (commit)
       via  62790d76daf181a457d8f47741721967cd9cb7d9 (commit)
       via  2935de4fbccf43b7daedb9412f2ada1bf65c52ab (commit)
       via  23acabd1c9685b0a30027a643ebc10b25d3985d3 (commit)
       via  a8bd120b4b5056e7a688e6ce4a60c1251fe7cb0f (commit)
       via  165a36741ced8d09ec15aa30873e51dab2b3e215 (commit)
       via  5d006b95fdcbb48afffef8272b4d2071acb5221b (commit)
       via  4ff61dd25a70e6467bbafeaaf794cc381f684384 (commit)
       via  196b4b55725db26af4000162329421c73ca893af (commit)
       via  edc5e4b6645b9b983a85a892bf3d3ad1432a657d (commit)
       via  34e461fe9d33283d8e2135802ee9accb30a5e34f (commit)
       via  3cdc055b90fd859cbd0e101becb4abd78f4d467f (commit)
       via  a4679fb93b4b835509cc77f9bf2fdce02d40520e (commit)
       via  4f41341675c108e9ffa4e5ba15b8bca521152a67 (commit)
       via  521df5cd1e19a671a4f940128c5c61930df9c8bb (commit)
       via  74bcc470f33cd47ca4106a7565871c07c40f9c00 (commit)
       via  641a04fc2dd876440ed983a4cdf0e03f188040c1 (commit)
       via  070ca0d5fdd81ed1d3a32fbfc4d1329bb911bdf1 (commit)
       via  362be0f8b6b1d559e041c8cda7d9f154fb93ee97 (commit)
      from  fe8657ef0f8698837e9bdb5e9c1bf26a068efba9 (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 37a349fc026e4559072e5b53c8855be42bf91dcd
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 2 11:43:09 2014 -0400

    4036: update the test that combines files from within a collection to expect the new collection in current project, if applicable and writable.

diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index 1c31970..f62f285 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -103,34 +103,48 @@ class CollectionsTest < ActionDispatch::IntegrationTest
     headless.stop
   end
 
-  test "combine selected collection files into new collection" do
-    headless = Headless.new
-    headless.start
-    Capybara.current_driver = :selenium
-
-    foo_collection = api_fixture('collections')['foo_file']
+  [
+    ['active', 'foo_file', false],
+    ['active', 'foo_collection_in_aproject', true],
+    ['project_viewer', 'foo_file', false],
+    ['project_viewer', 'foo_collection_in_aproject', false], #aproject not writable
+  ].each do |user, collection, expect_collection_in_aproject|
+    test "combine selected collection files into new collection #{user} #{collection} #{expect_collection_in_aproject}" do
+      headless = Headless.new
+      headless.start
+      Capybara.current_driver = :selenium
+
+      my_collection = api_fixture('collections')[collection]
+
+      visit page_with_token(user, "/collections")
+
+      # choose file from foo collection
+      within('tr', text: my_collection['uuid']) do
+        click_link 'Show'
+      end
 
-    visit page_with_token('active', "/collections")
+      # now in collection page
+      find('input[type=checkbox]').click
 
-    # choose file from foo collection
-    within('tr', text: foo_collection['uuid']) do
-      click_link 'Show'
-    end
+      click_button 'Selection...'
+      within('.selection-action-container') do
+        click_link 'Create new collection with selected files'
+      end
 
-    # now in collection page
-    find('input[type=checkbox]').click
+      # now in the newly created collection page
+      assert(page.has_text?('Copy to project'), "Copy to project text not found in new collection page")
+      assert(page.has_no_text?(my_collection['name']), "Collection page did not include foo file")
+      assert(page.has_text?('foo'), "Collection page did not include foo file")
+      if expect_collection_in_aproject
+        aproject = api_fixture('groups')['aproject']
+        assert page.has_text?("Created new collection in the project #{aproject['name']}"),
+                              'Not found flash message that new collection is created in aproject'
+      else
+        assert page.has_text?("Created new collection in your Home project"),
+                              'Not found flash message that new collection is created in Home project'
+      end
 
-    click_button 'Selection...'
-    within('.selection-action-container') do
-      click_link 'Create new collection with selected files'
+      headless.stop
     end
-
-    # now in the newly created collection page
-    assert(page.has_text?('Copy to project'), "Copy to project text not found in new collection page")
-    assert(page.has_no_text?(foo_collection['name']), "Collection page did not include foo file")
-    assert(page.has_text?('foo'), "Collection page did not include foo file")
-    assert(page.has_text?('Created new collection in your Home project'),
-                          'Not found flash message that new collection is created in Home project')
-    headless.stop
   end
 end

commit b1d1c5acf6f237d5e2a02414dd59e92cdb862237
Merge: fe8657e 62790d7
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 2 11:01:35 2014 -0400

    Merge branch 'master' into 4036-combine-collections-in-project-issue


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


hooks/post-receive
--