Merge branch 'fix-project-factory-pages-access-level-default-ee' into 'master'

EE countepart of Fix factory default for pages_access_level

See merge request gitlab-org/gitlab-ee!14731

ee/spec/lib/ee/audit/project_feature_changes_auditor_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe EE::Audit::ProjectFeatureChangesAuditor do
   describe '#execute' do
     let!(:user) { create(:user) }
-    let!(:project) { create(:project, visibility_level: 0) }
+    let!(:project) { create(:project, :pages_enabled, visibility_level: 0) }
     let(:features) { project.project_feature }
     let(:foo_instance) { described_class.new(user, features, project) }
 

spec/factories/projects.rb

@@ -25,7 +25,9 @@ FactoryBot.define do
       issues_access_level ProjectFeature::ENABLED
       merge_requests_access_level ProjectFeature::ENABLED
       repository_access_level ProjectFeature::ENABLED
-      pages_access_level ProjectFeature::ENABLED
+      pages_access_level do
+        visibility_level == Gitlab::VisibilityLevel::PUBLIC ? ProjectFeature::ENABLED : ProjectFeature::PRIVATE
+      end
 
       # we can't assign the delegated `#ci_cd_settings` attributes directly, as the
       # `#ci_cd_settings` relation needs to be created first

spec/services/projects/update_service_spec.rb

@@ -347,13 +347,13 @@ describe Projects::UpdateService do
 
     context 'when updating #pages_access_level' do
       subject(:call_service) do
-        update_project(project, admin, project_feature_attributes: { pages_access_level: ProjectFeature::PRIVATE })
+        update_project(project, admin, project_feature_attributes: { pages_access_level: ProjectFeature::ENABLED })
       end
 
       it 'updates the attribute' do
         expect { call_service }
           .to change { project.project_feature.pages_access_level }
-          .to(ProjectFeature::PRIVATE)
+          .to(ProjectFeature::ENABLED)
       end
 
       it 'calls Projects::UpdatePagesConfigurationService' do