[ARVADOS] updated: 041fb50eb0b55d37bd165bec25a2285183326cce

[git at public.curoverse.com]

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

       via  041fb50eb0b55d37bd165bec25a2285183326cce (commit)
      from  77d89dee1d3798a5d66e7010cb641a1bc5a2aaec (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 041fb50eb0b55d37bd165bec25a2285183326cce
Author: Manoj <jonam33 at gmail.com>
Date:   Mon Aug 17 15:26:44 2015 -0400

    6640: Changed menu items names and assertions.

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 09a0845..d14bf99 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -213,7 +213,7 @@
                           action_method: 'get',
                           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
+                    <i class="glyphicon fa-fw glyphicon-search"></i> Search all projects ...
                   <% end %>
                </li>
               <% if Rails.configuration.anonymous_user_token and Rails.configuration.enable_public_projects_page %>
@@ -222,7 +222,7 @@
               <% end %>
               <li role="menuitem">
                 <%= link_to projects_path(options: {ensure_unique_name: true}), role: 'menu-item', method: :post do %>
-                  <i class="fa fa-fw fa-plus"></i> Create a new project
+                  <i class="fa fa-fw fa-plus"></i> Add a new project
                 <% end %>
               </li>
                <li role="presentation" class="divider"></li>
diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index 7fd6f09..aabbf00 100644
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -22,7 +22,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
         within('.dropdown-menu') do
           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 'a', text: 'Add 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 a1fe473..72b6d91 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -26,7 +26,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
         page.find("#projects-menu").click
         assert_selector 'a', text: 'Search all projects'
         assert_no_selector 'a', text: 'Browse public projects'
-        assert_selector 'a', text: 'Create a new project'
+        assert_selector 'a', text: 'Add a new project'
         assert_selector 'li[class="dropdown-header"]', text: 'My projects'
       end
     elsif invited
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 73b441b..5703e18 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -557,13 +557,13 @@ class ProjectsTest < ActionDispatch::IntegrationTest
 
     # Add a new project
     find("#projects-menu").click
-    click_link 'Create a new project'
+    click_link 'Add a new project'
     assert_text 'New project'
     assert_text 'No description provided'
 
     # Add one more new project
     find("#projects-menu").click
-    click_link 'Create a new project'
+    click_link 'Add a new project'
     match = /New project \(\d\)/.match page.text
     assert match, 'Expected project name not found'
     assert_text 'No description provided'
@@ -689,6 +689,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
   end
 
   test "test search all projects menu item in projects menu" do
+     need_selenium
      visit page_with_token('active')
      find('#projects-menu').click
      within('.dropdown-menu') do
@@ -700,7 +701,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
         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
+        wait_for_ajax
         assert_selector 'div', text: 'Unrestricted public data'
         find(:xpath, '//*[@id="choose-scroll"]/div[2]/div').click
         click_button 'Show'

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


hooks/post-receive
--