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
ae5c724f
Commit
ae5c724f
authored
Mar 22, 2020
by
Tetiana Chupryna
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use `license_scanning` artifact
`license_management` factories will be removed in 13.0
parent
d8729627
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
ee/spec/controllers/projects/dependencies_controller_spec.rb
ee/spec/controllers/projects/dependencies_controller_spec.rb
+1
-1
ee/spec/controllers/projects/licenses_controller_spec.rb
ee/spec/controllers/projects/licenses_controller_spec.rb
+1
-1
ee/spec/controllers/projects/merge_requests_controller_spec.rb
...ec/controllers/projects/merge_requests_controller_spec.rb
+1
-1
ee/spec/controllers/projects/pipelines_controller_spec.rb
ee/spec/controllers/projects/pipelines_controller_spec.rb
+4
-4
No files found.
ee/spec/controllers/projects/dependencies_controller_spec.rb
View file @
ae5c724f
...
@@ -163,7 +163,7 @@ describe Projects::DependenciesController do
...
@@ -163,7 +163,7 @@ describe Projects::DependenciesController do
context
'with found license report'
do
context
'with found license report'
do
let
(
:user
)
{
developer
}
let
(
:user
)
{
developer
}
let
(
:pipeline
)
{
create
(
:ee_ci_pipeline
,
:with_dependency_list_report
,
project:
project
)
}
let
(
:pipeline
)
{
create
(
:ee_ci_pipeline
,
:with_dependency_list_report
,
project:
project
)
}
let
(
:license_build
)
{
create
(
:ee_ci_build
,
:success
,
:license_
management
,
pipeline:
pipeline
)
}
let
(
:license_build
)
{
create
(
:ee_ci_build
,
:success
,
:license_
scanning
,
pipeline:
pipeline
)
}
before
do
before
do
pipeline
.
builds
<<
license_build
pipeline
.
builds
<<
license_build
...
...
ee/spec/controllers/projects/licenses_controller_spec.rb
View file @
ae5c724f
...
@@ -43,7 +43,7 @@ describe Projects::LicensesController do
...
@@ -43,7 +43,7 @@ describe Projects::LicensesController do
end
end
context
'with existing report'
do
context
'with existing report'
do
let!
(
:pipeline
)
{
create
(
:ee_ci_pipeline
,
:with_license_
management
_report
,
project:
project
)
}
let!
(
:pipeline
)
{
create
(
:ee_ci_pipeline
,
:with_license_
scanning
_report
,
project:
project
)
}
before
do
before
do
get_licenses
get_licenses
...
...
ee/spec/controllers/projects/merge_requests_controller_spec.rb
View file @
ae5c724f
...
@@ -734,7 +734,7 @@ describe Projects::MergeRequestsController do
...
@@ -734,7 +734,7 @@ describe Projects::MergeRequestsController do
end
end
describe
'GET #license_management_reports'
do
describe
'GET #license_management_reports'
do
let
(
:merge_request
)
{
create
(
:ee_merge_request
,
:with_license_
management
_reports
,
source_project:
project
,
author:
create
(
:user
))
}
let
(
:merge_request
)
{
create
(
:ee_merge_request
,
:with_license_
scanning
_reports
,
source_project:
project
,
author:
create
(
:user
))
}
let
(
:params
)
do
let
(
:params
)
do
{
{
namespace_id:
project
.
namespace
.
to_param
,
namespace_id:
project
.
namespace
.
to_param
,
...
...
ee/spec/controllers/projects/pipelines_controller_spec.rb
View file @
ae5c724f
...
@@ -76,10 +76,10 @@ describe Projects::PipelinesController do
...
@@ -76,10 +76,10 @@ describe Projects::PipelinesController do
let
(
:payload
)
{
JSON
.
parse
(
licenses_with_json
.
body
)
}
let
(
:payload
)
{
JSON
.
parse
(
licenses_with_json
.
body
)
}
context
'with a license
management
artifact'
do
context
'with a license
scanning
artifact'
do
before
do
before
do
build
=
create
(
:ci_build
,
pipeline:
pipeline
)
build
=
create
(
:ci_build
,
pipeline:
pipeline
)
create
(
:ee_ci_job_artifact
,
:license_
management
,
job:
build
)
create
(
:ee_ci_job_artifact
,
:license_
scanning
,
job:
build
)
end
end
context
'with feature enabled'
do
context
'with feature enabled'
do
...
@@ -99,7 +99,7 @@ describe Projects::PipelinesController do
...
@@ -99,7 +99,7 @@ describe Projects::PipelinesController do
stub_licensed_features
(
license_scanning:
true
)
stub_licensed_features
(
license_scanning:
true
)
end
end
it
'will return license
management
report in json format'
do
it
'will return license
scanning
report in json format'
do
expect
(
payload
.
size
).
to
eq
(
pipeline
.
license_scanning_report
.
licenses
.
size
)
expect
(
payload
.
size
).
to
eq
(
pipeline
.
license_scanning_report
.
licenses
.
size
)
expect
(
payload
.
first
.
keys
).
to
eq
(
%w(name classification dependencies count url)
)
expect
(
payload
.
first
.
keys
).
to
eq
(
%w(name classification dependencies count url)
)
end
end
...
@@ -138,7 +138,7 @@ describe Projects::PipelinesController do
...
@@ -138,7 +138,7 @@ describe Projects::PipelinesController do
end
end
end
end
context
'without license
management
artifact'
do
context
'without license
scanning
artifact'
do
context
'with feature enabled'
do
context
'with feature enabled'
do
before
do
before
do
stub_licensed_features
(
license_scanning:
true
)
stub_licensed_features
(
license_scanning:
true
)
...
...
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