From a0d49dc011304985a8fd8a7ab337c003995c8ae1 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 14 Oct 2022 12:10:40 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/models/environment_spec.rb | 46 ++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index 3e1812aac9d..a5806910b23 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -1617,44 +1617,30 @@ RSpec.describe Environment, :use_clean_rails_memory_store_caching do
       nil        | nil
       'never'    | nil
     end
-    with_them do
-      it 'sets correct auto_stop_in' do
-        freeze_time do
-          if expected_result.is_a?(Integer) || expected_result.nil?
-            subject
 
-            expect(environment.auto_stop_in).to eq(expected_result)
-          else
-            expect(Gitlab::ErrorTracking).to receive(:track_exception).with(
-              an_instance_of(expected_result),
-              project_id: environment.project_id,
-              environment_id: environment.id
-            )
+    with_them do
+      shared_examples 'for given values expected result is set' do
+        it do
+          freeze_time do
+            if expected_result.is_a?(Integer) || expected_result.nil?
+              subject
 
-            expect { subject }.to raise_error(expected_result)
+              expect(environment.auto_stop_in).to eq(expected_result)
+            else
+              expect { subject }.to raise_error(expected_result)
+            end
           end
         end
       end
-    end
 
-    context 'resets earlier value' do
-      let(:environment) { create(:environment, auto_stop_at: 1.day.since.round) }
-
-      where(:value, :expected_result) do
-        '2 days'   | 2.days.to_i
-        '1 week'   | 1.week.to_i
-        '2h20min'  | 2.hours.to_i + 20.minutes.to_i
-        ''         | nil
-        'never'    | nil
+      context 'new assignment sets correct auto_stop_in' do
+        include_examples 'for given values expected result is set'
       end
-      with_them do
-        it 'assigns new value' do
-          freeze_time do
-            subject
 
-            expect(environment.auto_stop_in).to eq(expected_result)
-          end
-        end
+      context 'resets older value' do
+        let(:environment) { create(:environment, auto_stop_at: 1.day.since.round) }
+
+        include_examples 'for given values expected result is set'
       end
     end
   end
-- 
cgit v1.2.3