summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-07-08 14:46:13 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-07-29 15:20:39 +0530
commitc647540c1010fd1e51bced1db90947aa00c83fa8 (patch)
tree882a9a21dec98c567c7ac21b03058b09bc24bce3 /features
parenta9958ddc7c9d4c455d4c5459b7b83da1fab9ccb4 (diff)
downloadgitlab-ce-c647540c1010fd1e51bced1db90947aa00c83fa8.tar.gz
Fix all specs related to changes in !5081.
1. Remove `Project#developers_can_push_to_protected_branch?` since it isn't used anymore. 2. Remove `Project#developers_can_merge_to_protected_branch?` since it isn't used anymore.
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/commits/branches.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/project/commits/branches.rb b/features/steps/project/commits/branches.rb
index 0a42931147d..4bfb7e92e99 100644
--- a/features/steps/project/commits/branches.rb
+++ b/features/steps/project/commits/branches.rb
@@ -25,7 +25,7 @@ class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps
step 'project "Shop" has protected branches' do
project = Project.find_by(name: "Shop")
- project.protected_branches.create(name: "stable")
+ create(:protected_branch, project: project, name: "stable")
end
step 'I click new branch link' do