Resolve "Improve handling of projects shared with a group"

3 files changed, 9 insertions, 4 deletions

diff --git a/qa/qa/page/component/groups_filter.rb b/qa/qa/page/component/groups_filter.rb
index 69d465e8ac7..e647d368f0f 100644
--- a/qa/qa/page/component/groups_filter.rb
+++ b/qa/qa/page/component/groups_filter.rb
@@ -7,7 +7,7 @@ module QA
         def self.included(base)
           base.view 'app/views/shared/groups/_search_form.html.haml' do
             element :groups_filter, 'search_field_tag :filter'
-            element :groups_filter_placeholder, 'Filter by name...'
+            element :groups_filter_placeholder, 'Search by name'
           end
 
           base.view 'app/views/shared/groups/_empty_state.html.haml' do
@@ -27,7 +27,7 @@ module QA
               page.has_css?(element_selector_css(:groups_list_tree_container))
           end
 
-          fill_in 'Filter by name...', with: name
+          fill_in 'Search by name', with: name
         end
       end
     end
diff --git a/qa/qa/page/dashboard/groups.rb b/qa/qa/page/dashboard/groups.rb
index 5654cc01e09..70c5f996ff8 100644
--- a/qa/qa/page/dashboard/groups.rb
+++ b/qa/qa/page/dashboard/groups.rb
@@ -4,6 +4,11 @@ module QA
       class Groups < Page::Base
         include Page::Component::GroupsFilter
 
+        view 'app/views/shared/groups/_search_form.html.haml' do
+          element :groups_filter, 'search_field_tag :filter'
+          element :groups_filter_placeholder, 'Search by name'
+        end
+
         view 'app/views/dashboard/_groups_head.html.haml' do
           element :new_group_button, 'link_to _("New group")'
         end
diff --git a/qa/qa/page/group/show.rb b/qa/qa/page/group/show.rb
index ac85f16d8af..6747f7f10b6 100644
--- a/qa/qa/page/group/show.rb
+++ b/qa/qa/page/group/show.rb
@@ -16,7 +16,7 @@ module QA
         end
 
         view 'app/assets/javascripts/groups/constants.js' do
-          element :no_result_text, 'Sorry, no groups or projects matched your search'
+          element :no_result_text, 'No groups or projects matched your search'
         end
 
         def go_to_subgroup(name)
@@ -30,7 +30,7 @@ module QA
         def has_subgroup?(name)
           filter_by_name(name)
 
-          page.has_text?(/#{name}|Sorry, no groups or projects matched your search/, wait: 60)
+          page.has_text?(/#{name}|No groups or projects matched your search/, wait: 60)
 
           page.has_text?(name, wait: 0)
         end