diff options
Diffstat (limited to 'qa/qa')
| -rw-r--r-- | qa/qa/page/project/settings/ci_cd.rb | 10 | ||||
| -rw-r--r-- | qa/qa/page/project/settings/repository.rb | 10 | ||||
| -rw-r--r-- | qa/qa/resource/deploy_key.rb | 6 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb index c43974c10cb..46f93fad61e 100644 --- a/qa/qa/page/project/settings/ci_cd.rb +++ b/qa/qa/page/project/settings/ci_cd.rb @@ -13,16 +13,6 @@ module QA element :variables_settings_content end - view 'app/views/projects/deploy_keys/_index.html.haml' do - element :deploy_keys_settings - end - - def expand_deploy_keys(&block) - expand_section(:deploy_keys_settings) do - Settings::DeployKeys.perform(&block) - end - end - def expand_runners_settings(&block) expand_section(:runners_settings_content) do Settings::Runners.perform(&block) diff --git a/qa/qa/page/project/settings/repository.rb b/qa/qa/page/project/settings/repository.rb index 97dfc6497a4..8810b971fda 100644 --- a/qa/qa/page/project/settings/repository.rb +++ b/qa/qa/page/project/settings/repository.rb @@ -19,12 +19,22 @@ module QA element :deploy_tokens_settings end + view 'app/views/projects/deploy_keys/_index.html.haml' do + element :deploy_keys_settings + end + def expand_deploy_tokens(&block) expand_section(:deploy_tokens_settings) do Settings::DeployTokens.perform(&block) end end + def expand_deploy_keys(&block) + expand_section(:deploy_keys_settings) do + Settings::DeployKeys.perform(&block) + end + end + def expand_protected_branches(&block) expand_section(:protected_branches_settings) do ProtectedBranches.perform(&block) diff --git a/qa/qa/resource/deploy_key.rb b/qa/qa/resource/deploy_key.rb index 091d2936d09..26355729dab 100644 --- a/qa/qa/resource/deploy_key.rb +++ b/qa/qa/resource/deploy_key.rb @@ -6,7 +6,7 @@ module QA attr_accessor :title, :key attribute :md5_fingerprint do - Page::Project::Settings::CICD.perform do |setting| + Page::Project::Settings::Repository.perform do |setting| setting.expand_deploy_keys do |key| key.find_md5_fingerprint(title) end @@ -23,9 +23,9 @@ module QA def fabricate! project.visit! - Page::Project::Menu.perform(&:go_to_ci_cd_settings) + Page::Project::Menu.perform(&:go_to_repository_settings) - Page::Project::Settings::CICD.perform do |setting| + Page::Project::Settings::Repository.perform do |setting| setting.expand_deploy_keys do |page| page.fill_key_title(title) page.fill_key_value(key) diff --git a/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb b/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb index 1fc5e06963d..89aba112407 100644 --- a/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb +++ b/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb @@ -17,7 +17,7 @@ module QA expect(deploy_key.md5_fingerprint).to eq key.md5_fingerprint - Page::Project::Settings::CICD.perform do |setting| + Page::Project::Settings::Repository.perform do |setting| setting.expand_deploy_keys do |keys| expect(keys).to have_key(deploy_key_title, key.md5_fingerprint) end |