Improved specs

1 files changed, 11 insertions, 7 deletions

diff --git a/spec/features/issuables/issuable_list_spec.rb b/spec/features/issuables/issuable_list_spec.rb
index ce4dca1175f..4ea801cd1ac 100644
--- a/spec/features/issuables/issuable_list_spec.rb
+++ b/spec/features/issuables/issuable_list_spec.rb
@@ -33,6 +33,7 @@ describe 'issuable list', feature: true do
   it "counts merge requests closing issues icons for each issue" do
     visit_issuable_list(:issue)
 
+    expect(page).to have_selector('.icon-merge-request-unmerged', count: 1)
     expect(first('.icon-merge-request-unmerged').find(:xpath, '..')).to have_content(1)
   end
 
@@ -48,13 +49,6 @@ describe 'issuable list', feature: true do
     3.times do
       if issuable_type == :issue
         issuable = create(:issue, project: project, author: user)
-        merge_request = create(:merge_request,
-                                title: FFaker::Lorem.sentence,
-                                description: "Closes #{issuable.to_reference}",
-                                source_project: project,
-                                source_branch: FFaker::Name.name)
-
-        MergeRequestsClosingIssues.create!(issue: issuable, merge_request: merge_request)
       else
         issuable = create(:merge_request, title: FFaker::Lorem.sentence, source_project: project, source_branch: FFaker::Name.name)
       end
@@ -65,6 +59,16 @@ describe 'issuable list', feature: true do
 
       create(:award_emoji, :downvote, awardable: issuable)
       create(:award_emoji, :upvote, awardable: issuable)
+
+      if issuable_type == :issue
+        issue = Issue.reorder(:iid).first
+        merge_request = create(:merge_request,
+                                title: FFaker::Lorem.sentence,
+                                source_project: project,
+                                source_branch: FFaker::Name.name)
+
+        MergeRequestsClosingIssues.create!(issue: issue, merge_request: merge_request) if MergeRequestsClosingIssues.count.zero?
+      end
     end
   end
 end