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
290494d5
Commit
290494d5
authored
Jan 18, 2021
by
Ash McKenzie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply 5 suggestion(s) to 2 file(s)
parent
0682fe87
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
ee/app/controllers/ee/admin/dev_ops_report_controller.rb
ee/app/controllers/ee/admin/dev_ops_report_controller.rb
+1
-1
ee/spec/controllers/admin/dev_ops_report_controller_spec.rb
ee/spec/controllers/admin/dev_ops_report_controller_spec.rb
+4
-4
No files found.
ee/app/controllers/ee/admin/dev_ops_report_controller.rb
View file @
290494d5
...
@@ -7,7 +7,7 @@ module EE
...
@@ -7,7 +7,7 @@ module EE
feature_already_in_use
=
::
Analytics
::
DevopsAdoption
::
Segment
.
any?
feature_already_in_use
=
::
Analytics
::
DevopsAdoption
::
Segment
.
any?
::
License
.
feature_available?
(
:devops_adoption
)
&&
::
License
.
feature_available?
(
:devops_adoption
)
&&
(
feature_already_in_use
||
::
Feature
.
enabled?
(
:devops_adoption_feature
,
default_enabled:
false
)
)
::
Feature
.
enabled?
(
:devops_adoption_feature
,
default_enabled:
feature_already_in_use
)
end
end
end
end
end
end
...
...
ee/spec/controllers/admin/dev_ops_report_controller_spec.rb
View file @
290494d5
...
@@ -4,11 +4,11 @@ require 'spec_helper'
...
@@ -4,11 +4,11 @@ require 'spec_helper'
RSpec
.
describe
Admin
::
DevOpsReportController
do
RSpec
.
describe
Admin
::
DevOpsReportController
do
describe
'show_adoption?'
do
describe
'show_adoption?'
do
it
'is false unless the license feature is disabledhttps://gitlab.com/gitlab-org/gitlab/-/issues/298884'
do
it
"is false if license feature 'devops_adoption' is disabled"
do
expect
(
controller
.
show_adoption?
).
to
be
false
expect
(
controller
.
show_adoption?
).
to
be
false
end
end
context
'the license feature is enabled'
do
context
"'devops_adoption' license feature is enabled"
do
before
do
before
do
stub_licensed_features
(
devops_adoption:
true
)
stub_licensed_features
(
devops_adoption:
true
)
end
end
...
@@ -19,11 +19,11 @@ RSpec.describe Admin::DevOpsReportController do
...
@@ -19,11 +19,11 @@ RSpec.describe Admin::DevOpsReportController do
expect
(
controller
.
show_adoption?
).
to
be
true
expect
(
controller
.
show_adoption?
).
to
be
true
end
end
it
'is true if the feature is enabled'
do
it
"is true if the 'devops_adoption_feature' feature is enabled"
do
expect
(
controller
.
show_adoption?
).
to
be
true
expect
(
controller
.
show_adoption?
).
to
be
true
end
end
it
'is false if the feature is disabled'
do
it
"is false if the 'devops_adoption_feature' feature is disabled"
do
stub_feature_flags
(
devops_adoption_feature:
false
)
stub_feature_flags
(
devops_adoption_feature:
false
)
expect
(
controller
.
show_adoption?
).
to
be
false
expect
(
controller
.
show_adoption?
).
to
be
false
...
...
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