summaryrefslogtreecommitdiff
path: root/spec/policies
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-07-18 20:16:43 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-07-18 20:16:43 +0800
commit3c7cb6ad9e9d74c0f2fb7e8ba19f258c7316f445 (patch)
treebefe2a0188971eb69052e6ca4f6280a57781697c /spec/policies
parent65e722ee977a3fcd44fb272aa716dfa679385759 (diff)
parentf3e682c03fa84adea99d55ac74e32d53164cd99b (diff)
downloadgitlab-ce-3c7cb6ad9e9d74c0f2fb7e8ba19f258c7316f445.tar.gz
Merge remote-tracking branch 'upstream/master' into 30634-protected-pipeline
* upstream/master: (25 commits) Remove unneeded asserts and add tests for inactive RequestStore Rename the methods to make it fit with current name Follow feedback on the merge request Make sure it checks against the tag only when it's a tag Renamed Gitaly services fix transient rspec failure due to Poll.js race condition Refactor variables initialization in dropzone_input.js cache the cache key... avoid #respond_to? in Cache.id_for cache DeclarativePolicy.class_for at the class level Update 9.3-to-9.4.md fix padding on filtered search dropdown. Styles should only apply to li in list Cache Note#notable for commits and fix tests Add changelog entry Update the comments for the new functionality Use RequestStoreWrap for Commit#author Skip dead jobs queue for web hooks and project services Add RequestStoreWrap to cache via RequestStore Don't track cached queries in Gitlab::PerformanceBar::PeekQueryTracker Add changelog entry ...
Diffstat (limited to 'spec/policies')
-rw-r--r--spec/policies/ci/build_policy_spec.rb8
1 files changed, 0 insertions, 8 deletions
diff --git a/spec/policies/ci/build_policy_spec.rb b/spec/policies/ci/build_policy_spec.rb
index 9e2b0506bf3..86e57fdf607 100644
--- a/spec/policies/ci/build_policy_spec.rb
+++ b/spec/policies/ci/build_policy_spec.rb
@@ -115,14 +115,6 @@ describe Ci::BuildPolicy, :models do
end
context 'when developers can push to the branch' do
- let(:branch_policy) { :developers_can_push }
-
- it 'includes ability to update build' do
- expect(policy).to be_allowed :update_build
- end
- end
-
- context 'when developers can push to the branch' do
let(:branch_policy) { :developers_can_merge }
it 'includes ability to update build' do