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
87bf6fac
Commit
87bf6fac
authored
Nov 05, 2018
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs
parent
4099d5b3
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
17 deletions
+10
-17
ee/app/helpers/ee/gitlab_routing_helper.rb
ee/app/helpers/ee/gitlab_routing_helper.rb
+0
-7
ee/app/views/projects/pipelines/_tabs_content.html.haml
ee/app/views/projects/pipelines/_tabs_content.html.haml
+1
-1
ee/spec/controllers/projects/pipelines_controller_spec.rb
ee/spec/controllers/projects/pipelines_controller_spec.rb
+1
-1
ee/spec/features/projects/pipelines/pipeline_spec.rb
ee/spec/features/projects/pipelines/pipeline_spec.rb
+1
-1
ee/spec/models/ci/pipeline_spec.rb
ee/spec/models/ci/pipeline_spec.rb
+5
-5
ee/spec/models/project_spec.rb
ee/spec/models/project_spec.rb
+2
-2
No files found.
ee/app/helpers/ee/gitlab_routing_helper.rb
View file @
87bf6fac
...
@@ -29,13 +29,6 @@ module EE
...
@@ -29,13 +29,6 @@ module EE
group_epic_path
(
entity
.
group
,
entity
,
*
args
)
group_epic_path
(
entity
.
group
,
entity
,
*
args
)
end
end
def
license_management_artifact_url
(
pipeline
)
return
unless
pipeline
pipeline
.
present
(
current_user:
current_user
)
.
downloadable_path_for_report_type
(
:license_management
)
end
def
license_management_api_url
(
project
)
def
license_management_api_url
(
project
)
api_v4_projects_managed_licenses_path
(
id:
project
.
id
)
api_v4_projects_managed_licenses_path
(
id:
project
.
id
)
end
end
...
...
ee/app/views/projects/pipelines/_tabs_content.html.haml
View file @
87bf6fac
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
-
if
pipeline
.
expose_license_management_data?
-
if
pipeline
.
expose_license_management_data?
#js-tab-licenses
.tab-pane
#js-tab-licenses
.tab-pane
#js-licenses-app
{
data:
{
license_head_path:
license_management_artifact_url
(
pipeline
),
#js-licenses-app
{
data:
{
license_head_path:
pipeline
.
downloadable_path_for_report_type
(
:license_management
),
api_url:
license_management_api_url
(
project
),
api_url:
license_management_api_url
(
project
),
license_management_settings_path:
license_management_settings_path
,
license_management_settings_path:
license_management_settings_path
,
can_manage_licenses:
can?
(
current_user
,
:admin_software_license_policy
,
project
).
to_s
}
}
can_manage_licenses:
can?
(
current_user
,
:admin_software_license_policy
,
project
).
to_s
}
}
ee/spec/controllers/projects/pipelines_controller_spec.rb
View file @
87bf6fac
...
@@ -15,7 +15,7 @@ describe Projects::PipelinesController do
...
@@ -15,7 +15,7 @@ describe Projects::PipelinesController do
context
'with a sast artifact'
do
context
'with a sast artifact'
do
before
do
before
do
create
(
:ci_build
,
:legacy_sast
,
pipeline:
pipeline
)
create
(
:
ee_
ci_build
,
:legacy_sast
,
pipeline:
pipeline
)
end
end
context
'with feature enabled'
do
context
'with feature enabled'
do
...
...
ee/spec/features/projects/pipelines/pipeline_spec.rb
View file @
87bf6fac
...
@@ -18,7 +18,7 @@ describe 'Pipeline', :js do
...
@@ -18,7 +18,7 @@ describe 'Pipeline', :js do
context
'with a sast artifact'
do
context
'with a sast artifact'
do
before
do
before
do
create
(
:ci_build
,
:legacy_sast
,
pipeline:
pipeline
)
create
(
:
ee_
ci_build
,
:legacy_sast
,
pipeline:
pipeline
)
visit
security_project_pipeline_path
(
project
,
pipeline
)
visit
security_project_pipeline_path
(
project
,
pipeline
)
end
end
...
...
ee/spec/models/ci/pipeline_spec.rb
View file @
87bf6fac
...
@@ -28,11 +28,11 @@ describe Ci::Pipeline do
...
@@ -28,11 +28,11 @@ describe Ci::Pipeline do
let
(
:pipeline_5
)
{
create
(
:ci_pipeline_without_jobs
,
project:
project
)
}
let
(
:pipeline_5
)
{
create
(
:ci_pipeline_without_jobs
,
project:
project
)
}
before
do
before
do
create
(
:ci_build
,
:legacy_sast
,
pipeline:
pipeline_1
)
create
(
:
ee_
ci_build
,
:legacy_sast
,
pipeline:
pipeline_1
)
create
(
:ci_build
,
:legacy_dependency_scanning
,
pipeline:
pipeline_2
)
create
(
:
ee_
ci_build
,
:legacy_dependency_scanning
,
pipeline:
pipeline_2
)
create
(
:ci_build
,
:legacy_container_scanning
,
pipeline:
pipeline_3
)
create
(
:
ee_
ci_build
,
:legacy_container_scanning
,
pipeline:
pipeline_3
)
create
(
:ci_build
,
:legacy_dast
,
pipeline:
pipeline_4
)
create
(
:
ee_
ci_build
,
:legacy_dast
,
pipeline:
pipeline_4
)
create
(
:ci_build
,
:success
,
:artifacts
,
name:
'foobar'
,
pipeline:
pipeline_5
)
create
(
:
ee_
ci_build
,
:success
,
:artifacts
,
name:
'foobar'
,
pipeline:
pipeline_5
)
end
end
it
"returns pipeline with security reports"
do
it
"returns pipeline with security reports"
do
...
...
ee/spec/models/project_spec.rb
View file @
87bf6fac
...
@@ -1503,8 +1503,8 @@ describe Project do
...
@@ -1503,8 +1503,8 @@ describe Project do
let
(
:pipeline_3
)
{
create
(
:ci_pipeline_without_jobs
,
project:
project
)
}
let
(
:pipeline_3
)
{
create
(
:ci_pipeline_without_jobs
,
project:
project
)
}
before
do
before
do
create
(
:ci_build
,
:legacy_sast
,
pipeline:
pipeline_1
)
create
(
:
ee_
ci_build
,
:legacy_sast
,
pipeline:
pipeline_1
)
create
(
:ci_build
,
:legacy_sast
,
pipeline:
pipeline_2
)
create
(
:
ee_
ci_build
,
:legacy_sast
,
pipeline:
pipeline_2
)
end
end
it
"returns the latest pipeline with security reports"
do
it
"returns the latest pipeline with security reports"
do
...
...
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