From 1a3d7b9fcda9e4eecd22b84f4254efc07344b284 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 28 Oct 2019 06:06:30 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../6_release/deploy_key/clone_using_deploy_key_spec.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'qa') 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 e45ce438fc2..13e205352de 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 @@ -5,7 +5,15 @@ require 'digest/sha1' module QA context 'Release', :docker do describe 'Git clone using a deploy key' do + after do + Runtime::Feature.enable('job_log_json') if @job_log_json_flag_enabled + end + before do + # Handle WIP Job Logs flag - https://gitlab.com/gitlab-org/gitlab/issues/31162 + @job_log_json_flag_enabled = Runtime::Feature.enabled?('job_log_json') + Runtime::Feature.disable('job_log_json') if @job_log_json_flag_enabled + Runtime::Browser.visit(:gitlab, Page::Main::Login) Page::Main::Login.perform(&:sign_in_using_credentials) -- cgit v1.2.3