diff options
author | Stan Hu <stanhu@gmail.com> | 2017-11-04 01:50:55 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-11-04 01:50:55 +0300 |
commit | 5d4f377bfd50cb1b2b1980f036b18c7b5d2b137f (patch) | |
tree | 17bc1cdd427400fef53d8f2e76abd57a3ea1ba73 /features/steps/project/commits/branches.rb | |
parent | ae470ae2b52491c283639c4c3006145909c7c27b (diff) | |
parent | cc00b289f9c466a9e4aa711a16ab8758b9e6656f (diff) |
Merge branch 'sh-headless-chrome-support' into 'master'
Replace PhantomJS with Headless Chrome for GitLab Integration Tests
Closes #30876
See merge request gitlab-org/gitlab-ce!12244
Diffstat (limited to 'features/steps/project/commits/branches.rb')
-rw-r--r-- | features/steps/project/commits/branches.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/features/steps/project/commits/branches.rb b/features/steps/project/commits/branches.rb index ccaf3237815..c3ae33d2aa9 100644 --- a/features/steps/project/commits/branches.rb +++ b/features/steps/project/commits/branches.rb @@ -40,6 +40,7 @@ class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps step 'I submit new branch form with invalid name' do fill_in 'branch_name', with: '1.0 stable' + page.find("body").click # defocus the branch_name input select_branch('master') click_button 'Create branch' end @@ -70,17 +71,16 @@ class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps step "I click branch 'improve/awesome' delete link" do page.within '.js-branch-improve\/awesome' do - find('.btn-remove').click - sleep 0.05 + accept_alert { find('.btn-remove').click } end end step "I should not see branch 'improve/awesome'" do - expect(page.all(visible: true)).not_to have_content 'improve/awesome' + expect(page).to have_css('.js-branch-improve\\/awesome', visible: :hidden) end def select_branch(branch_name) - click_button 'master' + find('.git-revision-dropdown-toggle').click page.within '#new-branch-form .dropdown-menu' do click_link branch_name |