Merge branch 'move-group-wikis-to-premium' into 'master'

Move group wikis from Starter to Premium [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!43170

ee/app/models/license.rb

@@ -18,7 +18,6 @@ class License < ApplicationRecord
     group_activity_analytics
     group_bulk_edit
     group_webhooks
-    group_wikis
     issuable_default_templates
     issue_weights
     iterations
@@ -85,6 +84,7 @@ class License < ApplicationRecord
     group_project_templates
     group_repository_analytics
     group_saml
+    group_wikis
     ide_schema_config
     issues_analytics
     jira_issues_integration

ee/spec/controllers/groups/wikis_controller_spec.rb

@@ -5,6 +5,10 @@ require 'spec_helper'
 RSpec.describe Groups::WikisController do
   include WikiHelpers
 
+  before do
+    stub_group_wikis(true)
+  end
+
   it_behaves_like 'wiki controller actions' do
     let(:container) { create(:group, :public) }
     let(:routing_params) { { group_id: container } }

ee/spec/lib/gitlab/git_access_wiki_spec.rb

@@ -13,6 +13,10 @@ RSpec.describe Gitlab::GitAccessWiki do
 
   let(:access) { described_class.new(user, project, 'web', authentication_abilities: authentication_abilities, redirected_path: redirected_path) }
 
+  before do
+    stub_group_wikis(true)
+  end
+
   describe 'group wiki access' do
     let_it_be(:group, reload: true) { create(:group, :private, :wiki_repo) }
 

ee/spec/models/license_spec.rb

@@ -314,7 +314,7 @@ RSpec.describe License do
 
       it 'returns features for premium plan' do
         expect(described_class.features_for_plan('premium'))
-          .to include(:multiple_issue_assignees, :deploy_board, :file_locks)
+          .to include(:multiple_issue_assignees, :deploy_board, :file_locks, :group_wikis)
       end
 
       it 'returns empty array if no features for given plan' do

ee/spec/policies/group_policy_spec.rb

@@ -1065,11 +1065,17 @@ RSpec.describe GroupPolicy do
   end
 
   it_behaves_like 'model with wiki policies' do
-    include WikiHelpers
-
-    let_it_be(:container) { create(:group_with_plan, plan: :bronze_plan) }
+    let_it_be(:container) { create(:group_with_plan, plan: :silver_plan) }
     let_it_be(:user) { owner }
 
+    before_all do
+      create(:license, plan: License::PREMIUM_PLAN)
+    end
+
+    before do
+      stub_application_setting(check_namespace_plan: true)
+    end
+
     # 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)
@@ -1094,9 +1100,7 @@ RSpec.describe GroupPolicy do
     end
 
     context 'when the feature is not licensed on this group' do
-      before do
-        allow(container).to receive(:feature_available?).with(:group_wikis).and_return(false)
-      end
+      let_it_be(:container) { create(:group_with_plan, plan: :bronze_plan) }
 
       it 'does not include the wiki permissions' do
         expect_disallowed(*wiki_permissions[:all])

ee/spec/requests/api/wikis_spec.rb

@@ -23,6 +23,10 @@ RSpec.describe API::Wikis do
   let(:expected_keys_with_content) { %w(content format slug title) }
   let(:expected_keys_without_content) { %w(format slug title) }
 
+  before do
+    stub_group_wikis(true)
+  end
+
   shared_examples_for 'wiki API 404 Group Not Found' do
     include_examples 'wiki API 404 Not Found', 'Group'
   end

ee/spec/services/wikis/create_attachment_service_spec.rb

@@ -2,5 +2,11 @@
 require 'spec_helper'
 
 RSpec.describe Wikis::CreateAttachmentService do
+  include WikiHelpers
+
+  before do
+    stub_group_wikis(true)
+  end
+
   it_behaves_like 'Wikis::CreateAttachmentService#execute', :group
 end