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
51ddaad7
Commit
51ddaad7
authored
Jun 05, 2020
by
Mark Lapierre
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue-219519-quarantine' into 'master'
Issue 219519 quarantine See merge request gitlab-org/gitlab!33853
parents
e1b14ee9
9161bf3b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
54 additions
and
57 deletions
+54
-57
qa/qa/ee/fixtures/secure_license_files/gl-license-scanning-report.json
...ures/secure_license_files/gl-license-scanning-report.json
+14
-14
qa/qa/ee/fixtures/secure_premade_reports/gl-license-scanning-report.json
...es/secure_premade_reports/gl-license-scanning-report.json
+36
-39
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
+1
-1
qa/qa/specs/features/ee/browser_ui/secure/license_compliance_spec.rb
.../features/ee/browser_ui/secure/license_compliance_spec.rb
+1
-1
qa/qa/specs/features/ee/browser_ui/secure/merge_request_license_widget_spec.rb
...ee/browser_ui/secure/merge_request_license_widget_spec.rb
+1
-1
qa/qa/specs/features/ee/browser_ui/secure/vulnerability_management_spec.rb
...res/ee/browser_ui/secure/vulnerability_management_spec.rb
+1
-1
No files found.
qa/qa/ee/fixtures/secure_license_files/gl-license-scanning-report.json
View file @
51ddaad7
{
"version"
:
"2.0"
,
"licenses"
:
[
{
"count"
:
1
,
"name"
:
"WTFPL"
"id"
:
"WTFPL"
,
"name"
:
"WTFPL License"
,
"url"
:
"http://www.wtfpl.net/"
,
"count"
:
1
}
],
"dependencies"
:
[
{
"license"
:
{
"name"
:
"WTFPL"
,
"url"
:
"http://www.wtfpl.net/"
},
"dependency"
:
{
"name"
:
"wtfpl_init"
,
"url"
:
"https://rubygems.org/gems/wtfpl_init"
,
"description"
:
"Download WTFPL license file and rename to LICENSE.md or something"
,
"paths"
:
[
"."
]
}
"name"
:
"wtfpl_init"
,
"licenses"
:
[
"WTFPL"
],
"url"
:
"https://rubygems.org/gems/wtfpl_init"
,
"description"
:
"Download WTFPL license file and rename to LICENSE.md or something"
,
"paths"
:
[
"."
]
}
]
}
qa/qa/ee/fixtures/secure_premade_reports/gl-license-scanning-report.json
View file @
51ddaad7
{
"licenses"
:
[
{
"count"
:
1
,
"name"
:
"WTFPL"
},
{
"count"
:
1
,
"name"
:
"MIT"
}
"version"
:
"2.0"
,
"licenses"
:
[{
"id"
:
"WTFPL"
,
"name"
:
"WTFPL"
,
"url"
:
"http://www.wtfpl.net/"
,
"count"
:
1
},
{
"id"
:
"MIT"
,
"name"
:
"MIT License"
,
"url"
:
"https://opensource.org/licenses/MIT"
,
"count"
:
1
}
],
"dependencies"
:
[
{
"license"
:
{
"name"
:
"MIT"
,
"url"
:
"http://opensource.org/licenses/mit-license"
},
"dependency"
:
{
"name"
:
"actioncable"
,
"url"
:
"http://rubyonrails.org"
,
"description"
:
"WebSocket framework for Rails."
,
"paths"
:
[
"."
]
}
},
{
"license"
:
{
"name"
:
"WTFPL"
,
"url"
:
"http://www.wtfpl.net/"
},
"dependency"
:
{
"name"
:
"wtfpl_init"
,
"url"
:
"https://rubygems.org/gems/wtfpl_init"
,
"description"
:
"Download WTFPL license file and rename to LICENSE.md or something"
,
"paths"
:
[
"."
]
}
}
"dependencies"
:
[{
"name"
:
"wtfpl_init"
,
"licenses"
:
[
"WTFPL"
],
"url"
:
"https://rubygems.org/gems/wtfpl_init"
,
"description"
:
"Download WTFPL license file and rename to LICENSE.md or something"
,
"paths"
:
[
"."
]
},
{
"name"
:
"actioncable"
,
"licenses"
:
[
"MIT"
],
"url"
:
"http://rubyonrails.org"
,
"description"
:
"WebSocket framework for Rails."
,
"paths"
:
[
"."
]
}
]
}
}
qa/qa/specs/features/ee/browser_ui/secure/create_merge_request_with_secure_spec.rb
View file @
51ddaad7
...
...
@@ -3,7 +3,7 @@
require
'pathname'
module
QA
context
'Secure'
,
:docker
,
:runner
do
context
'Secure'
,
:docker
,
:runner
,
quarantine:
{
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/219519'
,
type: :investigating
}
do
describe
'Security Reports in a Merge Request'
do
let
(
:sast_vuln_count
)
{
5
}
let
(
:dependency_scan_vuln_count
)
{
4
}
...
...
qa/qa/specs/features/ee/browser_ui/secure/license_compliance_spec.rb
View file @
51ddaad7
...
...
@@ -4,7 +4,7 @@ require 'pathname'
module
QA
context
'Secure'
,
:docker
,
:runner
do
let
(
:approved_license_name
)
{
"MIT"
}
let
(
:approved_license_name
)
{
"MIT
License
"
}
let
(
:denied_license_name
)
{
"WTFPL"
}
describe
'License Compliance settings page'
do
...
...
qa/qa/specs/features/ee/browser_ui/secure/merge_request_license_widget_spec.rb
View file @
51ddaad7
...
...
@@ -3,7 +3,7 @@
require
'pathname'
module
QA
context
'Secure'
,
:docker
,
:runner
do
context
'Secure'
,
:docker
,
:runner
,
quarantine:
{
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/219519'
,
type: :investigating
}
do
describe
'License merge request widget'
do
let
(
:approved_license_name
)
{
"MIT"
}
let
(
:blacklisted_license_name
)
{
"Zlib"
}
...
...
qa/qa/specs/features/ee/browser_ui/secure/vulnerability_management_spec.rb
View file @
51ddaad7
...
...
@@ -3,7 +3,7 @@
require
'pathname'
module
QA
context
'Secure'
,
:docker
,
:runner
do
context
'Secure'
,
:docker
,
:runner
,
quarantine:
{
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/219519'
,
type: :investigating
}
do
describe
'Security Reports in a Merge Request'
do
let
(
:sast_vuln_count
)
{
5
}
let
(
:dependency_scan_vuln_count
)
{
4
}
...
...
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