diff options
author | Rémy Coutable <remy@rymai.me> | 2018-01-11 14:34:22 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-01-11 14:34:22 +0000 |
commit | a188030dc51fafb3c2dbef2e2f071edd74e221cb (patch) | |
tree | 2d50f2ac9ad2e01875b2bee714da4f41c0000390 /qa | |
parent | 2b8e8c68901b68b2c7d7900fcd8035eb5cfc2ee8 (diff) | |
parent | bf05a7e77ddecace7e231abbde18cbd1e42d528a (diff) | |
download | gitlab-ce-a188030dc51fafb3c2dbef2e2f071edd74e221cb.tar.gz |
Merge branch 'qa/gb/define-project-pages-selectors' into 'master'
Define QA project pages views / selectors
See merge request gitlab-org/gitlab-ce!16391
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/page/project/new.rb | 18 | ||||
-rw-r--r-- | qa/qa/page/project/show.rb | 22 | ||||
-rw-r--r-- | qa/qa/runtime/namespace.rb | 4 |
3 files changed, 28 insertions, 16 deletions
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 |