From d4ec23b8b5fbc4aab4f5ba65c93e976fa4113db9 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 26 Dec 2013 09:39:55 +0200
Subject: [PATCH] fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
app/assets/javascripts/notes.js.coffee | 4 +++-
spec/features/notes_on_merge_requests_spec.rb | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index f90f91b4fab..b3e71965a07 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -379,7 +379,9 @@ class Notes
# does it already have notes?
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
# 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>"
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index d29bed4dea7..f92d479d02f 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -108,7 +108,7 @@ describe "On a merge request", js: true do
within("#note_#{note.id}") do
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
--
GitLab