diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-20 22:09:42 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-20 22:09:42 +0300 |
| commit | 2ef97f82ff24da4cda5004b96198aceea3ef9775 (patch) | |
| tree | 24b85198d685a4a56a923f83cc5f8a4deddeb8fb /spec | |
| parent | bdc2eb33e160006cd34128e391becff86a3bc060 (diff) | |
| parent | 0398213d207fcc03cdb3f8dfd02a61f207a8eea9 (diff) | |
Merge branch 'environment_terminal_methods' into 'master'
Use Environment#deployment_platform method instead
See merge request gitlab-org/gitlab-ce!28000
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/models/environment_spec.rb | 4 |
1 files changed, 1 insertions, 3 deletions
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) |