diff options
author | Brandon Labuschagne <blabuschagne@gitlab.com> | 2019-01-04 14:52:42 +0200 |
---|---|---|
committer | Brandon Labuschagne <blabuschagne@gitlab.com> | 2019-01-04 14:52:42 +0200 |
commit | 3a977cf0c592bc9d7ccc75c3f9f07614b56e6a59 (patch) | |
tree | 43cbb71519cf37165ff1c8855ab1977b87938d86 /spec/models/clusters/applications/helm_spec.rb | |
parent | 27fe9caed0ded80eb9a8474a9871f5abb77e1276 (diff) | |
parent | 8947e59d9191b9723dc2a49f75dd735b4f3d299c (diff) | |
download | gitlab-ce-3a977cf0c592bc9d7ccc75c3f9f07614b56e6a59.tar.gz |
Fix merge conflict
Diffstat (limited to 'spec/models/clusters/applications/helm_spec.rb')
-rw-r--r-- | spec/models/clusters/applications/helm_spec.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/models/clusters/applications/helm_spec.rb b/spec/models/clusters/applications/helm_spec.rb index 2c37cd20ecc..64f6d9c8bb4 100644 --- a/spec/models/clusters/applications/helm_spec.rb +++ b/spec/models/clusters/applications/helm_spec.rb @@ -49,16 +49,16 @@ describe Clusters::Applications::Helm do end describe 'rbac' do - context 'non rbac cluster' do - it { expect(subject).not_to be_rbac } + context 'rbac cluster' do + it { expect(subject).to be_rbac } end - context 'rbac cluster' do + context 'non rbac cluster' do before do - helm.cluster.platform_kubernetes.rbac! + helm.cluster.platform_kubernetes.abac! end - it { expect(subject).to be_rbac } + it { expect(subject).not_to be_rbac } end end end |