summaryrefslogtreecommitdiff
path: root/features
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 /features
parent248990b5e8e169d7c48adb539980a9db6cea4eca (diff)
downloadgitlab-ce-778afb699f08d6b8e7f1ac5e77e927f45e11f8be.tar.gz
Replace javascript:; links with buttons.
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/merge_requests.rb5
-rw-r--r--features/steps/shared/diff_note.rb4
2 files changed, 3 insertions, 6 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index da3e5ec8037..cd8475c14ac 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -4,6 +4,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
include SharedNote
include SharedPaths
include SharedMarkdown
+ include SharedDiffNote
step 'I click link "New Merge Request"' do
click_link "New Merge Request"
@@ -292,8 +293,4 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
def have_visible_content (text)
have_css("*", text: text, visible: true)
end
-
- def click_diff_line(code)
- find("a[data-line-code='#{code}']").click
- end
end
diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb
index 7d017669b7c..10f3ed90b56 100644
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -103,7 +103,7 @@ module SharedDiffNote
step 'I should see a discussion reply button' do
within(diff_file_selector) do
- page.should have_link("Reply")
+ page.should have_button('Reply')
end
end
@@ -160,6 +160,6 @@ module SharedDiffNote
end
def click_diff_line(code)
- find("a[data-line-code='#{code}']").click
+ find("button[data-line-code='#{code}']").click
end
end