Merge branch 'group-wikis-license-check' into 'master'

Add license check for group wikis

See merge request gitlab-org/gitlab!41900

ee/app/models/ee/group.rb

@@ -378,16 +378,6 @@ module EE
       end
     end
 
-    def wiki_access_level
-      # TODO: Remove this method once we implement group-level features.
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/208412
-      if ::Feature.enabled?(:group_wiki, self)
-        ::ProjectFeature::ENABLED
-      else
-        ::ProjectFeature::DISABLED
-      end
-    end
-
     def owners_emails
       owners.pluck(:email)
     end

ee/app/models/license.rb

@@ -19,6 +19,7 @@ class License < ApplicationRecord
     group_activity_analytics
     group_bulk_edit
     group_webhooks
+    group_wikis
     issuable_default_templates
     issue_weights
     iterations

ee/app/policies/ee/group_policy.rb

@@ -10,19 +10,19 @@ module EE
 
       with_scope :subject
       condition(:ldap_synced) { @subject.ldap_synced? }
-      condition(:epics_available) { @subject.feature_available?(:epics) }
-      condition(:iterations_available) { @subject.feature_available?(:iterations) }
-      condition(:subepics_available) { @subject.feature_available?(:subepics) }
+      condition(:epics_available) { feature_available?(:epics) }
+      condition(:iterations_available) { feature_available?(:iterations) }
+      condition(:subepics_available) { feature_available?(:subepics) }
       condition(:contribution_analytics_available) do
-        @subject.feature_available?(:contribution_analytics)
+        feature_available?(:contribution_analytics)
       end
 
       condition(:cycle_analytics_available) do
-        @subject.feature_available?(:cycle_analytics_for_groups)
+        feature_available?(:cycle_analytics_for_groups)
       end
 
       condition(:group_merge_request_analytics_available) do
-        @subject.feature_available?(:group_merge_request_analytics)
+        feature_available?(:group_merge_request_analytics)
       end
 
       condition(:group_repository_analytics_available) do
@@ -30,7 +30,7 @@ module EE
       end
 
       condition(:group_activity_analytics_available) do
-        @subject.feature_available?(:group_activity_analytics) && ::Feature.enabled?(:group_activity_analytics, @subject, default_enabled: true)
+        feature_available?(:group_activity_analytics) && ::Feature.enabled?(:group_activity_analytics, @subject, default_enabled: true)
       end
 
       condition(:can_owners_manage_ldap, scope: :global) do
@@ -46,11 +46,11 @@ module EE
       end
 
       condition(:security_dashboard_enabled) do
-        @subject.feature_available?(:security_dashboard)
+        feature_available?(:security_dashboard)
       end
 
       condition(:prevent_group_forking_available) do
-        @subject.feature_available?(:group_forking_protection)
+        feature_available?(:group_forking_protection)
       end
 
       condition(:needs_new_sso_session) do
@@ -62,11 +62,11 @@ module EE
       end
 
       condition(:dependency_proxy_available) do
-        @subject.feature_available?(:dependency_proxy)
+        feature_available?(:dependency_proxy)
       end
 
       condition(:cluster_deployments_available) do
-        @subject.feature_available?(:cluster_deployments)
+        feature_available?(:cluster_deployments)
       end
 
       condition(:group_saml_enabled) do
@@ -74,7 +74,7 @@ module EE
       end
 
       condition(:group_timelogs_available) do
-        @subject.feature_available?(:group_timelogs)
+        feature_available?(:group_timelogs)
       end
 
       with_scope :global
@@ -88,15 +88,15 @@ module EE
       end
 
       condition(:commit_committer_check_available) do
-        @subject.feature_available?(:commit_committer_check)
+        feature_available?(:commit_committer_check)
       end
 
       condition(:reject_unsigned_commits_available) do
-        @subject.feature_available?(:reject_unsigned_commits)
+        feature_available?(:reject_unsigned_commits)
       end
 
       condition(:push_rules_available) do
-        @subject.feature_available?(:push_rules)
+        feature_available?(:push_rules)
       end
 
       condition(:over_storage_limit, scope: :subject) { @subject.over_storage_limit? }
@@ -246,7 +246,7 @@ module EE
       end
 
       desc "Group has wiki disabled"
-      condition(:wiki_disabled, score: 32) { !feature_available?(:wiki) }
+      condition(:wiki_disabled, score: 32) { !feature_available?(:group_wikis) }
 
       rule { wiki_disabled }.policy do
         prevent(*create_read_update_admin_destroy(:wiki))
@@ -304,18 +304,16 @@ module EE
       super
     end
 
-    # TODO: Extract this into a helper shared with ProjectPolicy, once we implement group-level features.
+    # TODO: Once we implement group-level feature toggles, see if we can refactor
+    # the shared logic in ProjectPolicy and GroupPolicy.
     # https://gitlab.com/gitlab-org/gitlab/-/issues/208412
     def feature_available?(feature)
-      return false unless feature == :wiki
-
-      case subject.wiki_access_level
-      when ::ProjectFeature::DISABLED
-        false
-      when ::ProjectFeature::PRIVATE
-        admin? || access_level >= ::ProjectFeature.required_minimum_access_level(feature)
+      if feature == :group_wikis
+        # TODO: Remove this special case when we remove the feature flag
+        # https://gitlab.com/gitlab-org/gitlab/-/issues/207888
+        ::Feature.enabled?(:group_wikis_feature_flag, subject) && subject.feature_available?(feature)
       else
-        true
+        subject.feature_available?(feature)
       end
     end
 

ee/config/feature_flags/development/group_wiki.yml → ee/config/feature_flags/development/group_wikis_feature_flag.yml

 ---
-name: group_wiki
+name: group_wikis_feature_flag
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29176
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/207888
 group: group::knowledge
 type: development
-default_enabled: false
+default_enabled: false
\ No newline at end of file

ee/spec/controllers/groups/wikis_controller_spec.rb

@@ -3,18 +3,19 @@
 require 'spec_helper'
 
 RSpec.describe Groups::WikisController do
+  include WikiHelpers
+
   it_behaves_like 'wiki controller actions' do
     let(:container) { create(:group, :public) }
     let(:routing_params) { { group_id: container } }
 
     before do
       container.add_owner(user)
-      stub_feature_flags(group_wiki: container)
     end
 
-    context 'when the feature flag is disabled' do
+    context 'when the feature is not available' do
       before do
-        stub_feature_flags(group_wiki: false)
+        stub_group_wikis(false)
       end
 
       using RSpec::Parameterized::TableSyntax

ee/spec/features/groups/navbar_spec.rb

@@ -5,6 +5,7 @@ require 'spec_helper'
 RSpec.describe 'Group navbar' do
   include NavbarStructureHelper
   include WaitForRequests
+  include WikiHelpers
 
   include_context 'group navbar structure'
 
@@ -14,7 +15,7 @@ RSpec.describe 'Group navbar' do
   before do
     group.add_maintainer(user)
     stub_feature_flags(group_iterations: false)
-    stub_feature_flags(group_wiki: false)
+    stub_group_wikis(false)
     sign_in(user)
 
     insert_package_nav(_('Kubernetes'))
@@ -216,7 +217,7 @@ RSpec.describe 'Group navbar' do
 
   context 'when group wiki is available' do
     before do
-      stub_feature_flags(group_wiki: true)
+      stub_group_wikis(true)
 
       insert_after_nav_item(
         _('Analytics'),

ee/spec/lib/gitlab/git_access_wiki_spec.rb

@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::GitAccessWiki do
+  include WikiHelpers
+
   let(:user) { create(:user) }
   let(:project) { create(:project, :wiki_repo) }
   let(:changes) { ['6f6d7e7ed 570e7b2ab refs/heads/master'] }
@@ -76,7 +78,7 @@ RSpec.describe Gitlab::GitAccessWiki do
 
         context 'when wiki feature is disabled' do
           before do
-            stub_feature_flags(group_wiki: false)
+            stub_group_wikis(false)
           end
 
           it_behaves_like 'forbidden git access' do
@@ -100,7 +102,7 @@ RSpec.describe Gitlab::GitAccessWiki do
 
         context 'when wiki feature is disabled' do
           before do
-            stub_feature_flags(group_wiki: false)
+            stub_group_wikis(false)
           end
 
           it_behaves_like 'forbidden git access' do

ee/spec/policies/group_policy_spec.rb

@@ -1065,20 +1065,37 @@ RSpec.describe GroupPolicy do
   end
 
   it_behaves_like 'model with wiki policies' do
-    let_it_be(:container) { create(:group) }
+    include WikiHelpers
+
+    let_it_be(:container) { create(:group_with_plan, plan: :bronze_plan) }
     let_it_be(:user) { owner }
 
+    # We don't have feature toggles on groups yet, so we currently simulate
+    # this by toggling the feature flag instead.
     def set_access_level(access_level)
-      allow(container).to receive(:wiki_access_level).and_return(access_level)
+      case access_level
+      when ProjectFeature::ENABLED
+        stub_feature_flags(group_wikis_feature_flag: true)
+      when ProjectFeature::DISABLED
+        stub_feature_flags(group_wikis_feature_flag: false)
+      when ProjectFeature::PRIVATE
+        skip('Access level private is not supported yet for group wikis, see https://gitlab.com/gitlab-org/gitlab/-/issues/208412')
+      end
     end
 
-    before do
-      stub_feature_flags(group_wiki: true)
+    context 'when the feature flag is disabled on this group' do
+      before do
+        stub_feature_flags(group_wikis_feature_flag: create(:group))
+      end
+
+      it 'does not include the wiki permissions' do
+        expect_disallowed(*wiki_permissions[:all])
+      end
     end
 
-    context 'when the feature flag is disabled' do
+    context 'when the feature is not licensed on this group' do
       before do
-        stub_feature_flags(group_wiki: false)
+        allow(container).to receive(:feature_available?).with(:group_wikis).and_return(false)
       end
 
       it 'does not include the wiki permissions' do

ee/spec/requests/api/wikis_spec.rb

@@ -13,6 +13,7 @@ require 'spec_helper'
 # because they are 3 edge cases of using wiki pages.
 
 RSpec.describe API::Wikis do
+  include WikiHelpers
   include WorkhorseHelpers
 
   let_it_be(:user) { create(:user) }
@@ -31,7 +32,7 @@ RSpec.describe API::Wikis do
 
     context 'when group wiki is disabled' do
       before do
-        stub_feature_flags(group_wiki: false)
+        stub_group_wikis(false)
       end
 
       context 'when user is guest' do
@@ -125,7 +126,7 @@ RSpec.describe API::Wikis do
 
     context 'when wiki is disabled' do
       before do
-        stub_feature_flags(group_wiki: false)
+        stub_group_wikis(false)
       end
 
       context 'when user is guest' do
@@ -250,7 +251,7 @@ RSpec.describe API::Wikis do
 
     context 'when wiki is disabled' do
       before do
-        stub_feature_flags(group_wiki: false)
+        stub_group_wikis(false)
       end
 
       context 'when user is guest' do
@@ -342,7 +343,7 @@ RSpec.describe API::Wikis do
 
     context 'when wiki is disabled' do
       before do
-        stub_feature_flags(group_wiki: false)
+        stub_group_wikis(false)
       end
 
       context 'when user is guest' do
@@ -482,7 +483,7 @@ RSpec.describe API::Wikis do
 
     context 'when wiki is disabled' do
       before do
-        stub_feature_flags(group_wiki: false)
+        stub_group_wikis(false)
       end
 
       context 'when user is guest' do
@@ -613,7 +614,7 @@ RSpec.describe API::Wikis do
 
     context 'when wiki is disabled' do
       before do
-        stub_feature_flags(group_wiki: false)
+        stub_group_wikis(false)
       end
 
       context 'when user is guest' do

ee/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb

@@ -210,9 +210,6 @@ RSpec.describe 'layouts/nav/sidebar/_group' do
 
       allow(view).to receive(:current_user).and_return(current_user)
       allow(view).to receive(:can?).with(current_user, :read_wiki, group).and_return(can_read_wiki)
-
-      # TODO can be removed with https://gitlab.com/gitlab-org/gitlab/-/issues/207888
-      stub_feature_flags(group_wiki: true)
     end
 
     describe 'when wiki is available to user' do

spec/features/groups/navbar_spec.rb

@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe 'Group navbar' do
   include NavbarStructureHelper
+  include WikiHelpers
 
   include_context 'group navbar structure'
 
@@ -49,7 +50,7 @@ RSpec.describe 'Group navbar' do
     insert_package_nav(_('Kubernetes'))
 
     stub_feature_flags(group_iterations: false)
-    stub_feature_flags(group_wiki: false)
+    stub_group_wikis(false)
     group.add_maintainer(user)
     sign_in(user)
   end

spec/support/helpers/wiki_helpers.rb

@@ -3,6 +3,11 @@
 module WikiHelpers
   extend self
 
+  def stub_group_wikis(enabled)
+    stub_feature_flags(group_wikis_feature_flag: enabled)
+    stub_licensed_features(group_wikis: enabled)
+  end
+
   def wait_for_svg_to_be_loaded(example = nil)
     # Ensure the SVG is loaded first before clicking the button
     find('.svg-content .js-lazy-loaded') if example.nil? || example.metadata.key?(:js)