summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-11-03 17:22:49 +0900
committerShinya Maeda <shinya@gitlab.com>2017-11-03 17:22:49 +0900
commit600d5f4fba4f73ef438db651d20da92080e5b3b0 (patch)
treed03a13eca8f7145a853466a88ccc4d04e138ca96 /spec/models
parent6ebe6792de24528a2052b77018b6c1d17ef5e17b (diff)
downloadgitlab-ce-600d5f4fba4f73ef438db651d20da92080e5b3b0.tar.gz
Fix tests. Remove NOT NULL constraint from cluster.user.
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/clusters/platforms/kubernetes_spec.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb
index 71d06a4ae66..e6ebe079ceb 100644
--- a/spec/models/clusters/platforms/kubernetes_spec.rb
+++ b/spec/models/clusters/platforms/kubernetes_spec.rb
@@ -117,7 +117,6 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
let(:kubernetes_service) { project.kubernetes_service }
it 'updates KubernetesService' do
- # TODO: This doesn't work as intended because `enabled?` in Clusters::Platforms::Kubernetes is still true without `reload`
cluster.update(enabled: enabled)
expect(kubernetes_service.active).to eq(enabled)
@@ -135,7 +134,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
end
it 'raises an error' do
- expect{ cluster.save! }.to raise_error('Kubernetes service already configured')
+ expect { cluster.save! }.to raise_error('Kubernetes service already configured')
end
end
end