6057: few more minor tweaks

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 6c23035adc5fddd5ac351560cc58a8252c8ddce4..54e662605a8314e245ae539fbcd5d6b494676b87 100644 (file)
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -117,7 +117,7 @@
             <% end %>
           <% else %>
             <% if Rails.configuration.anonymous_user_token %>
-              <li><%= link_to raw('Browse public projects'), "/projects/public" %></li>
+              <li><%= link_to 'Browse public projects', "/projects/public" %></li>
             <% end %>
             <li class="dropdown hover-dropdown login-menu">
               <a href="<%= arvados_api_client.arvados_login_url(return_to: root_url) %>">Log in</a>
@@ -184,7 +184,7 @@
             </a>
             <ul class="dropdown-menu" style="min-width: 20em" role="menu">
               <% if Rails.configuration.anonymous_user_token %>
-                <li><%= link_to raw('Browse public projects'), "/projects/public", class: 'btn btn-xs btn-default pull-right' %></li>
+                <li><%= link_to 'Browse public projects', "/projects/public", class: 'btn btn-xs btn-default pull-right' %></li>
               <% end %>
               <li>
                 <%= link_to projects_path(options: {ensure_unique_name: true}), method: :post, class: 'btn btn-xs btn-default pull-right' do %>

diff --git a/apps/workbench/test/controllers/projects_controller_test.rb b/apps/workbench/test/controllers/projects_controller_test.rb
index b050383b522529971840c817ba3f469f6137a734..d7fb8f2a0081a4ec13fc2a5a2747460d1e1cb1b6 100644 (file)
--- a/apps/workbench/test/controllers/projects_controller_test.rb
+++ b/apps/workbench/test/controllers/projects_controller_test.rb
@@ -265,25 +265,19 @@ class ProjectsControllerTest < ActionController::TestCase
       assert_response :success
       assert_not_nil assigns(:objects)
       project_names = assigns(:objects).collect(&:name)
-      assert_operator 0, :<, project_names.length
-      assert project_names.include?('Unrestricted public data')
-      assert !project_names.include?('A Project')
+      assert_includes project_names, 'Unrestricted public data'
+      assert_not_includes project_names, 'A Project'
     end
   end
 
-  [
-    nil,
-    :active,
-  ].each do |user|
-    test "visit public projects page when anon config is not enabled, as user #{user}, and expect no such page" do
-      if user
-        get :public, {}, session_for(user)
-        assert_response 404
-      else
-        get :public
-        assert_response :redirect
-        assert_match /\/users\/welcome/, @response.redirect_url
-      end
-    end
+  test "visit public projects page when anon config is not enabled as active user and expect 404" do
+    get :public, {}, session_for(:active)
+    assert_response 404
+  end
+
+  test "visit public projects page when anon config is not enabled as anonymous and expect login page" do
+    get :public
+    assert_response :redirect
+    assert_match /\/users\/welcome/, @response.redirect_url
   end
 end

diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index f8984f0db38aba11455dc118e74785afc72fa850..daf2b09bbb1717b50bd472a54cda8e13a0e63db1 100644 (file)
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -25,7 +25,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
         assert page.has_link?("Projects"), 'Not found link - Projects'
         page.find("#projects-menu").click
         assert_selector 'a', text: 'Add a new project'
-        assert_no_selector 'a', text: 'Browse public projects'  # anonymous config is not enabled by default
+        assert_no_selector 'a', text: 'Browse public projects'
         assert page.has_text?('Projects shared with me'), 'Not found text - Project shared with me'
       end
     elsif invited