Commit 739620fe authored by Robert Speicher's avatar Robert Speicher

Merge branch 'fix-spinach-branches-spec' into 'master'

Fix Spinach branches spec

I broke master by adding a branch to gitlab-test for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5961, which put the branch in this scenario off the first page 😆 

See merge request !5964
parents cc8a9d92 4a235118
...@@ -22,6 +22,7 @@ Feature: Project Commits Branches ...@@ -22,6 +22,7 @@ Feature: Project Commits Branches
@javascript @javascript
Scenario: I delete a branch Scenario: I delete a branch
Given I visit project branches page Given I visit project branches page
And I filter for branch improve/awesome
And I click branch 'improve/awesome' delete link And I click branch 'improve/awesome' delete link
Then I should not see branch 'improve/awesome' Then I should not see branch 'improve/awesome'
......
...@@ -73,6 +73,11 @@ class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps ...@@ -73,6 +73,11 @@ class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps
expect(page).to have_content 'Branch already exists' expect(page).to have_content 'Branch already exists'
end end
step 'I filter for branch improve/awesome' do
fill_in 'branch-search', with: 'improve/awesome'
find('#branch-search').native.send_keys(:enter)
end
step "I click branch 'improve/awesome' delete link" do step "I click branch 'improve/awesome' delete link" do
page.within '.js-branch-improve\/awesome' do page.within '.js-branch-improve\/awesome' do
find('.btn-remove').click find('.btn-remove').click
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment