fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
21b028b548
commit
d4ec23b8b5
|
@ -379,7 +379,9 @@ class Notes
|
||||||
|
|
||||||
# does it already have notes?
|
# does it already have notes?
|
||||||
if nextRow.is(".notes_holder")
|
if nextRow.is(".notes_holder")
|
||||||
$.proxy(@replyToDiscussionNote, nextRow.find(".js-discussion-reply-button")).call()
|
replyButton = nextRow.find(".js-discussion-reply-button")
|
||||||
|
if replyButton.length > 0
|
||||||
|
$.proxy(@replyToDiscussionNote, replyButton).call()
|
||||||
else
|
else
|
||||||
# add a notes row and insert the form
|
# add a notes row and insert the form
|
||||||
row.after "<tr class=\"notes_holder js-temp-notes-holder\"><td class=\"notes_line\" colspan=\"2\"></td><td class=\"notes_content\"></td></tr>"
|
row.after "<tr class=\"notes_holder js-temp-notes-holder\"><td class=\"notes_line\" colspan=\"2\"></td><td class=\"notes_content\"></td></tr>"
|
||||||
|
|
|
@ -108,7 +108,7 @@ describe "On a merge request", js: true do
|
||||||
|
|
||||||
within("#note_#{note.id}") do
|
within("#note_#{note.id}") do
|
||||||
should have_css(".note-last-update small")
|
should have_css(".note-last-update small")
|
||||||
find(".note-last-update small").text.should match(/Edited just now/)
|
find(".note-last-update small").text.should match(/Edited less than a minute ago/)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue