Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
478416e4
Commit
478416e4
authored
5 years ago
by
Grant Young
Committed by
Sanad Liaquat
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Workaround for QA tests when job_log_json flag is enabled
parent
af01e758
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
0 deletions
+20
-0
qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
...er_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
+8
-0
qa/qa/specs/features/ee/browser_ui/secure/create_merge_request_with_secure_spec.rb
...rowser_ui/secure/create_merge_request_with_secure_spec.rb
+6
-0
qa/qa/specs/features/ee/browser_ui/secure/security_reports_spec.rb
...cs/features/ee/browser_ui/secure/security_reports_spec.rb
+6
-0
No files found.
qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
View file @
478416e4
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
qa/qa/specs/features/ee/browser_ui/secure/create_merge_request_with_secure_spec.rb
View file @
478416e4
...
...
@@ -13,11 +13,17 @@ module QA
after
do
Service
::
DockerRun
::
GitlabRunner
.
new
(
@executor
).
remove!
Runtime
::
Feature
.
enable
(
'job_log_json'
)
if
@job_log_json_flag_enabled
end
before
do
@executor
=
"qa-runner-
#{
Time
.
now
.
to_i
}
"
# 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
)
...
...
This diff is collapsed.
Click to expand it.
qa/qa/specs/features/ee/browser_ui/secure/security_reports_spec.rb
View file @
478416e4
...
...
@@ -19,11 +19,17 @@ module QA
describe
'Security Reports'
do
after
do
Service
::
DockerRun
::
GitlabRunner
.
new
(
@executor
).
remove!
Runtime
::
Feature
.
enable
(
'job_log_json'
)
if
@job_log_json_flag_enabled
end
before
do
@executor
=
"qa-runner-
#{
Time
.
now
.
to_i
}
"
# 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
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment