Merge branch 'traits-for-featurs' into 'master'

Add traits for ProjectFeatures to Project factory

Closes #24007

See merge request !8925

3 files changed, 6 insertions, 13 deletions

diff --git a/spec/features/groups/merge_requests_spec.rb b/spec/features/groups/merge_requests_spec.rb
index 78a11ffee99..b55078c3bf6 100644
--- a/spec/features/groups/merge_requests_spec.rb
+++ b/spec/features/groups/merge_requests_spec.rb
@@ -7,7 +7,7 @@ feature 'Group merge requests page', feature: true do
   include_examples 'project features apply to issuables', MergeRequest
 
   context 'archived issuable' do
-    let(:project_archived) { create(:project, :archived, group: group, merge_requests_access_level: ProjectFeature::ENABLED) }
+    let(:project_archived) { create(:project, :archived, :merge_requests_enabled, group: group) }
     let(:issuable_archived) { create(:merge_request, source_project: project_archived, target_project: project_archived, title: 'issuable of an archived project') }
     let(:access_level) { ProjectFeature::ENABLED }
     let(:user) { user_in_group }
diff --git a/spec/features/projects/settings/merge_requests_settings_spec.rb b/spec/features/projects/settings/merge_requests_settings_spec.rb
index 034b75c2e51..6815039d5ed 100644
--- a/spec/features/projects/settings/merge_requests_settings_spec.rb
+++ b/spec/features/projects/settings/merge_requests_settings_spec.rb
@@ -12,13 +12,8 @@ feature 'Project settings > Merge Requests', feature: true, js: true do
   end
 
   context 'when Merge Request and Pipelines are initially enabled' do
-    before do
-      project.project_feature.update_attribute('merge_requests_access_level', ProjectFeature::ENABLED)
-    end
-
     context 'when Pipelines are initially enabled' do
       before do
-        project.project_feature.update_attribute('builds_access_level', ProjectFeature::ENABLED)
         visit edit_project_path(project)
       end
 
diff --git a/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb b/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb
index b4f5f6b3fc5..20219f3cc9a 100644
--- a/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb
+++ b/spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb
@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe 'Projects > Wiki > User views wiki in project page', feature: true do
   let(:user) { create(:user) }
-  let(:project) { create(:empty_project) }
 
   before do
     project.team << [user, :master]
@@ -10,12 +9,11 @@ describe 'Projects > Wiki > User views wiki in project page', feature: true do
   end
 
   context 'when repository is disabled for project' do
-    before do
-      project.project_feature.update!(
-        repository_access_level: ProjectFeature::DISABLED,
-        merge_requests_access_level: ProjectFeature::DISABLED,
-        builds_access_level: ProjectFeature::DISABLED
-      )
+    let(:project) do
+      create(:empty_project,
+             :repository_disabled,
+             :merge_requests_disabled,
+             :builds_disabled)
     end
 
     context 'when wiki homepage contains a link' do