From 4f4dcd3c5d7a15b7eab5fa28e27482fa68c750a3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 2 Oct 2019 15:06:12 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/spec_helper.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'spec/spec_helper.rb') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ebfdc1bab44..d6c326764d1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -350,6 +350,10 @@ 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 + ActiveRecord::Migration.maintain_test_schema! Shoulda::Matchers.configure do |config| -- cgit v1.2.3