[ARVADOS] updated: 4c4a3313494849a6be2dad42965c38011248a4f1

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/sizing.js    | 15 +++++++-------
 .../app/assets/stylesheets/application.css.scss    |  1 +
 .../app/views/application/_svg_div.html.erb        |  3 +--
 .../test/integration/pipeline_instances_test.rb    | 24 +++++++---------------
 services/api/test/fixtures/links.yml               | 14 +++++++++++++
 5 files changed, 30 insertions(+), 27 deletions(-)

       via  4c4a3313494849a6be2dad42965c38011248a4f1 (commit)
       via  bf52eb014aefe62ba9a35670747ca466c400d2f9 (commit)
       via  84eaf88d6836d730ef89d1433233a5f21d36ebb4 (commit)
      from  bf13df5af0c451ef1d3fe38138851ac023d6c910 (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 4c4a3313494849a6be2dad42965c38011248a4f1
Merge: bf52eb0 84eaf88
Author: radhika <radhika at curoverse.com>
Date:   Wed Jun 18 10:14:30 2014 -0400

    Merge branch 'master' into 2659-anonymous-group


commit bf52eb014aefe62ba9a35670747ca466c400d2f9
Author: radhika <radhika at curoverse.com>
Date:   Wed Jun 18 10:13:13 2014 -0400

    2659: test fixture for sharing "A Project" with anonymous groups.

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 47e2b51..c63acff 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -166,7 +166,8 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     assert page.has_no_text? 'My projects'
     assert page.has_no_button? 'Add new project'
     assert page.has_text? 'Projects shared with me'
-    assert page.has_no_text? 'A Project'
+    assert page.has_text? 'A Project'
+    assert page.has_text? 'Unrestricted public data'
 
     find('.arv-project-list a,button', text: 'Unrestricted public data').click
     page.has_text? ('An anonymously accessible project')
@@ -177,11 +178,6 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       page.has_text? ('Projects shared with me')
     end
 
-    # share "A Project" with anonymous users
-    use_token :admin
-    ac = ApplicationController.new
-    ac.send :share_with_anonymous_group, api_fixture('groups')['aproject']['uuid']
-
     # as anonymous user verify the shared project is accessible
     visit page_with_token('anonymous')
     assert page.has_text? 'A Project'
@@ -191,21 +187,15 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     #find('tr[data-kind="arvados#pipelineInstance"]', text: 'New pipeline instance').
     #  find('a', text: 'Show').click
 
-    # unshare "A Project" with anonymous users
-    use_token :admin
-    ac = ApplicationController.new
-    ac.send :unshare_with_anonymous_group, api_fixture('groups')['aproject']['uuid']
-
-    # as anonymous user verify the project is no longer shared
-    visit page_with_token('anonymous')
-    assert page.has_no_text? 'A Project'
-
-    # as active user "A Project" is accessible
-    visit page_with_token('active')
+    # as inactive user "A Project" is accessible
+    visit page_with_token('inactive')
     assert page.has_text? 'A Project'
     find('.arv-project-list a,button', text: 'Unrestricted public data').click
     page.has_text? ('An anonymously accessible project')
     find('a', text: 'Projects').click
+    find('a', text: 'A Project').click
+    page.has_text? ('Test project belonging to active user')
+    find('a', text: 'Projects').click
     within('.dropdown-menu') do
       page.has_text? ('New project')
       page.has_text? ('Projects shared with me')
diff --git a/services/api/test/fixtures/links.yml b/services/api/test/fixtures/links.yml
index d230d3e..526b3dc 100644
--- a/services/api/test/fixtures/links.yml
+++ b/services/api/test/fixtures/links.yml
@@ -480,6 +480,20 @@ user_agreement_readable_by_anonymously_accessible_project:
   link_class: permission
   name: can_read
 
+share_the_aproject_with_all_groups:
+  uuid: zzzzz-o0j2j-24gpzezqjg4bc4z
+  owner_uuid: zzzzz-tpzed-000000000000000
+  created_at: 2014-05-30 14:30:00.184389725 Z
+  modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+  modified_by_user_uuid: zzzzz-tpzed-000000000000000
+  modified_at: 2014-05-30 14:30:00.184019565 Z
+  updated_at: 2014-05-30 14:30:00.183829316 Z
+  link_class: permission
+  name: can_read
+  tail_uuid: zzzzz-j7d0g-anonymouspublic
+  head_uuid: zzzzz-j7d0g-v955i6s2oi1cbso
+  properties: {}
+
 active_user_permission_to_docker_image_collection:
   uuid: zzzzz-o0j2j-dp1d8395ldqw33s
   owner_uuid: zzzzz-tpzed-000000000000000

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


hooks/post-receive
--