Commit 290494d5 authored by Ash McKenzie's avatar Ash McKenzie

Apply 5 suggestion(s) to 2 file(s)

parent 0682fe87
...@@ -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
......
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment