Merge branch 'qa/gb/define-project-pages-selectors' into 'master'

Define QA project pages views / selectors

See merge request gitlab-org/gitlab-ce!16391

6 files changed, 31 insertions, 19 deletions

diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 1d644dda177..b565f14747a 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -4,7 +4,7 @@
   .limit-container-width{ class: container_class }
     .avatar-container.s70.project-avatar
       = project_icon(@project, alt: @project.name, class: 'avatar s70 avatar-tile')
-    %h1.project-title
+    %h1.project-title.qa-project-name
       = @project.name
       %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@project) }
         = visibility_level_icon(@project.visibility_level, fw: false)
diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml
index a78a8e5d628..bd99eb93cc8 100644
--- a/app/views/projects/_new_project_fields.html.haml
+++ b/app/views/projects/_new_project_fields.html.haml
@@ -9,7 +9,7 @@
       - if current_user.can_select_namespace?
         .input-group-addon
           = root_url
-        = f.select :namespace_id, namespaces_options(namespace_id_from(params) || :current_user, display_path: true, extra_group: namespace_id_from(params)), {}, { class: 'select2 js-select-namespace', tabindex: 1}
+        = f.select :namespace_id, namespaces_options(namespace_id_from(params) || :current_user, display_path: true, extra_group: namespace_id_from(params)), {}, { class: 'select2 js-select-namespace qa-project-namespace-select', tabindex: 1}
 
       - else
         .input-group-addon.static-namespace
diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml
index 1cba4fc6c41..687cd4d1532 100644
--- a/app/views/shared/_clone_panel.html.haml
+++ b/app/views/shared/_clone_panel.html.haml
@@ -7,7 +7,7 @@
         %span
           = enabled_project_button(project, enabled_protocol)
     - else
-      %a#clone-dropdown.btn.clone-dropdown-btn{ href: '#', data: { toggle: 'dropdown' } }
+      %a#clone-dropdown.btn.clone-dropdown-btn.qa-clone-dropdown{ href: '#', data: { toggle: 'dropdown' } }
         %span
           = default_clone_protocol.upcase
         = icon('caret-down')
diff --git a/qa/qa/page/project/new.rb b/qa/qa/page/project/new.rb
index a87313b2cb9..9b1438f76d5 100644
--- a/qa/qa/page/project/new.rb
+++ b/qa/qa/page/project/new.rb
@@ -2,16 +2,18 @@ module QA
   module Page
     module Project
       class New < Page::Base
-        ##
-        # TODO, define all selectors required by this page object
-        #
-        # See gitlab-org/gitlab-qa#154
-        #
-        view 'app/views/projects/new.html.haml'
+        view 'app/views/projects/_new_project_fields.html.haml' do
+          element :project_namespace_select
+          element :project_namespace_field, 'select :namespace_id'
+          element :project_path, 'text_field :path'
+          element :project_description, 'text_area :description'
+          element :project_create_button, "submit 'Create project'"
+        end
 
         def choose_test_namespace
-          find('#s2id_project_namespace_id').click
-          find('.select2-result-label', text: Runtime::Namespace.name).click
+          click_element :project_namespace_select
+
+          first('li', text: Runtime::Namespace.path).click
         end
 
         def choose_name(name)
diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb
index 90967e6cc15..c8af5ba6280 100644
--- a/qa/qa/page/project/show.rb
+++ b/qa/qa/page/project/show.rb
@@ -2,15 +2,21 @@ module QA
   module Page
     module Project
       class Show < Page::Base
-        ##
-        # TODO, define all selectors required by this page object
-        #
-        # See gitlab-org/gitlab-qa#154
-        #
-        view 'app/views/projects/show.html.haml'
+        view 'app/views/shared/_clone_panel.html.haml' do
+          element :clone_dropdown
+          element :clone_options_dropdown, '.clone-options-dropdown'
+        end
+
+        view 'app/views/shared/_clone_panel.html.haml' do
+          element :project_repository_location, 'text_field_tag :project_clone'
+        end
+
+        view 'app/views/projects/_home_panel.html.haml' do
+          element :project_name
+        end
 
         def choose_repository_clone_http
-          find('#clone-dropdown').click
+          click_element :clone_dropdown
 
           page.within('.clone-options-dropdown') do
             click_link('HTTP')
@@ -22,7 +28,7 @@ module QA
         end
 
         def project_name
-          find('.project-title').text
+          find('.qa-project-name').text
         end
 
         def wait_for_push
diff --git a/qa/qa/runtime/namespace.rb b/qa/qa/runtime/namespace.rb
index b00e925986b..a72c2d21898 100644
--- a/qa/qa/runtime/namespace.rb
+++ b/qa/qa/runtime/namespace.rb
@@ -11,6 +11,10 @@ module QA
         'qa-test-' + time.strftime('%d-%m-%Y-%H-%M-%S')
       end
 
+      def path
+        "#{sandbox_name}/#{name}"
+      end
+
       def sandbox_name
         'gitlab-qa-sandbox'
       end