diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2018-01-22 10:44:59 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2018-01-22 10:44:59 +0300 |
commit | 05d986065b48b325be763c287c96af4b48b0cc16 (patch) | |
tree | 85438693dc952e4ed8d3d141d541a196a1e0b693 /qa | |
parent | ccceb26617a28ee6acda0d46a3997428c9f7e56a (diff) | |
parent | 09e9a50272c516997e41afff81d98d05a8b6c728 (diff) |
Merge branch 'qa-deploy-key-factory-product' into qa-deploy-key-scenario
* qa-deploy-key-factory-product:
Add .qa-project-deploy-keys to locate it
Scrap the deploy key title and match it in test
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/factory/resource/deploy_key.rb | 6 | ||||
-rw-r--r-- | qa/qa/page/project/settings/deploy_keys.rb | 7 | ||||
-rw-r--r-- | qa/qa/specs/features/project/add_deploy_key_spec.rb | 12 |
3 files changed, 14 insertions, 11 deletions
diff --git a/qa/qa/factory/resource/deploy_key.rb b/qa/qa/factory/resource/deploy_key.rb index 7c58e70bcc4..671114d38b1 100644 --- a/qa/qa/factory/resource/deploy_key.rb +++ b/qa/qa/factory/resource/deploy_key.rb @@ -4,6 +4,12 @@ module QA class DeployKey < Factory::Base attr_accessor :title, :key + product :title do + Page::Project::Settings::Repository.act do + expand_deploy_keys(&:key_title) + end + end + dependency Factory::Resource::Project, as: :project do |project| project.name = 'project-to-deploy' project.description = 'project for adding deploy key test' diff --git a/qa/qa/page/project/settings/deploy_keys.rb b/qa/qa/page/project/settings/deploy_keys.rb index bf42767c707..f9e40bf4252 100644 --- a/qa/qa/page/project/settings/deploy_keys.rb +++ b/qa/qa/page/project/settings/deploy_keys.rb @@ -10,6 +10,7 @@ module QA view 'app/assets/javascripts/deploy_keys/components/app.vue' do element :deploy_keys_section, /class=".*deploy\-keys.*"/ + element :project_deploy_keys, 'class="qa-project-deploy-keys"' end view 'app/assets/javascripts/deploy_keys/components/key.vue' do @@ -29,9 +30,9 @@ module QA click_on 'Add key' end - def has_key_title?(title) - page.within('.deploy-keys') do - page.find('.title', text: title) + def key_title + page.within('.qa-project-deploy-keys') do + page.find('.title').text end end end diff --git a/qa/qa/specs/features/project/add_deploy_key_spec.rb b/qa/qa/specs/features/project/add_deploy_key_spec.rb index abff641ccce..54852bfce4d 100644 --- a/qa/qa/specs/features/project/add_deploy_key_spec.rb +++ b/qa/qa/specs/features/project/add_deploy_key_spec.rb @@ -7,16 +7,12 @@ module QA Runtime::Browser.visit(:gitlab, Page::Main::Login) Page::Main::Login.act { sign_in_using_credentials } - Factory::Resource::DeployKey.fabricate! do |deploy_key| - deploy_key.title = deploy_key_title - deploy_key.key = deploy_key_value + deploy_key = Factory::Resource::DeployKey.fabricate! do |resource| + resource.title = deploy_key_title + resource.key = deploy_key_value end - Page::Project::Settings::Repository.perform do |setting| - setting.expand_deploy_keys do |page| - expect(page).to have_key_title(deploy_key_title) - end - end + expect(deploy_key.title).to eq(deploy_key_title) end end end |