Commit a188030d authored by Rémy Coutable's avatar Rémy Coutable

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

Define QA project pages views / selectors

See merge request gitlab-org/gitlab-ce!16391
parents 2b8e8c68 bf05a7e7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.limit-container-width{ class: container_class } .limit-container-width{ class: container_class }
.avatar-container.s70.project-avatar .avatar-container.s70.project-avatar
= project_icon(@project, alt: @project.name, class: 'avatar s70 avatar-tile') = project_icon(@project, alt: @project.name, class: 'avatar s70 avatar-tile')
%h1.project-title %h1.project-title.qa-project-name
= @project.name = @project.name
%span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@project) } %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@project) }
= visibility_level_icon(@project.visibility_level, fw: false) = visibility_level_icon(@project.visibility_level, fw: false)
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
- if current_user.can_select_namespace? - if current_user.can_select_namespace?
.input-group-addon .input-group-addon
= root_url = 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 - else
.input-group-addon.static-namespace .input-group-addon.static-namespace
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
%span %span
= enabled_project_button(project, enabled_protocol) = enabled_project_button(project, enabled_protocol)
- else - 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 %span
= default_clone_protocol.upcase = default_clone_protocol.upcase
= icon('caret-down') = icon('caret-down')
......
...@@ -2,16 +2,18 @@ module QA ...@@ -2,16 +2,18 @@ module QA
module Page module Page
module Project module Project
class New < Page::Base class New < Page::Base
## view 'app/views/projects/_new_project_fields.html.haml' do
# TODO, define all selectors required by this page object element :project_namespace_select
# element :project_namespace_field, 'select :namespace_id'
# See gitlab-org/gitlab-qa#154 element :project_path, 'text_field :path'
# element :project_description, 'text_area :description'
view 'app/views/projects/new.html.haml' element :project_create_button, "submit 'Create project'"
end
def choose_test_namespace def choose_test_namespace
find('#s2id_project_namespace_id').click click_element :project_namespace_select
find('.select2-result-label', text: Runtime::Namespace.name).click
first('li', text: Runtime::Namespace.path).click
end end
def choose_name(name) def choose_name(name)
......
...@@ -2,15 +2,21 @@ module QA ...@@ -2,15 +2,21 @@ module QA
module Page module Page
module Project module Project
class Show < Page::Base class Show < Page::Base
## view 'app/views/shared/_clone_panel.html.haml' do
# TODO, define all selectors required by this page object element :clone_dropdown
# element :clone_options_dropdown, '.clone-options-dropdown'
# See gitlab-org/gitlab-qa#154 end
#
view 'app/views/projects/show.html.haml' 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 def choose_repository_clone_http
find('#clone-dropdown').click click_element :clone_dropdown
page.within('.clone-options-dropdown') do page.within('.clone-options-dropdown') do
click_link('HTTP') click_link('HTTP')
...@@ -22,7 +28,7 @@ module QA ...@@ -22,7 +28,7 @@ module QA
end end
def project_name def project_name
find('.project-title').text find('.qa-project-name').text
end end
def wait_for_push def wait_for_push
......
...@@ -11,6 +11,10 @@ module QA ...@@ -11,6 +11,10 @@ module QA
'qa-test-' + time.strftime('%d-%m-%Y-%H-%M-%S') 'qa-test-' + time.strftime('%d-%m-%Y-%H-%M-%S')
end end
def path
"#{sandbox_name}/#{name}"
end
def sandbox_name def sandbox_name
'gitlab-qa-sandbox' 'gitlab-qa-sandbox'
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment