summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-02-24 18:06:09 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-02-24 18:06:09 +0000
commit52ceaa2406d48151c4158efd46032767bdd8ad1c (patch)
tree836526c3127f24769740cc3bd2e7fda5b4ec2d19 /features/project
parent00cb8237f24be736816f9a60192c7a6cb1b54ed9 (diff)
parentcd5bee0d4438e4bb5158b721580cec8687e95e93 (diff)
downloadgitlab-ce-52ceaa2406d48151c4158efd46032767bdd8ad1c.tar.gz
Merge branch 'remove-jquery-ui-plugins' into 'master'
Removed jQuery UI highlight & autocomplete See merge request !8420
Diffstat (limited to 'features/project')
-rw-r--r--features/project/commits/branches.feature8
1 files changed, 2 insertions, 6 deletions
diff --git a/features/project/commits/branches.feature b/features/project/commits/branches.feature
index 88fef674c0c..c57376aecff 100644
--- a/features/project/commits/branches.feature
+++ b/features/project/commits/branches.feature
@@ -13,6 +13,7 @@ Feature: Project Commits Branches
Given I visit project protected branches page
Then I should see "Shop" protected branches list
+ @javascript
Scenario: I create a branch
Given I visit project branches page
And I click new branch link
@@ -33,12 +34,7 @@ Feature: Project Commits Branches
And I submit new branch form with invalid name
Then I should see new an error that branch is invalid
- Scenario: I create a branch with invalid reference
- Given I visit project branches page
- And I click new branch link
- And I submit new branch form with invalid reference
- Then I should see new an error that ref is invalid
-
+ @javascript
Scenario: I create a branch that already exists
Given I visit project branches page
And I click new branch link