Commit 54a9bc6f authored by Mark Lapierre's avatar Mark Lapierre

Merge branch '208761-unquarantine-deploy-key-specs' into 'master'

Unquarantine tests that use deploy keys

Closes #208761

See merge request gitlab-org/gitlab!27465
parents 0d0b4540 52e89b1c
- expanded = expanded_by_default?
%section.qa-deploy-keys-settings.settings.no-animate#js-deploy-keys-settings{ class: ('expanded' if expanded) }
%section.qa-deploy-keys-settings.settings.no-animate#js-deploy-keys-settings{ class: ('expanded' if expanded), data: { qa_selector: 'deploy_keys_settings' } }
.settings-header
%h4
Deploy Keys
......
......@@ -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)
......
......@@ -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)
......
......@@ -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|
......
......@@ -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
......
......@@ -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|
......
......@@ -48,7 +48,7 @@ module QA
it_behaves_like 'project audit event logs', ["Add user access as guest"]
end
context "Add deploy key", quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/208761' do
context "Add deploy key" do
before do
key = Runtime::Key::RSA.new
deploy_key_title = 'deploy key title'
......
......@@ -24,7 +24,7 @@ module QA
target_project.visit!
end
it 'configures and syncs a (pull) mirrored repository', quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/208761' do
it 'configures and syncs a (pull) mirrored repository' do
# Configure the target project to pull from the source project
# And get the public key to be used as a deploy key
Page::Project::Menu.perform(&:go_to_repository_settings)
......
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