summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-03-14 00:02:30 -0500
committerEric Eastwood <contact@ericeastwood.com>2017-03-28 11:09:12 -0500
commitcf3c43980d3911e32d767158420400d75edf3968 (patch)
tree18741697d64bf26a98e8e15b005062ecb4b454ed /features
parent6460489babe3cd25358800804f6befc1bd242f22 (diff)
downloadgitlab-ce-cf3c43980d3911e32d767158420400d75edf3968.tar.gz
Fix link togglers jumping to top
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29414
Diffstat (limited to 'features')
-rw-r--r--features/steps/dashboard/new_project.rb2
-rw-r--r--features/steps/project/merge_requests.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/dashboard/new_project.rb b/features/steps/dashboard/new_project.rb
index cb36d6ae1a9..d4a04f693b8 100644
--- a/features/steps/dashboard/new_project.rb
+++ b/features/steps/dashboard/new_project.rb
@@ -19,7 +19,7 @@ class Spinach::Features::NewProject < Spinach::FeatureSteps
expect(page).to have_link('Bitbucket')
expect(page).to have_link('GitLab.com')
expect(page).to have_link('Google Code')
- expect(page).to have_link('Repo by URL')
+ expect(page).to have_button('Repo by URL')
expect(page).to have_link('GitLab export')
end
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 9f0057cace7..c9c4f537fad 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -382,7 +382,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I modify merge commit message' do
- find('.modify-merge-commit-link').click
+ click_button "Modify commit message"
fill_in 'commit_message', with: 'wow such merge'
end