From f368b4968e55b32dcedfaefe7c31f7a9463454cf Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 5 Jan 2021 18:10:25 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/controllers/projects/environments_controller_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'spec/controllers/projects/environments_controller_spec.rb') diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb index d1142cbd129..83ad36b217f 100644 --- a/spec/controllers/projects/environments_controller_spec.rb +++ b/spec/controllers/projects/environments_controller_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' RSpec.describe Projects::EnvironmentsController do include MetricsDashboardHelpers + include KubernetesHelpers let_it_be(:project) { create(:project) } let_it_be(:maintainer) { create(:user, name: 'main-dos').tap { |u| project.add_maintainer(u) } } @@ -34,6 +35,9 @@ RSpec.describe Projects::EnvironmentsController do context 'when requesting JSON response for folders' do before do + allow_any_instance_of(Environment).to receive(:has_terminals?).and_return(true) + allow_any_instance_of(Environment).to receive(:rollout_status).and_return(kube_deployment_rollout_status) + create(:environment, project: project, name: 'staging/review-1', state: :available) @@ -91,9 +95,11 @@ RSpec.describe Projects::EnvironmentsController do it 'responds with a payload describing available environments' do expect(environments.count).to eq 2 expect(environments.first['name']).to eq 'production' + expect(environments.first['latest']['rollout_status']).to be_present expect(environments.second['name']).to eq 'staging' expect(environments.second['size']).to eq 2 expect(environments.second['latest']['name']).to eq 'staging/review-2' + expect(environments.second['latest']['rollout_status']).to be_present end it 'contains values describing environment scopes sizes' do -- cgit v1.2.1