summaryrefslogtreecommitdiff
path: root/spec/features/notes_on_merge_requests_spec.rb
diff options
context:
space:
mode:
authorCiro Santilli <ciro.santilli@gmail.com>2014-09-19 15:26:20 +0200
committerCiro Santilli <ciro.santilli@gmail.com>2014-09-22 21:01:19 +0200
commit778afb699f08d6b8e7f1ac5e77e927f45e11f8be (patch)
tree24ffbfb9b166d5358fe44e252b6f4e4084d97be5 /spec/features/notes_on_merge_requests_spec.rb
parent248990b5e8e169d7c48adb539980a9db6cea4eca (diff)
downloadgitlab-ce-778afb699f08d6b8e7f1ac5e77e927f45e11f8be.tar.gz
Replace javascript:; links with buttons.
Diffstat (limited to 'spec/features/notes_on_merge_requests_spec.rb')
-rw-r--r--spec/features/notes_on_merge_requests_spec.rb15
1 files changed, 10 insertions, 5 deletions
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 47776ba7f3f..92f3a6c0929 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -133,7 +133,7 @@ describe 'Comments' do
describe "when adding a note" do
before do
- find("a[data-line-code=\"#{line_code}\"]").click
+ click_diff_line
end
describe "the notes holder" do
@@ -144,7 +144,7 @@ describe 'Comments' do
describe "the note form" do
it "shouldn't add a second form for same row" do
- find("a[data-line-code=\"#{line_code}\"]").click
+ click_diff_line
should have_css("tr[id='#{line_code}'] + .js-temp-notes-holder form", count: 1)
end
@@ -161,8 +161,8 @@ describe 'Comments' do
describe "with muliple note forms" do
before do
- find("a[data-line-code=\"#{line_code}\"]").click
- find("a[data-line-code=\"#{line_code_2}\"]").click
+ click_diff_line
+ click_diff_line(line_code_2)
end
it { should have_css(".js-temp-notes-holder", count: 2) }
@@ -193,7 +193,7 @@ describe 'Comments' do
should have_content("Another comment on line 10")
should have_css(".notes_holder")
should have_css(".notes_holder .note", count: 1)
- should have_link("Reply")
+ should have_button('Reply')
end
end
end
@@ -206,4 +206,9 @@ describe 'Comments' do
def line_code_2
sample_compare.changes.last[:line_code]
end
+
+ def click_diff_line(data = nil)
+ data ||= line_code
+ find("button[data-line-code=\"#{data}\"]").click
+ end
end