summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessio Caiazza <acaiazza@gitlab.com>2017-10-26 16:04:28 +0200
committerAlessio Caiazza <acaiazza@gitlab.com>2017-10-26 16:04:28 +0200
commit6798bab12a0faabf43f61eb65561b9f058824e4d (patch)
tree1748d095cfb8cdb4767793c342a60a9b24a0a637
parenta1b3cd40647e8f7768b6db0bc64179e60f5d5937 (diff)
downloadgitlab-ce-6798bab12a0faabf43f61eb65561b9f058824e4d.tar.gz
Remove duped tests
Likely caused by EE conflicts resolution
-rw-r--r--spec/models/project_services/kubernetes_service_spec.rb28
1 files changed, 0 insertions, 28 deletions
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb
index 537cdadd528..69da4375245 100644
--- a/spec/models/project_services/kubernetes_service_spec.rb
+++ b/spec/models/project_services/kubernetes_service_spec.rb
@@ -124,34 +124,6 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
end
end
- describe '#actual_namespace' do
- subject { service.actual_namespace }
-
- it "returns the default namespace" do
- is_expected.to eq(service.send(:default_namespace))
- end
-
- context 'when namespace is specified' do
- before do
- service.namespace = 'my-namespace'
- end
-
- it "returns the user-namespace" do
- is_expected.to eq('my-namespace')
- end
- end
-
- context 'when service is not assigned to project' do
- before do
- service.project = nil
- end
-
- it "does not return namespace" do
- is_expected.to be_nil
- end
- end
- end
-
describe '#test' do
let(:discovery_url) { 'https://kubernetes.example.com/api/v1' }