ndr_support 5.10.3 → 5.10.5

data/code_safety.yml

@@ -1,290 +0,0 @@
----
-file safety:
-  ".github/CODEOWNERS":
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: ee57573b35d6ef0f1a2d8e774ee95aa41a85d40c
-  ".github/workflows/lint.yml":
-    comments:
-    reviewed_by: ollietulloch
-    safe_revision: 993f7719b57eb6ddd8dffa7230ed9ffc69f48749
-  ".github/workflows/test.yml":
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 2253a90ec8db872590a8167fdebe95d6ed677cc2
-  ".gitignore":
-    comments:
-    reviewed_by: josh.pencheon
-    safe_revision: a02f14cbf1fc36fbaf820365fdedfdc9af326db1
-  ".rubocop.yml":
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
-  CHANGELOG.md:
-    comments:
-    reviewed_by: ollietulloch
-    safe_revision: 8cb498126d68a19f880b0cd1b83b127c8ec90a89
-  CODE_OF_CONDUCT.md:
-    comments:
-    reviewed_by: timgentry
-    safe_revision: c752769b91c0e782be0acf44e56bbc066a275365
-  Gemfile:
-    comments:
-    reviewed_by: timgentry
-    safe_revision: 6a7c3764e5315981070eba27b9f0be9d9182476c
-  Guardfile:
-    comments:
-    reviewed_by: timgentry
-    safe_revision: e33e9dae7f38bc449ce9276515a539836dbbbd53
-  LICENSE.txt:
-    comments:
-    reviewed_by: timgentry
-    safe_revision: 90328cca8494539257e192a63b240a91c89f0616
-  README.md:
-    comments:
-    reviewed_by: ollietulloch
-    safe_revision: 993f7719b57eb6ddd8dffa7230ed9ffc69f48749
-  Rakefile:
-    comments:
-    reviewed_by: timgentry
-    safe_revision: e33e9dae7f38bc449ce9276515a539836dbbbd53
-  gemfiles/Gemfile.rails61:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 16254a4332aab074a27c8e13859dc4712e707122
-  gemfiles/Gemfile.rails70:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 16254a4332aab074a27c8e13859dc4712e707122
-  gemfiles/Gemfile.rails71:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 2253a90ec8db872590a8167fdebe95d6ed677cc2
-  lib/ndr_support.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 44fbdf72f47f4022c7dc9148150ebc18589dac8f
-  lib/ndr_support/array.rb:
-    comments:
-    reviewed_by: pauleves
-    safe_revision: 4a4ed24d2cfe7e1736baadf4cf6e0fece6823be1
-  lib/ndr_support/concerns/working_days.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 6fb8c080befbb9c741c2bc3a2fadb29fe1c3d0aa
-  lib/ndr_support/date_and_time_extensions.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
-  lib/ndr_support/daterange.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
-  lib/ndr_support/hash.rb:
-    comments:
-    reviewed_by: pauleves
-    safe_revision: 506a317e59d0ccb5b32d813b74d822f35a55cea9
-  lib/ndr_support/integer/calculations.rb:
-    comments:
-    reviewed_by: josh.pencheon
-    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
-  lib/ndr_support/integer/rounding.rb:
-    comments:
-    reviewed_by: josh.pencheon
-    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
-  lib/ndr_support/integer/working_days.rb:
-    comments:
-    reviewed_by: josh.pencheon
-    safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
-  lib/ndr_support/nil.rb:
-    comments:
-    reviewed_by: pauleves
-    safe_revision: 4a4ed24d2cfe7e1736baadf4cf6e0fece6823be1
-  lib/ndr_support/obfuscator.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 50a4293953f9ae227823c390b069a3ed4825074c
-  lib/ndr_support/ourdate.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
-  lib/ndr_support/ourdate/build_datetime.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
-  lib/ndr_support/ourtime.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
-  lib/ndr_support/password.rb:
-    comments: with input from brian.shand
-    reviewed_by: josh.pencheon
-    safe_revision: f5d1ba50d378286c0541f300d73844240e2eb7c1
-  lib/ndr_support/password/constants.rb:
-    comments: with input from brian.shand
-    reviewed_by: josh.pencheon
-    safe_revision: f5d1ba50d378286c0541f300d73844240e2eb7c1
-  lib/ndr_support/regexp_range.rb:
-    comments:
-    reviewed_by: pauleves
-    safe_revision: f9341d1c7f797f9fe81af937c383d41c23872b2f
-  lib/ndr_support/safe_file.rb:
-    comments:
-    reviewed_by: josh.pencheon
-    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
-  lib/ndr_support/safe_path.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: f4f7cb0803ea34a2f1ba83495d8bcbd942786bce
-  lib/ndr_support/string/clean_methodable.rb:
-    comments:
-    reviewed_by: ollietulloch
-    safe_revision: ff21f98e6608eedb4b33f977778736b38f9fbacb
-  lib/ndr_support/string/cleaning.rb:
-    comments:
-    reviewed_by: ollietulloch
-    safe_revision: d99c4bf5d2cbbfe78101beff399e7da8645417b2
-  lib/ndr_support/string/conversions.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
-  lib/ndr_support/tasks.rb:
-    comments:
-    reviewed_by: timgentry
-    safe_revision: 62337584a32e5c30c2e9af7cd998a9df684885cc
-  lib/ndr_support/threat_scanner.rb:
-    comments:
-    reviewed_by: brianshand
-    safe_revision: befa1d4f27448d5be4e133f442c2b5fbac7d8f25
-  lib/ndr_support/utf8_encoding.rb:
-    comments:
-    reviewed_by: josh.pencheon
-    safe_revision: 8e024a4bacfd36e172aad4b800f1960faae0b4b6
-  lib/ndr_support/utf8_encoding/control_characters.rb:
-    comments:
-    reviewed_by: ollietulloch
-    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
-  lib/ndr_support/utf8_encoding/force_binary.rb:
-    comments:
-    reviewed_by: ollietulloch
-    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
-  lib/ndr_support/utf8_encoding/object_support.rb:
-    comments:
-    reviewed_by: ollietulloch
-    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
-  lib/ndr_support/version.rb:
-    comments:
-    reviewed_by: ollietulloch
-    safe_revision: 8cb498126d68a19f880b0cd1b83b127c8ec90a89
-  lib/ndr_support/working_days.rb:
-    comments:
-    reviewed_by: josh.pencheon
-    safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
-  lib/ndr_support/yaml/serialization_migration.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: c764a4d8c251b5076ed3d60391c8271bb5a099bc
-  ndr_support.gemspec:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 2253a90ec8db872590a8167fdebe95d6ed677cc2
-  test/array_test.rb:
-    comments:
-    reviewed_by: timgentry
-    safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
-  test/concerns/working_days_test.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: bac214f4c93d8753268825408fc560171fac91c0
-  test/date_and_time_extensions_test.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
-  test/daterange_test.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
-  test/hash_test.rb:
-    comments:
-    reviewed_by: timgentry
-    safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
-  test/integer/calculations_test.rb:
-    comments:
-    reviewed_by: josh.pencheon
-    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
-  test/integer/rounding_test.rb:
-    comments:
-    reviewed_by: josh.pencheon
-    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
-  test/integer/working_days_test.rb:
-    comments:
-    reviewed_by: josh.pencheon
-    safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
-  test/nil_test.rb:
-    comments:
-    reviewed_by: timgentry
-    safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
-  test/obfuscator_test.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 50a4293953f9ae227823c390b069a3ed4825074c
-  test/ourdate_test.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
-  test/ourtime_test.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: b9bc1e18464a27f84e69ebea083dd6a8d351c8cb
-  test/password_test.rb:
-    comments: with input from brian.shand
-    reviewed_by: josh.pencheon
-    safe_revision: f5d1ba50d378286c0541f300d73844240e2eb7c1
-  test/regexp_range_test.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: f4f7cb0803ea34a2f1ba83495d8bcbd942786bce
-  test/resources/filesystem_paths.yml:
-    comments:
-    reviewed_by: timgentry
-    safe_revision: 81061f85ccdf8933adc7f104d7eeaef1e2d71e26
-  test/safe_file_test.rb:
-    comments:
-    reviewed_by: josh.pencheon
-    safe_revision: 24ba08d3a8f4b284678244aaffa2aaa347256900
-  test/safe_path_test.rb:
-    comments:
-    reviewed_by: timgentry
-    safe_revision: b562d0c15ff1b1d565522a47e6bae47ea09706f0
-  test/string/cleaning_test.rb:
-    comments:
-    reviewed_by: ollietulloch
-    safe_revision: d99c4bf5d2cbbfe78101beff399e7da8645417b2
-  test/string/conversions_test.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
-  test/test_helper.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
-  test/threat_scanner_test.rb:
-    comments:
-    reviewed_by: ollietulloch
-    safe_revision: fbb6ef9804040aa2e38257d9f5c487bde18a490d
-  test/utf8_encoding/control_characters_test.rb:
-    comments:
-    reviewed_by: timgentry
-    safe_revision: d210b982841611381a0df02d8f2db9c13e41e42f
-  test/utf8_encoding/force_binary_test.rb:
-    comments:
-    reviewed_by: timgentry
-    safe_revision: 29595e6431587ff9b7db6e3ad3abbb3577bff99c
-  test/utf8_encoding_test.rb:
-    comments:
-    reviewed_by: timgentry
-    safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
-  test/yaml/serialization_test.rb:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: c764a4d8c251b5076ed3d60391c8271bb5a099bc

data/gemfiles/Gemfile.rails61

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activerecord',  '~> 6.1.0'
-gem 'activesupport', '~> 6.1.0'

data/gemfiles/Gemfile.rails70

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activerecord',  '~> 7.0.0'
-gem 'activesupport', '~> 7.0.0'

data/gemfiles/Gemfile.rails71

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activerecord',  '~> 7.1.0'
-gem 'activesupport', '~> 7.1.0'

data/test/array_test.rb

@@ -1,20 +0,0 @@
-require 'test_helper'
-
-# This tests our Array extension
-class ArrayTest < Minitest::Test
-  test 'Arrays should be extended with #permutations' do
-    assert [].respond_to?(:permutations)
-  end
-
-  test 'Array#permutations should calculate permutations correctly' do
-    array = [1, 2, 3]
-    permutations = [[1, 2, 3], [1, 3, 2], [2, 1, 3], [2, 3, 1], [3, 1, 2], [3, 2, 1]]
-    assert_equal array.length.factorial, array.permutations.length
-    assert_equal permutations.sort, array.permutations.sort
-  end
-
-  test 'Array#permutations should permute duplicates' do
-    array = [1, 1]
-    assert_equal [[1, 1], [1, 1]], array.permutations
-  end
-end

data/test/concerns/working_days_test.rb

@@ -1,148 +0,0 @@
-require 'test_helper'
-
-# This tests our WorkingDays Time/Date/DateTime extension
-class WorkingDaysTest < Minitest::Test
-  def setup
-    @normal_date      = Date.parse('2015-02-02')          # Monday 2nd Feb 2015
-    @normal_time      = Time.parse('2015-02-02 2pm')      # Monday 2nd Feb 2015
-    @normal_date_time = DateTime.parse('2015-02-02 11am') # Monday 2nd Feb 2015
-
-    @easter_date      = Date.parse('2015-04-06')          # Easter Monday, 2015
-    @easter_time      = Time.parse('2015-04-06 2pm')      # Easter Monday, 2015
-    @easter_date_time = DateTime.parse('2015-04-06 11am') # Easter Monday, 2015
-  end
-
-  test 'should identify weekdays' do
-    assert Date.parse('2015-12-25').weekday?
-    assert Time.parse('2015-12-25 3pm').weekday?
-    assert DateTime.parse('2015-12-25 3pm').weekday?
-
-    refute Date.parse('2015-12-26').weekday?
-    refute Time.parse('2015-12-26 3pm').weekday?
-    refute DateTime.parse('2015-12-26 3pm').weekday?
-  end
-
-  test 'should identify bank holidays' do
-    assert Date.parse('2015-12-25').public_holiday?
-    assert Time.parse('2015-12-25 3pm').public_holiday?
-    assert DateTime.parse('2015-12-25 3pm').public_holiday?
-
-    # Boxing Day 2015 is a Saturday; the bank holiday a
-    # substitute day, on the following Monday:
-    refute Date.parse('2015-12-26').public_holiday?
-    refute Time.parse('2015-12-26 3pm').public_holiday?
-    refute DateTime.parse('2015-12-26 3pm').public_holiday?
-
-    assert Date.parse('2015-12-28').public_holiday?
-    assert Time.parse('2015-12-28 3pm').public_holiday?
-    assert DateTime.parse('2015-12-28 3pm').public_holiday?
-  end
-
-  test 'should allow comparison of Time and DateTime' do
-    @normal_time.working_days_until(@normal_date_time)
-    @normal_date_time.working_days_until(@normal_time)
-  end
-
-  test 'should allow comparison of DateTime and Date' do
-    @normal_date_time.working_days_until(@normal_date)
-    @normal_date.working_days_until(@normal_date_time)
-  end
-
-  test 'should be zero working days between same normal day' do
-    assert_equal 0, @normal_date.working_days_until(@normal_date)
-    assert_equal 0, @normal_time.working_days_until(@normal_time + 6.hours)
-    assert_equal 0, @normal_date_time.working_days_until(@normal_date_time + 6.hours)
-  end
-
-  test 'Monday -> Friday should be 4 working days' do
-    assert_equal 4, @normal_date.working_days_until(@normal_date + 4.days)
-    assert_equal 4, @normal_time.working_days_until(@normal_time + 4.days)
-    assert_equal 4, @normal_date_time.working_days_until(@normal_date_time + 4.days)
-  end
-
-  test 'Friday <- Monday should be -4 working days' do
-    assert_equal(-4, (@normal_date + 4.days).working_days_until(@normal_date))
-    assert_equal(-4, (@normal_time + 4.days).working_days_until(@normal_time))
-    assert_equal(-4, (@normal_date_time + 4.days).working_days_until(@normal_date_time))
-  end
-
-  test 'Saturday -> Sunday should be 0 working days' do
-    assert_equal 0, (@normal_date - 2.days).working_days_until(@normal_date - 1.day)
-    assert_equal 0, (@normal_time - 2.days).working_days_until(@normal_time - 1.day)
-    assert_equal 0, (@normal_date_time - 2.days).working_days_until(@normal_date_time - 1.day)
-  end
-
-  test 'Sunday <- Saturday should be 0 working days' do
-    assert_equal 0, (@normal_date - 1.day).working_days_until(@normal_date - 2.days)
-    assert_equal 0, (@normal_time - 1.day).working_days_until(@normal_time - 2.days)
-    assert_equal 0, (@normal_date_time - 1.day).working_days_until(@normal_date_time - 2.days)
-  end
-
-  test 'Monday -> next Monday should be 5 working days' do
-    assert_equal 5, @normal_date.working_days_until(@normal_date + 7.days)
-    assert_equal 5, @normal_time.working_days_until(@normal_time + 7.days)
-    assert_equal 5, @normal_date_time.working_days_until(@normal_date_time + 7.days)
-  end
-
-  test 'Monday -> Easter Monday should be 3 working days' do
-    assert_equal 3, (@easter_date - 7.days).working_days_until(@easter_date)
-    assert_equal 3, (@easter_time - 7.days).working_days_until(@easter_time)
-    assert_equal 3, (@easter_date_time - 7.days).working_days_until(@easter_date_time)
-  end
-
-  test 'Tuesday -> Tuesday over Easter should be 3 working days' do
-    assert_equal 3, (@easter_date - 6.days).working_days_until(@easter_date + 1.day)
-    assert_equal 3, (@easter_time - 6.days).working_days_until(@easter_time + 1.day)
-    assert_equal 3, (@easter_date_time - 6.days).working_days_until(@easter_date_time + 1.day)
-  end
-
-  test 'Good Friday -> Friday should be 4 working days' do
-    assert_equal 4, (@easter_date - 3.days).working_days_until(@easter_date + 4.day)
-    assert_equal 4, (@easter_time - 3.days).working_days_until(@easter_time + 4.day)
-    assert_equal 4, (@easter_date_time - 3.days).working_days_until(@easter_date_time + 4.day)
-  end
-
-  test 'Friday -> Monday should be 1 working day' do
-    assert_equal 1, (@normal_date - 3.days).working_days_until(@normal_date)
-    assert_equal 1, (@normal_time - 3.days).working_days_until(@normal_time)
-    assert_equal 1, (@normal_date_time - 3.days).working_days_until(@normal_date_time)
-  end
-
-  test 'A year of week days' do
-    assert_equal 261, @normal_date.weekdays_until(@normal_date + 1.year)
-    assert_equal 261, @normal_time.weekdays_until(@normal_time + 1.year)
-    assert_equal 261, @normal_date_time.weekdays_until(@normal_date_time + 1.year)
-  end
-
-  test 'A year of working days' do
-    assert_equal 253, @normal_date.working_days_until(@normal_date + 1.year)
-    assert_equal 253, @normal_time.working_days_until(@normal_time + 1.year)
-    assert_equal 253, @normal_date_time.working_days_until(@normal_date_time + 1.year)
-  end
-
-  test 'against GOV.UK holidays' do
-    require 'net/http'
-    require 'json'
-
-    url = 'https://www.gov.uk/bank-holidays/england-and-wales.json'
-    response = Net::HTTP.get(URI(url))
-
-    events = JSON.parse(response)['events']
-    missing_holidays = events.collect do |event|
-      event_date = event['date']
-      parsed_date = Date.parse(event_date)
-      if parsed_date.public_holiday?
-        nil
-      else
-        [event_date, format("    '%<date>s', # %<day>-9s - %<title>s",
-                            date: event_date, day: parsed_date.strftime('%A'),
-                            title: event['title'])]
-      end
-    end.compact
-    if missing_holidays.any?
-      flunk (["#{missing_holidays.collect(&:first).join(', ')} should be public holidays in " \
-              'lib/ndr_support/concerns/working_days.rb:'] +
-             missing_holidays.collect(&:last)).join("\n")
-    end
-  end
-end

data/test/date_and_time_extensions_test.rb

@@ -1,56 +0,0 @@
-require 'test_helper'
-
-# This tests our various date and time class extensions
-# Note that these will probably all need to be changed in a major bump of ndr_support
-# once we've moved everything to Rails 7.
-class DateAndTimeExtensionsTest < Minitest::Test
-  def test_date_to_s
-    d = Date.new(2000, 2, 1)
-    assert_equal '2000-02-01', d.to_default_s, 'Rails 7 default to_s'
-    assert_equal '01.02.2000', d.to_formatted_s(:default), 'Rails 6 default to_s'
-    assert_equal d.to_formatted_s(:default), d.to_s,
-                 'We plan to change default to_s behaviour in a major version bump'
-  end
-
-  def test_datetime_to_s
-    bst_datetime = DateTime.new(2014, 4, 1, 0, 0, 0, '+1')
-    assert_equal '2014-04-01T00:00:00+01:00', bst_datetime.to_default_s, 'Rails 7 default to_s'
-    assert_equal '01.04.2014', bst_datetime.to_formatted_s(:default), 'Rails 6 default to_s'
-    assert_equal bst_datetime.to_formatted_s(:default), bst_datetime.to_s,
-                 'We plan to change default to_s behaviour in a major version bump'
-
-    gmt_datetime = DateTime.new(2014, 3, 1, 0, 0, 0, '+0')
-    assert_equal '2014-03-01T00:00:00+00:00', gmt_datetime.to_default_s, 'Rails 7 default to_s'
-    assert_equal '01.03.2014', gmt_datetime.to_formatted_s(:default), 'Rails 6 default to_s'
-    assert_equal gmt_datetime.to_formatted_s(:default), gmt_datetime.to_s,
-                 'We plan to change default to_s behaviour in a major version bump'
-
-    datetime_with_hhmmss = DateTime.new(2014, 4, 1, 12, 35, 11, '+0')
-    assert_equal '2014-04-01T12:35:11+00:00', datetime_with_hhmmss.to_default_s,
-                 'Rails 7 default to_s'
-    assert_equal '01.04.2014 12:35', datetime_with_hhmmss.to_formatted_s(:default),
-                 'Rails 6 default to_s'
-    assert_equal datetime_with_hhmmss.to_formatted_s(:default), datetime_with_hhmmss.to_s,
-                 'We plan to change default to_s behaviour in a major version bump'
-  end
-
-  def test_time_to_s
-    time = Time.new(2014, 4, 1, 12, 35, 11.5, '+01:00')
-    assert_equal '2014-04-01 12:35:11 +0100', time.to_default_s, 'Rails 7 default to_s'
-    assert_equal '01.04.2014 12:35', time.to_formatted_s(:default), 'Rails 6 default to_s'
-    assert_equal time.to_formatted_s(:default), time.to_s,
-                 'We plan to change default to_s behaviour in a major version bump'
-  end
-
-  def test_time_with_zone_to_s
-    time_with_zone = Time.find_zone('Europe/London').local(2014, 4, 1, 12, 35, 11.5)
-    assert_equal 'BST', time_with_zone.zone
-    # Without ndr_support extensions, we'd expect "2014-04-01 12:35:11 +0100"
-    # but we have to trick the database into assuming all times are UTC to retain local time
-    assert_equal '2014-04-01 12:35:11 UTC', time_with_zone.to_default_s,
-                 'Rails 7 default to_s with our date and time formatting'
-    assert_equal '01.04.2014 12:35', time_with_zone.to_formatted_s(:default), 'Rails 6 default to_s'
-    assert_equal time_with_zone.to_formatted_s(:default), time_with_zone.to_s,
-                 'We plan to change default to_s behaviour in a major version bump'
-  end
-end