summaryrefslogtreecommitdiff
path: root/spec/features/gitlab_flavored_markdown_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/features/gitlab_flavored_markdown_spec.rb')
-rw-r--r--spec/features/gitlab_flavored_markdown_spec.rb12
1 files changed, 5 insertions, 7 deletions
diff --git a/spec/features/gitlab_flavored_markdown_spec.rb b/spec/features/gitlab_flavored_markdown_spec.rb
index e67df7c1fb0..349d68399fc 100644
--- a/spec/features/gitlab_flavored_markdown_spec.rb
+++ b/spec/features/gitlab_flavored_markdown_spec.rb
@@ -3,11 +3,11 @@ require 'spec_helper'
describe "GitLab Flavored Markdown" do
let(:project) { create(:project_with_code) }
let(:issue) { create(:issue, project: project) }
- let(:merge_request) { create(:merge_request, project: project) }
+ let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
let(:fred) do
- u = create(:user, name: "fred")
- project.team << [u, :master]
- u
+ u = create(:user, name: "fred")
+ project.team << [u, :master]
+ u
end
before do
@@ -83,9 +83,7 @@ describe "GitLab Flavored Markdown" do
describe "for merge requests" do
before do
- @merge_request = create(:merge_request,
- project: project,
- title: "fix ##{issue.id}")
+ @merge_request = create(:merge_request, source_project: project, target_project: project, title: "fix ##{issue.id}")
end
it "should render title in merge_requests#index" do