summaryrefslogtreecommitdiff
path: root/spec/serializers
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-05-31 22:58:34 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-05-31 22:58:34 +0800
commitafb1bf0baf23a6e7b111fb5b305c16c38cf3a99e (patch)
tree6f7981f1d809e205df6bbe13638c28d91f3caeed /spec/serializers
parent258cdd14b557b96c5340ea91c6915b8787ce1b1e (diff)
parent4ad85b22e25ab9b2d089fce7138f07c72c5fd5d6 (diff)
downloadgitlab-ce-afb1bf0baf23a6e7b111fb5b305c16c38cf3a99e.tar.gz
Merge remote-tracking branch 'upstream/master' into rename-builds-controller
* upstream/master: (63 commits) Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions Check only a merge ability for protected actions Add tag_list param to project api Allow PostReceivePack to be enabled with Gitaly Remove some deprecated methods Add :owned param to ProjectFinder ...
Diffstat (limited to 'spec/serializers')
-rw-r--r--spec/serializers/build_entity_spec.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/serializers/build_entity_spec.rb b/spec/serializers/build_entity_spec.rb
index b5eb84ae43b..6d5e1046e86 100644
--- a/spec/serializers/build_entity_spec.rb
+++ b/spec/serializers/build_entity_spec.rb
@@ -3,6 +3,7 @@ require 'spec_helper'
describe BuildEntity do
let(:user) { create(:user) }
let(:build) { create(:ci_build) }
+ let(:project) { build.project }
let(:request) { double('request') }
before do
@@ -52,7 +53,10 @@ describe BuildEntity do
context 'when user is allowed to trigger action' do
before do
- build.project.add_master(user)
+ project.add_developer(user)
+
+ create(:protected_branch, :developers_can_merge,
+ name: 'master', project: project)
end
it 'contains path to play action' do