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
ef6b8a8c
Commit
ef6b8a8c
authored
Nov 04, 2018
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some test failures
parent
03beecac
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
3 deletions
+5
-3
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/factories/ci/job_artifacts.rb
ee/spec/factories/ci/job_artifacts.rb
+2
-0
ee/spec/serializers/merge_request_widget_entity_spec.rb
ee/spec/serializers/merge_request_widget_entity_spec.rb
+1
-1
No files found.
ee/app/views/projects/pipelines/_tabs_content.html.haml
View file @
ef6b8a8c
...
@@ -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_management_artifact_url
(
pipeline
),
#js-licenses-app
{
data:
{
license_
head_path:
license_
management_artifact_url
(
pipeline
),
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 @
ef6b8a8c
...
@@ -84,7 +84,7 @@ describe Projects::PipelinesController do
...
@@ -84,7 +84,7 @@ describe Projects::PipelinesController do
context
'with a license management artifact'
do
context
'with a license management 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
,
build
:
build
)
create
(
:ee_ci_job_artifact
,
:license_management
,
job
:
build
)
end
end
context
'with feature enabled'
do
context
'with feature enabled'
do
...
...
ee/spec/factories/ci/job_artifacts.rb
View file @
ef6b8a8c
...
@@ -40,4 +40,6 @@ FactoryBot.define do
...
@@ -40,4 +40,6 @@ FactoryBot.define do
artifact
.
file
=
fixture_file_upload
(
artifact
.
file
=
fixture_file_upload
(
Rails
.
root
.
join
(
'spec/fixtures/trace/sample_trace'
),
'text/plain'
)
Rails
.
root
.
join
(
'spec/fixtures/trace/sample_trace'
),
'text/plain'
)
end
end
end
end
end
end
ee/spec/serializers/merge_request_widget_entity_spec.rb
View file @
ef6b8a8c
...
@@ -77,7 +77,7 @@ describe MergeRequestWidgetEntity do
...
@@ -77,7 +77,7 @@ describe MergeRequestWidgetEntity do
describe
'#license_management'
do
describe
'#license_management'
do
before
do
before
do
build
=
create
(
:ci_build
,
pipeline:
pipeline
)
build
=
create
(
:ci_build
,
pipeline:
pipeline
)
create
(
:ee_ci_job_artifact
,
:license_management
,
build
:
build
)
create
(
:ee_ci_job_artifact
,
:license_management
,
job
:
build
)
end
end
it
'should not be included, if license management features are off'
do
it
'should not be included, if license management features are off'
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