Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 1 deletions

diff --git a/spec/helpers/environments_helper_spec.rb b/spec/helpers/environments_helper_spec.rb
index 37713a04844..aaa90a7d2af 100644
--- a/spec/helpers/environments_helper_spec.rb
+++ b/spec/helpers/environments_helper_spec.rb
@@ -33,7 +33,8 @@ describe EnvironmentsHelper do
         'tags-path' => project_tags_path(project),
         'has-metrics' => "#{environment.has_metrics?}",
         'prometheus-status' => "#{environment.prometheus_status}",
-        'external-dashboard-url' => nil
+        'external-dashboard-url' => nil,
+        'environment-state' => environment.state
       )
     end
 
@@ -46,5 +47,15 @@ describe EnvironmentsHelper do
         expect(metrics_data['external-dashboard-url']).to eq('http://gitlab.com')
       end
     end
+
+    context 'when the environment is not available' do
+      before do
+        environment.stop
+      end
+
+      subject { metrics_data }
+
+      it { is_expected.to include('environment-state' => 'stopped') }
+    end
   end
 end