Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 36 deletions

diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 8adbd27cd1c..149c0609799 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -735,18 +735,6 @@ RSpec.describe Ci::Build, feature_category: :continuous_integration, factory_def
           is_expected.to eq(1.day.since)
         end
       end
-
-      context 'when update_chronic_duration is disabled' do
-        before do
-          stub_feature_flags(update_chronic_duration: false)
-        end
-
-        it 'returns date after 1 day' do
-          freeze_time do
-            is_expected.to eq(1.day.since)
-          end
-        end
-      end
     end
 
     context 'when start_in is 1 week' do
@@ -757,18 +745,6 @@ RSpec.describe Ci::Build, feature_category: :continuous_integration, factory_def
           is_expected.to eq(1.week.since)
         end
       end
-
-      context 'when update_chronic_duration is disabled' do
-        before do
-          stub_feature_flags(update_chronic_duration: false)
-        end
-
-        it 'returns date after 1 week' do
-          freeze_time do
-            is_expected.to eq(1.week.since)
-          end
-        end
-      end
     end
   end
 
@@ -1099,18 +1075,6 @@ RSpec.describe Ci::Build, feature_category: :continuous_integration, factory_def
 
       is_expected.to be_nil
     end
-
-    context 'when update_chronic_duration is disabled' do
-      before do
-        stub_feature_flags(update_chronic_duration: false)
-      end
-
-      it 'assigns a valid duration' do
-        build.artifacts_expire_in = '7 days'
-
-        is_expected.to be_within(10).of(7.days.to_i)
-      end
-    end
   end
 
   describe '#commit' do