[ARVADOS] updated: 2109516cd314190311d837fcf40576c87dd38cd1

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/integration/collections_test.rb |  4 ++--
 apps/workbench/test/integration/projects_test.rb    | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

       via  2109516cd314190311d837fcf40576c87dd38cd1 (commit)
      from  bc8c85ca59ff590ae2e336fc4552ec265d5ebb50 (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 2109516cd314190311d837fcf40576c87dd38cd1
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 11 19:37:39 2014 -0400

    3654: update tests to match the selection dropdown text changes.

diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index 34b77d8..084a338 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -70,7 +70,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
 
     click_button 'Selection...'
     within('.selection-action-container') do
-      click_link 'Combine selections into a new collection'
+      click_link 'Combine selected collections into a new collection'
     end
 
     # now in the newly created collection page
@@ -96,7 +96,7 @@ class CollectionsTest < ActionDispatch::IntegrationTest
 
     click_button 'Selection...'
     within('.selection-action-container') do
-      click_link 'Combine selections into a new collection'
+      click_link 'Combine selected files into a new collection'
     end
 
     # now in the newly created collection page
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 4fa9567..ade4ed4 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -339,7 +339,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
 
     click_button 'Selection...'
     within('.selection-action-container') do
-      page.assert_selector 'li.disabled', text: 'Combine selections into a new collection'
+      page.assert_selector 'li.disabled', text: 'Combine selected collections into a new collection'
       page.assert_selector 'li.disabled', text: 'Compare selected'
       page.assert_selector 'li.disabled', text: 'Copy selected'
       page.assert_selector 'li.disabled', text: 'Move selected'
@@ -357,8 +357,8 @@ class ProjectsTest < ActionDispatch::IntegrationTest
 
     click_button 'Selection...'
     within('.selection-action-container') do
-      page.assert_no_selector 'li.disabled', text: 'Combine selections into a new collection'
-      page.assert_selector 'li', text: 'Combine selections into a new collection'
+      page.assert_no_selector 'li.disabled', text: 'Combine selected collections into a new collection'
+      page.assert_selector 'li', text: 'Combine selected collections into a new collection'
       page.assert_selector 'li.disabled', text: 'Compare selected'
       page.assert_no_selector 'li.disabled', text: 'Copy selected'
       page.assert_selector 'li', text: 'Copy selected'
@@ -381,7 +381,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
 
     click_button 'Selection...'
     within('.selection-action-container') do
-      page.assert_selector 'li.disabled', text: 'Combine selections into a new collection'
+      page.assert_selector 'li.disabled', text: 'Combine selected collections into a new collection'
       page.assert_selector 'li.disabled', text: 'Compare selected'
       page.assert_selector 'li.disabled', text: 'Copy selected'
       page.assert_no_selector 'li.disabled', text: 'Move selected'
@@ -410,7 +410,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
 
     click_button 'Selection...'
     within('.selection-action-container') do
-      page.assert_selector 'li.disabled', text: 'Combine selections into a new collection'
+      page.assert_selector 'li.disabled', text: 'Combine selected collections into a new collection'
       page.assert_selector 'li.disabled', text: 'Compare selected'
       page.assert_selector 'li.disabled', text: 'Copy selected'
       page.assert_no_selector 'li.disabled', text: 'Move selected'
@@ -420,7 +420,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test "combine selections into new collection" do
+  test "combine selected collections into new collection" do
     my_project = api_fixture('groups')['aproject']
     my_collection = api_fixture('collections')['collection_to_move_around_in_aproject']
 
@@ -434,7 +434,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
 
     click_button 'Selection...'
     within('.selection-action-container') do
-      click_link 'Combine selections into a new collection'
+      click_link 'Combine selected collections into a new collection'
     end
 
     # back in project page

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


hooks/post-receive
--