summaryrefslogtreecommitdiff
path: root/spec/models/merge_request_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-11 03:11:00 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-11 03:11:00 +0000
commitbdca0979165cb662173d959c358fce0c539c7544 (patch)
tree5a2a58ea3738592da1d84a2ed53410deea752a51 /spec/models/merge_request_spec.rb
parent1a3d7fe0b65d92e322bfe33aebe6b64419203f4f (diff)
downloadgitlab-ce-bdca0979165cb662173d959c358fce0c539c7544.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r--spec/models/merge_request_spec.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index f123a819224..6edef54b153 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -63,6 +63,7 @@ RSpec.describe MergeRequest do
subject.source_project.repository.path
end
end
+
let(:squash_path) { File.join(repo_path, "gitlab-worktree", "squash-#{subject.id}") }
before do
@@ -742,6 +743,7 @@ RSpec.describe MergeRequest do
let!(:diff_note) do
create(:diff_note_on_merge_request, project: project, noteable: merge_request)
end
+
let!(:draft_note) do
create(:draft_note_on_text_diff, author: user, merge_request: merge_request)
end
@@ -3713,6 +3715,7 @@ RSpec.describe MergeRequest do
source_branch: 'fixes',
target_project: target_project)
end
+
let(:user) { create(:user) }
before do