Commit 2a12cbe6 authored by blackst0ne's avatar blackst0ne

Improved specs

parent 24ba7585
...@@ -33,6 +33,7 @@ describe 'issuable list', feature: true do ...@@ -33,6 +33,7 @@ describe 'issuable list', feature: true do
it "counts merge requests closing issues icons for each issue" do it "counts merge requests closing issues icons for each issue" do
visit_issuable_list(:issue) 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) expect(first('.icon-merge-request-unmerged').find(:xpath, '..')).to have_content(1)
end end
...@@ -48,13 +49,6 @@ describe 'issuable list', feature: true do ...@@ -48,13 +49,6 @@ describe 'issuable list', feature: true do
3.times do 3.times do
if issuable_type == :issue if issuable_type == :issue
issuable = create(:issue, project: project, author: user) 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 else
issuable = create(:merge_request, title: FFaker::Lorem.sentence, source_project: project, source_branch: FFaker::Name.name) issuable = create(:merge_request, title: FFaker::Lorem.sentence, source_project: project, source_branch: FFaker::Name.name)
end end
...@@ -65,6 +59,16 @@ describe 'issuable list', feature: true do ...@@ -65,6 +59,16 @@ describe 'issuable list', feature: true do
create(:award_emoji, :downvote, awardable: issuable) create(:award_emoji, :downvote, awardable: issuable)
create(:award_emoji, :upvote, 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 end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment