diff options
author | Thong Kuah <tkuah@gitlab.com> | 2019-05-03 00:07:45 +1200 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2019-05-20 14:04:16 +1200 |
commit | 0398213d207fcc03cdb3f8dfd02a61f207a8eea9 (patch) | |
tree | 03635671c2f8ef2fbb3bf3c6f1d730eaa2cfc580 | |
parent | a4777d6ea91433a134358de8ca446d96a2e5fd6f (diff) | |
download | gitlab-ce-0398213d207fcc03cdb3f8dfd02a61f207a8eea9.tar.gz |
Use Environment#deployment_platform method insteadenvironment_terminal_methods
As this method does have `deployment_platform(environment: self.name)`,
which is what the form EE needs. Allows us to remove two overrides in
EE.
-rw-r--r-- | app/models/environment.rb | 4 | ||||
-rw-r--r-- | spec/models/environment_spec.rb | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb index 0eda7a2513f..aff20dae09b 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -155,11 +155,11 @@ class Environment < ApplicationRecord end def has_terminals? - project.deployment_platform.present? && available? && last_deployment.present? + deployment_platform.present? && available? && last_deployment.present? end def terminals - project.deployment_platform.terminals(self) if has_terminals? + deployment_platform.terminals(self) if has_terminals? end def has_metrics? diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb index cfe7c7ef0b0..17246f238e0 100644 --- a/spec/models/environment_spec.rb +++ b/spec/models/environment_spec.rb @@ -592,9 +592,7 @@ describe Environment do shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do it 'returns the terminals from the deployment service' do - deployment_platform_target = Gitlab.ee? ? environment : project - - expect(deployment_platform_target.deployment_platform) + expect(environment.deployment_platform) .to receive(:terminals).with(environment) .and_return(:fake_terminals) |