[ARVADOS] updated: 7f2c45b1312014831e2efd8aa0fb8a116085b036

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/layouts/body.html.erb     |  4 +--
 .../test/integration/anonymous_access_test.rb      | 30 ++++++----------------
 2 files changed, 9 insertions(+), 25 deletions(-)

       via  7f2c45b1312014831e2efd8aa0fb8a116085b036 (commit)
      from  411ce5bc5bf433c976f55fe001fe5979456207f2 (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 7f2c45b1312014831e2efd8aa0fb8a116085b036
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Feb 2 15:00:56 2015 -0500

    2659: do not include "You are viewing public data" in topnav when anonymous user is accessing a shared project.

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 138bcda..06b373c 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -7,9 +7,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="/" data-push=true><%= Rails.configuration.site_name.downcase rescue Rails.application.class.parent_name %>
-          <% if is_anonymous %>  You are viewing public data. <% end %>
-        </a>
+        <a class="navbar-brand" href="/" data-push=true><%= Rails.configuration.site_name.downcase rescue Rails.application.class.parent_name %> </a>
       </div>
 
       <div class="collapse navbar-collapse">
diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index 066eb40..43bbf96 100644
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -32,7 +32,6 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
         assert_text 'indicate that you have read and accepted the user agreement'
       end
       within('.navbar-fixed-top') do
-        assert_no_text 'You are viewing public data'
         assert_selector 'a', text: "#{user['email']}"
         find('a', text: "#{user['email']}").click
         within('.dropdown-menu') do
@@ -42,7 +41,6 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
     else  # anonymous
       assert_text 'Unrestricted public data'
       within('.navbar-fixed-top') do
-        assert_text 'You are viewing public data'
         assert_selector 'a', text: 'Log in'
       end
     end
@@ -65,6 +63,14 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
     assert_text 'Not Found'
   end
 
+  test "anonymous user clicking on topnav sees login page" do
+    visit_publicly_accessible_project
+
+    # click on topnav
+    click_link 'workbench:test'
+    assert_text 'Please log in'
+  end
+
   test "selection actions when anonymous user accesses shared project" do
     visit_publicly_accessible_project
 
@@ -86,26 +92,6 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
     end
   end
 
-  [
-    ['All pipelines', 'Pipeline in publicly accessible project'],
-    ['All jobs', 'job submitted'],
-    ['All collections', 'GNU_General_Public_License,_version_3.pdf'],
-  ].each do |selector, expectation|
-    test "verify dashboard when anonymous user accesses shared project and click #{selector}" do
-      skip 'for now'
-      visit_publicly_accessible_project
-
-      # go to dashboard
-      click_link 'You are viewing public data'
-      assert_text 'Active pipelines'
-
-      assert_no_selector 'a', text: 'Run a pipeline'
-      assert_selector 'a', text: selector
-      click_link selector
-      assert_text expectation
-    end
-  end
-
   test "anonymous user accesses data collections tab in shared project" do
     visit_publicly_accessible_project
     assert_text 'GNU General Public License'

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


hooks/post-receive
--