diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 16:54:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 16:54:15 +0300 |
commit | be834a25982746ffd85252ff502df42bb88cb9d5 (patch) | |
tree | b4d6a8ba0931e12fac08f05abea33a3b8ec2c8a2 /spec/factories/merge_request_diffs.rb | |
parent | ee925a3597f27e92f83a50937a64068109675b3d (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc32
Diffstat (limited to 'spec/factories/merge_request_diffs.rb')
-rw-r--r-- | spec/factories/merge_request_diffs.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/spec/factories/merge_request_diffs.rb b/spec/factories/merge_request_diffs.rb index fdb7f52f3bd..481cabdae6d 100644 --- a/spec/factories/merge_request_diffs.rb +++ b/spec/factories/merge_request_diffs.rb @@ -2,13 +2,7 @@ FactoryBot.define do factory :merge_request_diff do - merge_request do - build(:merge_request) do |merge_request| - # MergeRequest should not create a MergeRequestDiff in the callback - allow(merge_request).to receive(:ensure_merge_request_diff) - end - end - + association :merge_request, factory: :merge_request_without_merge_request_diff state { :collected } commits_count { 1 } |