From 7c4ef7b9fd144c51102f9b7530053a5a7efc5ef8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 Mar 2020 03:09:48 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- qa/qa/page/project/settings/ci_cd.rb | 10 ++++++++++ qa/qa/page/project/settings/repository.rb | 10 ---------- qa/qa/resource/deploy_key.rb | 2 +- .../browser_ui/6_release/deploy_key/add_deploy_key_spec.rb | 2 +- .../6_release/deploy_key/clone_using_deploy_key_spec.rb | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'qa') diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb index 01f7ab43d27..b3cbf572cb7 100644 --- a/qa/qa/page/project/settings/ci_cd.rb +++ b/qa/qa/page/project/settings/ci_cd.rb @@ -17,12 +17,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_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 7875a38dcf3..9b48e62a9f9 100644 --- a/qa/qa/page/project/settings/repository.rb +++ b/qa/qa/page/project/settings/repository.rb @@ -7,10 +7,6 @@ module QA class Repository < Page::Base include Common - view 'app/views/projects/deploy_keys/_index.html.haml' do - element :deploy_keys_settings - end - view 'app/views/projects/protected_branches/shared/_index.html.haml' do element :protected_branches_settings end @@ -19,12 +15,6 @@ module QA element :mirroring_repositories_settings_section end - def expand_deploy_keys(&block) - expand_section(:deploy_keys_settings) do - 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 4db4d7e1315..091d2936d09 100644 --- a/qa/qa/resource/deploy_key.rb +++ b/qa/qa/resource/deploy_key.rb @@ -23,7 +23,7 @@ module QA def fabricate! project.visit! - Page::Project::Menu.perform(&:go_to_repository_settings) + Page::Project::Menu.perform(&:go_to_ci_cd_settings) Page::Project::Settings::CICD.perform do |setting| setting.expand_deploy_keys do |page| 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 2e0bfcec4bf..1fc5e06963d 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 @@ -3,7 +3,7 @@ module QA context 'Release' do describe 'Deploy key creation' do - it 'user adds a deploy key', quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/208761' do + it 'user adds a deploy key' do Flow::Login.sign_in key = Runtime::Key::RSA.new diff --git a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb index ca32d5a84f0..581e6b8299e 100644 --- a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb +++ b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb @@ -35,7 +35,7 @@ module QA ] keys.each do |(key_class, bits)| - it "user sets up a deploy key with #{key_class}(#{bits}) to clone code using pipelines", quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/208761' do + it "user sets up a deploy key with #{key_class}(#{bits}) to clone code using pipelines" do key = key_class.new(*bits) Resource::DeployKey.fabricate_via_browser_ui! do |resource| -- cgit v1.2.1