[ARVADOS] updated: ee15a556d1ccc0723e56b4155ed1762fcb1cf60b

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb   | 4 ++--
 apps/workbench/test/integration/anonymous_access_test.rb   | 3 ++-
 apps/workbench/test/integration/application_layout_test.rb | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

       via  ee15a556d1ccc0723e56b4155ed1762fcb1cf60b (commit)
      from  94a996322c6cee6c35a0df50b261f0f003490e50 (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 ee15a556d1ccc0723e56b4155ed1762fcb1cf60b
Author: Manoj <jonam33 at gmail.com>
Date:   Mon Aug 17 10:42:40 2015 -0400

    6640: No limit on all projects and added assertions in application layout and anonymous access test.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 31a259b..db3d430 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -744,8 +744,8 @@ class ApplicationController < ActionController::Base
 
   helper_method :all_projects
   def all_projects
-    @all_projects = Group.
-      filter([['group_class','=','project']]).order('name').limit(nil)
+    @all_projects ||= Group.
+      filter([['group_class','=','project']]).order('name')
   end
 
   helper_method :my_projects
diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index 7b1e6b0..7fd6f09 100644
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -20,8 +20,9 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
         assert_selector 'a', text: 'Projects'
         page.find("#projects-menu").click
         within('.dropdown-menu') do
-          assert_selector 'a', text: 'Create a new project'
+          assert_selector 'a', text: 'Search all projects'
           assert_selector "a[href=\"/projects/public\"]", text: 'Browse public projects'
+          assert_selector 'a', text: 'Create a new project'
           assert_selector 'li[class="dropdown-header"]', text: 'My projects'
         end
       else
diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index f73cd87..6895a56 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -24,8 +24,9 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       else
         assert page.has_link?("Projects"), 'Not found link - Projects'
         page.find("#projects-menu").click
-        assert_selector 'a', text: 'Create a new project'
+        assert_selector 'a', text: 'Search all projects'
         assert_no_selector 'a', text: 'Browse public projects'
+        assert_selector 'a', text: 'Create a new project'
         assert page.has_text?('My projects'), 'Not found text - My projects'
       end
     elsif invited

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


hooks/post-receive
--