1 files changed, 13 insertions, 10 deletions
diff --git a/qa/qa/page/dashboard/groups.rb b/qa/qa/page/dashboard/groups.rb
index 3690f40dcfe..083d2e1ab16 100644
--- a/qa/qa/page/dashboard/groups.rb
+++ b/qa/qa/page/dashboard/groups.rb
@@ -2,19 +2,22 @@ module QA
   module Page
     module Dashboard
       class Groups < Page::Base
-        def prepare_test_namespace
-          if page.has_content?(Runtime::Namespace.name)
-            return click_link(Runtime::Namespace.name)
-          end
+        def filter_by_name(name)
+          fill_in 'Filter by name...', with: name
+        end
 
-          click_on 'New group'
+        def has_group?(name)
+          filter_by_name(name)
+
+          page.has_link?(name)
+        end
 
-          fill_in 'group_path', with: Runtime::Namespace.name
-          fill_in 'group_description',
-                  with: "QA test run at #{Runtime::Namespace.time}"
-          choose 'Private'
+        def go_to_group(name)
+          click_link name
+        end
 
-          click_button 'Create group'
+        def go_to_new_group
+          click_on 'New group'
         end
       end
     end