summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-08-23 18:22:43 +0000
committerRobert Speicher <robert@gitlab.com>2016-08-23 18:22:43 +0000
commit739620fe98aa0260fbc1f0ea4e98609019b1a665 (patch)
tree5485d9c0dbc80adc6861b69602eb1f1dcef4855e
parentcc8a9d923fca6b852aefc499169dc345ddacf70a (diff)
parent4a2351185cf0430f55b69f88750d4897d9cea9d4 (diff)
downloadgitlab-ce-739620fe98aa0260fbc1f0ea4e98609019b1a665.tar.gz
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 :laughing: See merge request !5964
-rw-r--r--features/project/commits/branches.feature1
-rw-r--r--features/steps/project/commits/branches.rb5
2 files changed, 6 insertions, 0 deletions
diff --git a/features/project/commits/branches.feature b/features/project/commits/branches.feature
index 2c17d32154a..88fef674c0c 100644
--- 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'
diff --git a/features/steps/project/commits/branches.rb b/features/steps/project/commits/branches.rb
index 4bfb7e92e99..5f9b9e0445e 100644
--- 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