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

Merge branch 'fix-spinach-branches-spec' into 'master'
739620fe · Robert Speicher · cc8a9d92 · 4a235118 · 739620fe · 739620fe
Commit 739620fe authored Aug 23, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

branches.feature features/project/commits/branches.feature +1 -0

branches.rb features/steps/project/commits/branches.rb +5 -0

No files found.
--- a/features/project/commits/branches.feature
+++ b/features/project/commits/branches.feature
@@ -22,6 +22,7 @@ Feature: Project Commits Branches
  @javascript
  Scenario: I delete a branch
    Given I visit project branches page
+    And I filter for branch improve/awesome
    And I click branch 'improve/awesome' delete link
    Then I should not see branch 'improve/awesome'


--- a/features/steps/project/commits/branches.rb
+++ b/features/steps/project/commits/branches.rb
@@ -73,6 +73,11 @@ class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps
    expect(page).to have_content 'Branch already exists'
  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
    page.within '.js-branch-improve\/awesome' do
      find('.btn-remove').click