From cf3c43980d3911e32d767158420400d75edf3968 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Tue, 14 Mar 2017 00:02:30 -0500 Subject: Fix link togglers jumping to top Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29414 --- features/steps/dashboard/new_project.rb | 2 +- features/steps/project/merge_requests.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'features') 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 -- cgit v1.2.1