1 files changed, 22 insertions, 16 deletions
diff --git a/spec/features/gitlab_flavored_markdown_spec.rb b/spec/features/gitlab_flavored_markdown_spec.rb
index 84d73d693bc..005a029a393 100644
--- a/spec/features/gitlab_flavored_markdown_spec.rb
+++ b/spec/features/gitlab_flavored_markdown_spec.rb
@@ -1,28 +1,28 @@
 require 'spec_helper'
 
 describe "GitLab Flavored Markdown", feature: true do
-  let(:project) { create(:project) }
+  let(:project) { create(:empty_project) }
   let(:issue) { create(:issue, 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
+    create(:user, name: 'fred') do |user|
+      project.add_master(user)
+    end
   end
 
   before do
-    allow_any_instance_of(Commit).to receive(:title).
-      and_return("fix #{issue.to_reference}\n\nask #{fred.to_reference} for details")
+    login_as(:user)
+    project.add_developer(@user)
   end
 
-  let(:commit) { project.commit }
+  describe "for commits" do
+    let(:project) { create(:project, :repository) }
+    let(:commit) { project.commit }
 
-  before do
-    login_as :user
-    project.team << [@user, :developer]
-  end
+    before do
+      allow_any_instance_of(Commit).to receive(:title).
+        and_return("fix #{issue.to_reference}\n\nask #{fred.to_reference} for details")
+    end
 
-  describe "for commits" do
     it "renders title in commits#index" do
       visit namespace_project_commits_path(project.namespace, project, 'master', limit: 1)
 
@@ -48,18 +48,22 @@ describe "GitLab Flavored Markdown", feature: true do
     end
   end
 
-  describe "for issues" do
+  describe "for issues", feature: true, js: true do
+    include WaitForVueResource
+
     before do
       @other_issue = create(:issue,
                             author: @user,
-                            assignee: @user,
+                            assignees: [@user],
                             project: project)
       @issue = create(:issue,
                       author: @user,
-                      assignee: @user,
+                      assignees: [@user],
                       project: project,
                       title: "fix #{@other_issue.to_reference}",
                       description: "ask #{fred.to_reference} for details")
+
+      @note = create(:note_on_issue, noteable: @issue, project: @issue.project, note: "Hello world")
     end
 
     it "renders subject in issues#index" do
@@ -82,6 +86,8 @@ describe "GitLab Flavored Markdown", feature: true do
   end
 
   describe "for merge requests" do
+    let(:project) { create(:project, :repository) }
+
     before do
       @merge_request = create(:merge_request, source_project: project, target_project: project, title: "fix #{issue.to_reference}")
     end