Merge branch '273406-put-devops-adoption-tab-behind-ee-ultimate-license-check-2' into 'master'

Put devops adoption tab behind EE Ultimate license check [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!46954

app/views/admin/dev_ops_report/show.html.haml

@@ -3,7 +3,7 @@
 
 .container
   .gl-mt-3
-    - if Feature.enabled?(:devops_adoption)
+    - if Gitlab.ee? && Feature.enabled?(:devops_adoption_feature) && License.feature_available?(:devops_adoption)
       = render_if_exists 'admin/dev_ops_report/devops_tabs'
     - else
       = render 'report'

config/feature_flags/development/devops_adoption.yml → config/feature_flags/development/devops_adoption_feature.yml

 ---
-name: devops_adoption
+name: devops_adoption_feature
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46005
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/271568
 type: development

ee/app/models/license.rb

@@ -132,6 +132,7 @@ class License < ApplicationRecord
     credentials_inventory
     dast
     dependency_scanning
+    devops_adoption
     enterprise_templates
     api_fuzzing
     group_level_compliance_dashboard

ee/spec/features/admin/admin_dev_ops_report_spec.rb

@@ -11,9 +11,9 @@ RSpec.describe 'DevOps Report page', :js do
     sign_in(create(:admin))
   end
 
-  context 'with devops_adoption feature flag disabled' do
+  context 'with devops_adoption_feature feature flag disabled' do
     before do
-      stub_feature_flags(devops_adoption: false)
+      stub_feature_flags(devops_adoption_feature: false)
     end
 
     it 'does not show the tabbed layout' do
@@ -23,7 +23,11 @@ RSpec.describe 'DevOps Report page', :js do
     end
   end
 
-  context 'with devops_adoption feature flag enabled' do
+  context 'with ultimate license and devops_adoption_feature feature flag enabled' do
+    before do
+      stub_licensed_features(devops_adoption: true)
+    end
+
     it 'shows the tabbed layout' do
       visit admin_dev_ops_report_path
 
@@ -110,4 +114,16 @@ RSpec.describe 'DevOps Report page', :js do
       end
     end
   end
+
+  context 'without ultimate license and devops_adoption_feature feature flag enabled' do
+    before do
+      stub_licensed_features(devops_adoption: false)
+    end
+
+    it 'does not show the tabbed layout' do
+      visit admin_dev_ops_report_path
+
+      expect(page).not_to have_selector tabs_selector
+    end
+  end
 end