[ARVADOS] updated: 6b7f891f5a2d313837fbe59149f0f4f8c3b16443

[git at public.curoverse.com]

Summary of changes:
 .../app/views/projects/_show_tab_contents.html.erb      |  2 +-
 apps/workbench/test/integration/projects_test.rb        | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

       via  6b7f891f5a2d313837fbe59149f0f4f8c3b16443 (commit)
      from  3270fbf5a3cbd121dad7327513d5a5866c3583c4 (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 6b7f891f5a2d313837fbe59149f0f4f8c3b16443
Author: radhika <radhika at curoverse.com>
Date:   Mon Dec 1 19:44:51 2014 -0500

    4487: updates from review feedback

diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
index 3c94518..d9ec4bc 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -52,7 +52,7 @@
                   'data-selection-param-name' => 'selection[]',
                   'data-selection-action' => 'move'
             %></li>
-          <% if (ArvadosBase.find(@object.owner_uuid).writable_by.include?(current_user.uuid) rescue nil) %>
+          <% if @object.editable? %>
           <li><%= link_to "Remove selected", '#',
                   'data-href' => url_for(action: :remove_items),
                   'data-selection-param-name' => 'item_uuids[]',
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 678ba34..ac00b1b 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -446,21 +446,16 @@ class ProjectsTest < ActionDispatch::IntegrationTest
   end
 
   # "Remove selected" selection option should not be available when current user cannot write to the project
-  test "remove selected action is not avaialble when current user cannot write to project" do
+  test "remove selected action is not available when current user cannot write to project" do
     my_project = api_fixture('groups')['anonymously_accessible_project']
-
-    # verify that selection options are disabled or unavailable on the project
-    visit page_with_token 'active', '/'
-    find("#projects-menu").click
-    find(".dropdown-menu a", text: my_project['name']).click
+    visit page_with_token 'active', "/projects/#{my_project['uuid']}"
 
     click_button 'Selection'
     within('.selection-action-container') do
-      assert_selector 'li.disabled', text: 'Create new collection with selected collections'
-      assert_selector 'li.disabled', text: 'Compare selected'
-      assert_selector 'li.disabled', text: 'Copy selected'
-      assert_selector 'li.disabled', text: 'Move selected'
-      assert_no_selector 'li.disabled', text: 'Remove selected'
+      assert_selector 'li', text: 'Create new collection with selected collections'
+      assert_selector 'li', text: 'Compare selected'
+      assert_selector 'li', text: 'Copy selected'
+      assert_selector 'li', text: 'Move selected'
       assert_no_selector 'li', text: 'Remove selected'
     end
   end

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


hooks/post-receive
--