Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc20210223090520

1 files changed, 55 insertions, 6 deletions

diff --git a/spec/factories_spec.rb b/spec/factories_spec.rb
index 38ade20de28..c381fb82ba0 100644
--- a/spec/factories_spec.rb
+++ b/spec/factories_spec.rb
@@ -5,6 +5,41 @@ require 'spec_helper'
 RSpec.describe 'factories' do
   include Database::DatabaseHelpers
 
+  def skipped_traits
+    [
+      [:alert_management_alert, :with_ended_at],
+      [:audit_event, :unauthenticated],
+      [:ci_build_trace_chunk, :fog_with_data],
+      [:ci_job_artifact, :remote_store],
+      [:ci_job_artifact, :raw],
+      [:ci_job_artifact, :gzip],
+      [:ci_job_artifact, :correct_checksum],
+      [:design_version, :empty],
+      [:environment, :non_playable],
+      [:go_module_commit, :files],
+      [:go_module_commit, :package],
+      [:go_module_version, :pseudo],
+      [:composer_cache_file, :object_storage],
+      [:debian_project_component_file, :object_storage],
+      [:debian_project_distribution, :object_storage],
+      [:debian_file_metadatum, :unknown],
+      [:package_file, :object_storage],
+      [:pages_domain, :without_certificate],
+      [:pages_domain, :without_key],
+      [:pages_domain, :with_missing_chain],
+      [:pages_domain, :with_trusted_chain],
+      [:pages_domain, :with_trusted_expired_chain],
+      [:pages_domain, :explicit_ecdsa],
+      [:project_member, :blocked],
+      [:project, :remote_mirror],
+      [:prometheus_alert_event, :none],
+      [:remote_mirror, :ssh],
+      [:self_managed_prometheus_alert_event, :resolved],
+      [:self_managed_prometheus_alert_event, :none],
+      [:user_preference, :only_comments]
+    ]
+  end
+
   shared_examples 'factory' do |factory|
     describe "#{factory.name} factory" do
       it 'does not raise error when built' do
@@ -16,8 +51,10 @@ RSpec.describe 'factories' do
       end
 
       factory.definition.defined_traits.map(&:name).each do |trait_name|
-        describe "linting #{trait_name} trait" do
-          skip 'does not raise error when created' do
+        describe "linting :#{trait_name} trait" do
+          it 'does not raise error when created' do
+            pending("Trait skipped linting due to legacy error") if skipped_traits.include?([factory.name, trait_name.to_sym])
+
             expect { create(factory.name, trait_name) }.not_to raise_error
           end
         end
@@ -29,9 +66,21 @@ RSpec.describe 'factories' do
   # and reuse them in other factories.
   #
   # However, for some factories we cannot use FactoryDefault because the
-  # associations must be unique and cannot be reused.
+  # associations must be unique and cannot be reused, or the factory default
+  # is being mutated.
   skip_factory_defaults = %i[
     fork_network_member
+    group_member
+    import_state
+    namespace
+    project_broken_repo
+    prometheus_alert
+    prometheus_alert_event
+    prometheus_metric
+    self_managed_prometheus_alert_event
+    users_star_project
+    wiki_page
+    wiki_page_meta
   ].to_set.freeze
 
   # Some factories and their corresponding models are based on
@@ -46,9 +95,9 @@ RSpec.describe 'factories' do
     .partition { |factory| skip_factory_defaults.include?(factory.name) }
 
   context 'with factory defaults', factory_default: :keep do
-    let_it_be(:namespace) { create_default(:namespace) }
-    let_it_be(:project) { create_default(:project, :repository) }
-    let_it_be(:user) { create_default(:user) }
+    let_it_be(:namespace) { create_default(:namespace).freeze }
+    let_it_be(:project) { create_default(:project, :repository).freeze }
+    let_it_be(:user) { create_default(:user).freeze }
 
     before do
       factories_based_on_view.each do |factory|