Commit 0b30d88d authored by Sean McGivern's avatar Sean McGivern

Merge branch 'pl-rubocop-inline-association-merge-request' into 'master'

Fix cop FactoryBot/InlineAssociation for merge requests

See merge request gitlab-org/gitlab!48154
parents 945cc9c5 0b217d65
......@@ -14,7 +14,6 @@ FactoryBot/InlineAssociation:
- 'spec/factories/go_modules.rb'
- 'spec/factories/group_group_links.rb'
- 'spec/factories/import_export_uploads.rb'
- 'spec/factories/merge_requests.rb'
- 'spec/factories/notes.rb'
- 'spec/factories/uploads.rb'
- 'spec/factories/wiki_pages.rb'
......
......@@ -237,7 +237,7 @@ FactoryBot.define do
target_branch { 'pages-deploy-target' }
transient do
deployment { create(:deployment, :review_app) }
deployment { association(:deployment, :review_app) }
end
after(:build) do |merge_request, evaluator|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment