Commit 2ef97f82 authored by Stan Hu's avatar Stan Hu

Merge branch 'environment_terminal_methods' into 'master'

Use Environment#deployment_platform method instead

See merge request gitlab-org/gitlab-ce!28000
parents bdc2eb33 0398213d
...@@ -155,11 +155,11 @@ class Environment < ApplicationRecord ...@@ -155,11 +155,11 @@ class Environment < ApplicationRecord
end end
def has_terminals? def has_terminals?
project.deployment_platform.present? && available? && last_deployment.present? deployment_platform.present? && available? && last_deployment.present?
end end
def terminals def terminals
project.deployment_platform.terminals(self) if has_terminals? deployment_platform.terminals(self) if has_terminals?
end end
def has_metrics? def has_metrics?
......
...@@ -592,9 +592,7 @@ describe Environment do ...@@ -592,9 +592,7 @@ describe Environment do
shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
it 'returns the terminals from the deployment service' do it 'returns the terminals from the deployment service' do
deployment_platform_target = Gitlab.ee? ? environment : project expect(environment.deployment_platform)
expect(deployment_platform_target.deployment_platform)
.to receive(:terminals).with(environment) .to receive(:terminals).with(environment)
.and_return(:fake_terminals) .and_return(:fake_terminals)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment