diff --git a/ee/spec/replicators/geo/snippet_repository_replicator_spec.rb b/ee/spec/replicators/geo/snippet_repository_replicator_spec.rb index a3b75d2763c514e4a09232b6e6569656836ff6ee..abf052f9a2f005452972677340ca640dcaf4ccbb 100644 --- a/ee/spec/replicators/geo/snippet_repository_replicator_spec.rb +++ b/ee/spec/replicators/geo/snippet_repository_replicator_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe Geo::SnippetRepositoryReplicator do - let(:model_record) { build(:snippet_repository) } + let(:model_record) { build(:snippet_repository, snippet: create(:snippet)) } include_examples 'a repository replicator' end diff --git a/ee/spec/services/ee/git/wiki_push_service_spec.rb b/ee/spec/services/ee/git/wiki_push_service_spec.rb index 33016a950c80f6d954239d980582f77dd45d26c4..eef80b910a9b0330a986722831ea65489a9da226 100644 --- a/ee/spec/services/ee/git/wiki_push_service_spec.rb +++ b/ee/spec/services/ee/git/wiki_push_service_spec.rb @@ -48,7 +48,8 @@ end context 'with a group wiki' do - let_it_be(:wiki) { build(:group_wiki) } + let_it_be(:group) { create(:group) } + let_it_be(:wiki) { build(:group_wiki, group: group) } it 'does not trigger a wiki update' do expect(wiki).not_to receive(:index_wiki_blobs) diff --git a/ee/spec/workers/post_receive_spec.rb b/ee/spec/workers/post_receive_spec.rb index 8912aceda1ebd119e408cf0fed718e75b3a90b90..3acc1fa8252425fe477f6c7c5202499c130e0f17 100644 --- a/ee/spec/workers/post_receive_spec.rb +++ b/ee/spec/workers/post_receive_spec.rb @@ -137,7 +137,8 @@ end context 'with a group wiki' do - let(:wiki) { build(:group_wiki) } + let_it_be(:group) { create(:group) } + let(:wiki) { build(:group_wiki, group: group) } it 'calls Git::WikiPushService#execute' do expect_next_instance_of(::Git::WikiPushService) do |service| diff --git a/spec/finders/ci/pipelines_for_merge_request_finder_spec.rb b/spec/finders/ci/pipelines_for_merge_request_finder_spec.rb index 196fde5efe058a14159a2f873f77776837d68e07..65f6dc0ba740233a0be74c9a7be102ea6c1f9200 100644 --- a/spec/finders/ci/pipelines_for_merge_request_finder_spec.rb +++ b/spec/finders/ci/pipelines_for_merge_request_finder_spec.rb @@ -122,7 +122,7 @@ end context 'with unsaved merge request' do - let(:merge_request) { build(:merge_request) } + let(:merge_request) { build(:merge_request, source_project: create(:project, :repository)) } let!(:pipeline) do create(:ci_empty_pipeline, project: project, diff --git a/spec/serializers/ci/trigger_serializer_spec.rb b/spec/serializers/ci/trigger_serializer_spec.rb index 09a877abfa042fc383a17a3ffc1ab0589f6c78de..a669a8c3ed02206207bc579b95dbbfd3540e1c4a 100644 --- a/spec/serializers/ci/trigger_serializer_spec.rb +++ b/spec/serializers/ci/trigger_serializer_spec.rb @@ -6,7 +6,7 @@ describe '#represent' do let(:represent) { described_class.new.represent(trigger) } - let(:trigger) { build(:ci_trigger) } + let(:trigger) { build_stubbed(:ci_trigger) } it 'matches schema' do expect(represent.to_json).to match_schema('entities/trigger') diff --git a/spec/support/factory_bot.rb b/spec/support/factory_bot.rb index a86161bfded47121734064827de4534d57ff1c22..c9d372993b57eae0f66923cc3203445b28de61e6 100644 --- a/spec/support/factory_bot.rb +++ b/spec/support/factory_bot.rb @@ -3,7 +3,3 @@ FactoryBot::SyntaxRunner.class_eval do include RSpec::Mocks::ExampleMethods end - -# Use FactoryBot 4.x behavior: -# https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#associations -FactoryBot.use_parent_strategy = false