[ARVADOS] updated: 850807f8b0df927796e5f189c807092ca3112dca

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/stylesheets/application.css.scss     |  4 ++++
 apps/workbench/app/views/layouts/body.html.erb      |  4 ++--
 .../test/integration/anonymous_access_test.rb       |  8 +++++---
 apps/workbench/test/integration/projects_test.rb    | 21 +++++++++++++++++++++
 4 files changed, 32 insertions(+), 5 deletions(-)

       via  850807f8b0df927796e5f189c807092ca3112dca (commit)
      from  2af4936125781b0e60ce66f47f45ed6f856bcda0 (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 850807f8b0df927796e5f189c807092ca3112dca
Author: Manoj <jonam33 at gmail.com>
Date:   Fri Aug 14 11:20:15 2015 -0400

    6640: Removed unecessary code from body, change cursor pointer for search and create,
    added a test for search all projects and changed assertion.

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 9560bb7..a09de69 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -219,6 +219,10 @@ table.table-fixed-header-row tbody {
     overflow-y: auto;
 }
 
+.dropdown-menu a {
+    cursor: pointer;
+}
+
 .row-fill-height, .row-fill-height>div[class*='col-'] {
     display: flex;
 }
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index c322905..09a0845 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -34,7 +34,7 @@
                           action_name: 'Show',
                           action_href: url_for(controller: :actions, action: :show),
                           action_method: 'get',
-                          action_data: {selection_param: 'uuid', success: 'redirect-to-created-object', copy_from_search_box: true}.to_json)
+                          action_data: {selection_param: 'uuid', success: 'redirect-to-created-object'}.to_json)
                          %>">
                 <div class="input-group" style="width: 220px">
                   <input type="text" class="form-control" placeholder="search">
@@ -211,7 +211,7 @@
                           action_name: 'Show',
                           action_href: url_for(controller: :actions, action: :show),
                           action_method: 'get',
-                          action_data: {selection_param: 'uuid', success: 'redirect-to-created-object', copy_from_search_box: true}.to_json),
+                          action_data: {selection_param: 'uuid', success: 'redirect-to-created-object'}.to_json),
                 { remote: true, method: 'get', title: "Search" }) do %>
                     <i class="glyphicon fa-fw glyphicon-search"></i> Search all projects
                   <% end %>
diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index 0fd5b59..7b1e6b0 100644
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -19,9 +19,11 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
         assert_text 'Unrestricted public data'
         assert_selector 'a', text: 'Projects'
         page.find("#projects-menu").click
-        assert_selector 'a', text: 'Create a new project'
-        assert_selector "a[href=\"/projects/public\"]", text: 'Browse public projects'
-        assert page.has_text?('My projects'), 'Not found text - My projects'
+        within('.dropdown-menu') do
+          assert_selector 'a', text: 'Create a new project'
+          assert_selector "a[href=\"/projects/public\"]", text: 'Browse public projects'
+          assert_selector 'li[class="dropdown-header"]', text: 'My projects'
+        end
       else
         assert_text 'indicate that you have read and accepted the user agreement'
       end
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 992ed6c..d542a42 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -707,4 +707,25 @@ class ProjectsTest < ActionDispatch::IntegrationTest
       assert_no_selector 'li.disabled', text: 'Copy selected'
     end
   end
+
+  test "test search all projects menu item in projects menu" do
+     visit page_with_token('active')
+     find('#projects-menu').click
+     within('.dropdown-menu') do
+       assert_selector 'a', text: 'Search all projects'
+       find('a', text: 'Search all projects').click
+     end
+     within('.modal-content') do
+        assert page.has_text?('All projects'), 'No text - All projects'
+        assert page.has_text?('Search'), 'No text - Search'
+        assert page.has_text?('Cancel'), 'No text - Cancel'
+        fill_in "Search", with: 'Unrestricted public data'
+        sleep 2
+        assert_selector 'div', text: 'Unrestricted public data'
+        find(:xpath, '//*[@id="choose-scroll"]/div[2]/div').click
+        click_button 'Show'
+     end
+     assert page.has_text?('Unrestricted public data'), 'No text - Unrestriced public data'
+     assert page.has_text?('An anonymously accessible project'), 'No text - An anonymously accessible project'
+  end
 end

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


hooks/post-receive
--