[ARVADOS] updated: 682a02f163af60655ec30391689cbb84392e9a19

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/integration/projects_test.rb | 89 ++++++++++++++++++++++++
 sdk/cli/bin/crunch-job                           |  4 +-
 services/api/db/structure.sql                    | 16 +----
 3 files changed, 92 insertions(+), 17 deletions(-)

       via  682a02f163af60655ec30391689cbb84392e9a19 (commit)
       via  9ec9d36e9f236613fc67256ebdb75b3d1e2bec35 (commit)
       via  81ead9fd78dafa906a1a92a47fcec170a31f4d15 (commit)
       via  94982cd84ed3b39dca8d47a7786133eac3885a92 (commit)
       via  73988a7629d8ce151983997aac45c04bb150f8f1 (commit)
      from  44bcabe94af2a0b34edd242e82fd529d1d56524a (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 682a02f163af60655ec30391689cbb84392e9a19
Author: radhika <radhika at curoverse.com>
Date:   Wed Sep 3 12:14:03 2014 -0400

    3637: add one more test that verifies that the copy action is disabled when a subproject under a project is selected.

diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 3fdd768..100f3bb 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -326,4 +326,93 @@ class ProjectsTest < ActionDispatch::IntegrationTest
       end
     end
   end
+
+  # Test copy action state. It should not be available when a subproject is selected.
+  test "copy action is disabled when a subproject is selected" do
+    my_project = api_fixture('groups')['aproject']
+    my_collection = api_fixture('collections')['collection_to_move_around_in_aproject']
+    my_subproject = api_fixture('groups')['asubproject']
+
+    # verify that selection options are disabled on the project until an item is selected
+    visit page_with_token 'active', '/'
+    find('.arv-project-list a,button', text: my_project['name']).click
+
+    click_button 'Selection...'
+    within('.selection-action-container') do
+      page.assert_selector 'li.disabled', text: 'Compare selected'
+      page.assert_selector 'li.disabled', text: 'Copy selected'
+      page.assert_selector 'li.disabled', text: 'Move selected'
+      page.assert_selector 'li.disabled', text: 'Remove selected'
+    end
+
+    # select collection and verify links are enabled
+    visit page_with_token 'active', '/'
+    find('.arv-project-list a,button', text: my_project['name']).click
+    assert page.has_text?(my_collection['name']), 'Collection not found in project'
+
+    within('tr', text: my_collection['name']) do
+      find('input[type=checkbox]').click
+    end
+
+    click_button 'Selection...'
+    within('.selection-action-container') do
+      page.assert_selector 'li.disabled', text: 'Compare selected'
+      page.assert_no_selector 'li.disabled', text: 'Copy selected'
+      page.assert_selector 'li', text: 'Copy selected'
+      page.assert_no_selector 'li.disabled', text: 'Move selected'
+      page.assert_selector 'li', text: 'Move selected'
+      page.assert_no_selector 'li.disabled', text: 'Remove selected'
+      page.assert_selector 'li', text: 'Remove selected'
+    end
+
+    # select subproject and verify that copy action is disabled
+    visit page_with_token 'active', '/'
+    find('.arv-project-list a,button', text: my_project['name']).click
+
+    click_link 'Subprojects'
+    assert page.has_text?(my_subproject['name']), 'Subproject not found in project'
+
+    within('tr', text: my_subproject['name']) do
+      find('input[type=checkbox]').click
+    end
+
+    click_button 'Selection...'
+    within('.selection-action-container') do
+      page.assert_selector 'li.disabled', text: 'Compare selected'
+      page.assert_selector 'li.disabled', text: 'Copy selected'
+      page.assert_no_selector 'li.disabled', text: 'Move selected'
+      page.assert_selector 'li', text: 'Move selected'
+      page.assert_no_selector 'li.disabled', text: 'Remove selected'
+      page.assert_selector 'li', text: 'Remove selected'
+    end
+
+    # select subproject and a collection and verify that copy action is still disabled
+    visit page_with_token 'active', '/'
+    find('.arv-project-list a,button', text: my_project['name']).click
+
+    click_link 'Subprojects'
+    assert page.has_text?(my_subproject['name']), 'Subproject not found in project'
+
+    within('tr', text: my_subproject['name']) do
+      find('input[type=checkbox]').click
+    end
+
+    click_link 'Data collections'
+    assert page.has_text?(my_collection['name']), 'Collection not found in project'
+
+    within('tr', text: my_collection['name']) do
+      find('input[type=checkbox]').click
+    end
+
+    click_button 'Selection...'
+    within('.selection-action-container') do
+      page.assert_selector 'li.disabled', text: 'Compare selected'
+      page.assert_selector 'li.disabled', text: 'Copy selected'
+      page.assert_no_selector 'li.disabled', text: 'Move selected'
+      page.assert_selector 'li', text: 'Move selected'
+      page.assert_no_selector 'li.disabled', text: 'Remove selected'
+      page.assert_selector 'li', text: 'Remove selected'
+    end
+  end
+
 end

commit 9ec9d36e9f236613fc67256ebdb75b3d1e2bec35
Merge: 44bcabe 81ead9f
Author: radhika <radhika at curoverse.com>
Date:   Tue Sep 2 18:36:21 2014 -0400

    Merge branch 'master' into 3637-copy-selections


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


hooks/post-receive
--