diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /spec/factories/merge_requests.rb | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'spec/factories/merge_requests.rb')
-rw-r--r-- | spec/factories/merge_requests.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index e897a5e022a..4941a31982f 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -25,10 +25,6 @@ FactoryBot.define do title { generate(:draft_title) } end - trait :wip_merge_request do - title { generate(:wip_title) } - end - trait :jira_title do title { generate(:jira_title) } end @@ -324,7 +320,7 @@ FactoryBot.define do # Fake `fetch_ref!` if we don't have repository # We have too many existing tests relying on this behaviour unless [target_project, source_project].all?(&:repository_exists?) - allow(merge_request).to receive(:fetch_ref!) + stub_method(merge_request, :fetch_ref!) { nil } end end |