From fc9ecdbb4f98e91d01ad73edcd3d659dfed7b9bf Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 9 Jan 2018 15:12:15 +0100
Subject: Add QA views / selectors coupling to group/project pages

---
 qa/qa/page/dashboard/groups.rb   |  9 +++++++++
 qa/qa/page/dashboard/projects.rb |  2 ++
 qa/qa/page/group/new.rb          | 11 +++++++++++
 qa/qa/page/view.rb               |  2 +-
 4 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'qa')

diff --git a/qa/qa/page/dashboard/groups.rb b/qa/qa/page/dashboard/groups.rb
index 083d2e1ab16..e853e0d85e0 100644
--- a/qa/qa/page/dashboard/groups.rb
+++ b/qa/qa/page/dashboard/groups.rb
@@ -2,6 +2,15 @@ module QA
   module Page
     module Dashboard
       class Groups < Page::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...'
+        end
+
+        view 'app/views/dashboard/_groups_head.html.haml' do
+          element :new_group_button, 'link_to _("New group")'
+        end
+
         def filter_by_name(name)
           fill_in 'Filter by name...', with: name
         end
diff --git a/qa/qa/page/dashboard/projects.rb b/qa/qa/page/dashboard/projects.rb
index 7ed27da6d89..71255b18362 100644
--- a/qa/qa/page/dashboard/projects.rb
+++ b/qa/qa/page/dashboard/projects.rb
@@ -2,6 +2,8 @@ module QA
   module Page
     module Dashboard
       class Projects < Page::Base
+        view 'app/views/dashboard/projects/index.html.haml'
+
         def go_to_project(name)
           find_link(text: name).click
         end
diff --git a/qa/qa/page/group/new.rb b/qa/qa/page/group/new.rb
index 53fdaaed078..48b71a7c883 100644
--- a/qa/qa/page/group/new.rb
+++ b/qa/qa/page/group/new.rb
@@ -2,6 +2,17 @@ module QA
   module Page
     module Group
       class New < Page::Base
+        view 'app/views/shared/_group_form.html.haml' do
+          element :group_path_field, 'text_field :path'
+          element :group_name_field, 'text_field :name'
+          element :group_description_field, 'text_area :description'
+        end
+
+        view 'app/views/groups/new.html.haml' do
+          element :create_group_button, "submit 'Create group'"
+          element :visibility_radios, 'visibility_level:'
+        end
+
         def set_path(path)
           fill_in 'group_path', with: path
           fill_in 'group_name', with: path
diff --git a/qa/qa/page/view.rb b/qa/qa/page/view.rb
index e8fba4dffd2..ebb28d5fb12 100644
--- a/qa/qa/page/view.rb
+++ b/qa/qa/page/view.rb
@@ -35,7 +35,7 @@ module QA
 
       def self.evaluate(&block)
         Page::View::DSL.new.tap do |evaluator|
-          evaluator.instance_exec(&block)
+          evaluator.instance_exec(&block) if block_given?
         end
       end
 
-- 
cgit v1.2.1