Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Removed timecop in favour of Rails time helpers (#15023)
Damian Legawiecb2ac4e5fdf5f
diff --git a/spree/api/spec/controllers/concerns/spree/api/v3/http_caching_spec.rb b/spree/api/spec/controllers/concerns/spree/api/v3/http_caching_spec.rbindex e83b79eb46..c53e7d24fe 100644--- a/spree/api/spec/controllers/concerns/spree/api/v3/http_caching_spec.rb+++ b/spree/api/spec/controllers/concerns/spree/api/v3/http_caching_spec.rb@@ -106,7 +106,7 @@ RSpec.describe Spree::Api::V3::Store::ProductsController, type: :controller doget :indexoriginal_etag = response.headers['ETag']- Timecop.travel(1.minute.from_now) do+ travel(1.minute) doproduct.update!(name: 'Updated Product Name')get :indexdiff --git a/spree/api/spec/controllers/spree/api/v3/admin/auth_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/auth_controller_spec.rbindex c0f0ad1264..ef9b5fa27e 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/auth_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/auth_controller_spec.rb@@ -583,7 +583,7 @@ RSpec.describe Spree::Api::V3::Admin::AuthController, type: :controller doendit 'rejects an expired state' do- expired = Timecop.travel(20.minutes.ago) { state_for('entra') }+ expired = travel_to(20.minutes.ago) { state_for('entra') }get :callback, params: { provider: 'entra', code: 'auth-code', state: expired }diff --git a/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rbindex 0c0fc34bf7..fb8b5756a5 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rb@@ -1186,7 +1186,7 @@ RSpec.describe Spree::Api::V3::Admin::ProductsController, type: :controller doendit 'persists the published_at window submitted with the channel' do- Timecop.freeze do+ freeze_time dofuture = 2.days.from_now.change(usec: 0)patch :update, params: {@@ -1923,7 +1923,7 @@ RSpec.describe Spree::Api::V3::Admin::ProductsController, type: :controller doproduct_old_updated_at = product.reload.updated_atsecond_product_old_updated_at = second_product.reload.updated_at- Timecop.travel(1.second) do+ travel(1.second) dopost :bulk_add_to_categories, params: {ids: [product.prefixed_id, second_product.prefixed_id],category_ids: [category.prefixed_id]@@ -1937,7 +1937,7 @@ RSpec.describe Spree::Api::V3::Admin::ProductsController, type: :controller doit 'touches the category' docategory_old_updated_at = category.reload.updated_at- Timecop.travel(1.second) do+ travel(1.second) dopost :bulk_add_to_categories, params: {ids: [product.prefixed_id],category_ids: [category.prefixed_id]@@ -1988,7 +1988,7 @@ RSpec.describe Spree::Api::V3::Admin::ProductsController, type: :controller doproduct_old_updated_at = product.reload.updated_atsecond_product_old_updated_at = second_product.reload.updated_at- Timecop.travel(1.second) do+ travel(1.second) dopost :bulk_remove_from_categories, params: {ids: [product.prefixed_id, second_product.prefixed_id],category_ids: [category.prefixed_id]@@ -2003,7 +2003,7 @@ RSpec.describe Spree::Api::V3::Admin::ProductsController, type: :controller docategory_old_updated_at = category.reload.updated_atother_category_old_updated_at = other_category.reload.updated_at- Timecop.travel(1.second) do+ travel(1.second) dopost :bulk_remove_from_categories, params: {ids: [product.prefixed_id],category_ids: [category.prefixed_id, other_category.prefixed_id]diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rbindex 2b8f3752e1..b3b1078224 100644--- a/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/store/carts_controller_spec.rb@@ -1003,7 +1003,7 @@ RSpec.describe Spree::Api::V3::Store::CartsController, type: :controller dopatch :update, params: { id: order.prefixed_id, email: '[email protected]', shipping_address: address_params }original_expiry = Spree::StockReservation.for_order(order).maximum(:expires_at)- Timecop.freeze(2.minutes.from_now) do+ travel_to(2.minutes.from_now) dopatch :update, params: { id: order.prefixed_id, customer_note: 'please ring bell' }enddiff --git a/spree/api/spec/controllers/spree/api/v3/webhooks/payments_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/webhooks/payments_controller_spec.rbindex fdc1899e31..4726575e11 100644--- a/spree/api/spec/controllers/spree/api/v3/webhooks/payments_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/webhooks/payments_controller_spec.rb@@ -114,7 +114,7 @@ RSpec.describe Spree::Api::V3::Webhooks::PaymentsController, type: :controller dendit 'enqueues HandleWebhookJob with a delay' do- Timecop.freeze do+ freeze_time doexpect {post :create, params: { payment_method_id: payment_method.prefixed_id }}.to have_enqueued_job(Spree::Payments::HandleWebhookJob)diff --git a/spree/api/spec/services/spree/webhooks/deliver_webhook_spec.rb b/spree/api/spec/services/spree/webhooks/deliver_webhook_spec.rbindex a6f636f5dd..4080a4f609 100644--- a/spree/api/spec/services/spree/webhooks/deliver_webhook_spec.rb+++ b/spree/api/spec/services/spree/webhooks/deliver_webhook_spec.rb@@ -46,7 +46,7 @@ module Spreeendit 'signs the body that was actually sent' do- Timecop.freeze do+ freeze_time dodescribed_class.call(delivery: delivery, secret_key: secret_key)expect(WebMock).to have_requested(:post, delivery.url).with { |req|@@ -93,7 +93,7 @@ module Spreeendit 'includes HMAC signature with timestamp in headers' do- Timecop.freeze do+ freeze_time dotimestamp = Time.current.to_ipayload_json = delivery.payload.to_jsonexpected_signature = OpenSSL::HMAC.hexdigest('SHA256', secret_key, "#{timestamp}.#{payload_json}")@@ -324,7 +324,7 @@ module Spreeendit 'signs the body that was actually sent' do- Timecop.freeze do+ freeze_time dodescribed_class.call(delivery: delivery, secret_key: secret_key)expect(WebMock).to have_requested(:post, delivery.url).with { |req|diff --git a/spree/api/spec/spec_helper.rb b/spree/api/spec/spec_helper.rbindex 6d9763f992..5ae9dc3778 100644--- a/spree/api/spec/spec_helper.rb+++ b/spree/api/spec/spec_helper.rb@@ -81,6 +81,7 @@ RSpec.configure do |config|config.include FactoryBot::Syntax::Methodsconfig.include Spree::TestingSupport::Preferencesconfig.include Spree::TestingSupport::ImageHelpers+ config.include ActiveSupport::Testing::TimeHelpersconfig.before(:suite) doSpree::Events.disable!diff --git a/spree/api/spec/support/deterministic_openapi.rb b/spree/api/spec/support/deterministic_openapi.rbindex f1aa2f1dbe..42a840cf85 100644--- a/spree/api/spec/support/deterministic_openapi.rb+++ b/spree/api/spec/support/deterministic_openapi.rb@@ -10,7 +10,6 @@# unless the API itself changed. Nothing here is loaded by a normal spec run —# the suite keeps its random names and real clock.if ENV['OPENAPI'] == 'true'- require 'timecop'require 'securerandom'require 'digest/md5'require 'ffaker'@@ -113,12 +112,8 @@ if ENV['OPENAPI'] == 'true'SecureRandom.singleton_class.prepend(Spree::OpenAPIDeterminism::PredictableSecureRandom)RSpec.configure do |config|- config.before(:suite) do- Timecop.freeze(Spree::OpenAPIDeterminism::FROZEN_TIME)- end-- config.after(:suite) do- Timecop.return+ config.before do+ travel_to(Spree::OpenAPIDeterminism::FROZEN_TIME)end# Reset before each example rather than once for the run, so a value showndiff --git a/spree/common_spree_dependencies.rb b/spree/common_spree_dependencies.rbindex 496d3c32af..8923761651 100644--- a/spree/common_spree_dependencies.rb+++ b/spree/common_spree_dependencies.rb@@ -37,7 +37,6 @@ group :test dogem 'simplecov', '~> 0.22.0'gem 'simplecov-cobertura'gem 'webmock'- gem 'timecop'# N+1 tripwire for API requests (see Spree::Api::V3::BaseController).# pg_query is Prosopite's SQL fingerprinter for every adapter but MySQL.# It has a C extension and no JRuby build, so it is scoped like thediff --git a/spree/core/lib/spree/testing_support/lifecycle_events.rb b/spree/core/lib/spree/testing_support/lifecycle_events.rbindex 5b756a1621..121fe8625d 100644--- a/spree/core/lib/spree/testing_support/lifecycle_events.rb+++ b/spree/core/lib/spree/testing_support/lifecycle_events.rb@@ -23,9 +23,7 @@ shared_examples_for 'lifecycle events' do |factory: nil, event_prefix: nil|# update_attribute, not update!: Spree::Fulfillment#update! shadows the# Active Record method with the legacy state-recalculation API.- Timecop.travel(1.minute.from_now) do- record.update_attribute(:updated_at, Time.current)- end+ record.update_attribute(:updated_at, 1.minute.from_now)endit 'does not publish updated event on a bare touch' dodiff --git a/spree/core/spec/jobs/spree/maintenance_tasks/run_job_spec.rb b/spree/core/spec/jobs/spree/maintenance_tasks/run_job_spec.rbindex 37899699a8..92bc68e207 100644--- a/spree/core/spec/jobs/spree/maintenance_tasks/run_job_spec.rb+++ b/spree/core/spec/jobs/spree/maintenance_tasks/run_job_spec.rb@@ -14,7 +14,7 @@ RSpec.describe Spree::MaintenanceTasks::RunJob, type: :job do# in for an operator clicking the button mid-run.cattr_accessor :request_after, default: nilcattr_accessor :request_status, default: nil- cattr_accessor :seconds_per_item, default: nil+ cattr_accessor :tick, default: nilcattr_accessor :statuses_seen, default: []cattr_accessor :fail_in, default: nil@@ -36,7 +36,7 @@ RSpec.describe Spree::MaintenanceTasks::RunJob, type: :job doraise ArgumentError, 'boom' if self.class.raise_on == product.idself.class.statuses_seen << run.class.where(id: run.id).pick(:status)- Timecop.travel(self.class.seconds_per_item.seconds) if self.class.seconds_per_item+ self.class.tick&.callreturn tally(:would_update) if dry_run?@@ -53,7 +53,7 @@ RSpec.describe Spree::MaintenanceTasks::RunJob, type: :job doSpecMaintenanceTask.raise_on = nilSpecMaintenanceTask.request_after = nilSpecMaintenanceTask.request_status = nil- SpecMaintenanceTask.seconds_per_item = nil+ SpecMaintenanceTask.tick = nilSpecMaintenanceTask.statuses_seen = []SpecMaintenanceTask.fail_in = nilSpree.maintenance_tasks << 'SpecMaintenanceTask'@@ -238,11 +238,9 @@ RSpec.describe Spree::MaintenanceTasks::RunJob, type: :job dodescribe 'running time' dolet!(:products) { create_list(:product, 6, store: store) }- after { Timecop.return }-it 'adds each batch once rather than compounding the total' do- Timecop.freeze- SpecMaintenanceTask.seconds_per_item = 5+ freeze_time+ SpecMaintenanceTask.tick = -> { travel(5.seconds) }run = start_rundescribed_class.perform_now(run.id)diff --git a/spree/core/spec/lib/spree/core/pricing/context_spec.rb b/spree/core/spec/lib/spree/core/pricing/context_spec.rbindex 5dba57203c..80f4b3dd9c 100644--- a/spree/core/spec/lib/spree/core/pricing/context_spec.rb+++ b/spree/core/spec/lib/spree/core/pricing/context_spec.rb@@ -75,7 +75,7 @@ module Spreeendit 'defaults date to current time' do- Timecop.freeze do+ freeze_time doexpect(subject.date).to be_within(1.second).of(Time.current)endend@@ -282,7 +282,7 @@ module Spreeendit 'generates a cache key with default values from Spree::Current' do- Timecop.freeze do+ freeze_time doexpected_parts = ['spree','pricing',@@ -311,7 +311,7 @@ module Spreeendit 'includes present optional attributes in correct order' do- Timecop.freeze do+ freeze_time doexpected_parts = ['spree','pricing',diff --git a/spree/core/spec/lib/spree/reporting/query_spec.rb b/spree/core/spec/lib/spree/reporting/query_spec.rbindex 12d175615e..8cd716d1c5 100644--- a/spree/core/spec/lib/spree/reporting/query_spec.rb+++ b/spree/core/spec/lib/spree/reporting/query_spec.rb@@ -737,7 +737,7 @@ RSpec.describe Spree::Reporting::Query do# back, never with a neighbour. Frozen on the last day of a quarter,# where the range is three whole months and a plain day shift would# start the previous period on March 31.- around { |example| Timecop.freeze(Time.zone.parse('2026-09-30 12:00')) { example.run } }+ around { |example| travel_to(Time.zone.parse('2026-09-30 12:00')) { example.run } }let(:from) { 2.months.ago.beginning_of_month.to_date }let!(:recent_order) { create(:completed_order_with_totals, store: store, completed_at: (from + 45).in_time_zone.change(hour: 12)) }@@ -924,7 +924,7 @@ RSpec.describe Spree::Reporting::Query dolet!(:order) { create(:completed_order_with_totals, store: store, completed_at: midday) }it 'buckets sales by hour in the store timezone' do- result = Timecop.freeze(midday + 1.hour) do+ result = travel_to(midday + 1.hour) dorun(metrics: %w[orders], dimensions: [{ name: 'completed_at', grain: 'hour' }],time_range: { preset: 'today' })enddiff --git a/spree/core/spec/lib/spree/uploads_spec.rb b/spree/core/spec/lib/spree/uploads_spec.rbindex 528a453ab2..f65418be49 100644--- a/spree/core/spec/lib/spree/uploads_spec.rb+++ b/spree/core/spec/lib/spree/uploads_spec.rb@@ -68,7 +68,7 @@ RSpec.describe Spree::Uploads doit 'mints a reference that stops resolving after a day' dosigned_id = described_class.signed_id_for(create_blob)- Timecop.travel(25.hours.from_now) do+ travel(25.hours) doexpect(ActiveStorage::Blob.find_signed(signed_id)).to be_nilendenddiff --git a/spree/core/spec/models/concerns/spree/purchase/store_credits_spec.rb b/spree/core/spec/models/concerns/spree/purchase/store_credits_spec.rbindex e18bb8a814..a4413dda77 100644--- a/spree/core/spec/models/concerns/spree/purchase/store_credits_spec.rb+++ b/spree/core/spec/models/concerns/spree/purchase/store_credits_spec.rb@@ -93,13 +93,10 @@ RSpec.shared_examples 'a store credits host' dolet(:record) { new_record(customer: older_store_credit.customer, total: record_total) }before do- Timecop.scale(3600)subjectrecord.reloadend- after { Timecop.return }-it 'spends the oldest store credit first' doolder_payment = record.payments.firstnewer_payment = record.payments.lastdiff --git a/spree/core/spec/models/spree/admin_user_spec.rb b/spree/core/spec/models/spree/admin_user_spec.rbindex f9d512dd07..396edff965 100644--- a/spree/core/spec/models/spree/admin_user_spec.rb+++ b/spree/core/spec/models/spree/admin_user_spec.rb@@ -47,7 +47,7 @@ describe Spree.admin_user_class, type: :model doadmin_user.deactivate!first = admin_user.reload.deactivated_at- Timecop.travel(1.hour.from_now) { admin_user.deactivate! }+ travel(1.hour) { admin_user.deactivate! }expect(admin_user.reload.deactivated_at).to eq(first)enddiff --git a/spree/core/spec/models/spree/channel_spec.rb b/spree/core/spec/models/spree/channel_spec.rbindex 1c278f1190..49994aebfe 100644--- a/spree/core/spec/models/spree/channel_spec.rb+++ b/spree/core/spec/models/spree/channel_spec.rb@@ -197,7 +197,7 @@ RSpec.describe Spree::Channel, type: :model dochannel.update_column(:updated_at, 1.day.ago)old_updated_at = channel.reload.updated_at- Timecop.travel(1.second) do+ travel(1.second) dochannel.add_products([product.id])end@@ -228,7 +228,7 @@ RSpec.describe Spree::Channel, type: :model dochannel.update_column(:updated_at, 1.day.ago)old_updated_at = channel.reload.updated_at- Timecop.travel(1.second) do+ travel(1.second) dochannel.remove_products([product.id])enddiff --git a/spree/core/spec/models/spree/credit_card_spec.rb b/spree/core/spec/models/spree/credit_card_spec.rbindex 3212b089cf..a891f72baa 100644--- a/spree/core/spec/models/spree/credit_card_spec.rb+++ b/spree/core/spec/models/spree/credit_card_spec.rb@@ -378,7 +378,7 @@ describe Spree::CreditCard, type: :model docontext 'Scopes' dodescribe '#not_expired' do- around { |example| Timecop.freeze(Time.current.change(month: 6, day: 15)) { example.run } }+ around { |example| travel_to(Time.current.change(month: 6, day: 15)) { example.run } }let(:previous_year) { DateTime.now.year - 1 }let(:current_year) { DateTime.now.year }diff --git a/spree/core/spec/models/spree/customer_marketing_consent_spec.rb b/spree/core/spec/models/spree/customer_marketing_consent_spec.rbindex cf21de2018..79a74d8f65 100644--- a/spree/core/spec/models/spree/customer_marketing_consent_spec.rb+++ b/spree/core/spec/models/spree/customer_marketing_consent_spec.rb@@ -6,7 +6,7 @@ RSpec.describe 'Spree::Customer marketing consent' doit 'records when consent was given' dostamped_at = customer.email_marketing_consent_updated_at- Timecop.travel(1.hour.from_now) do+ travel(1.hour) docustomer.update!(accepts_email_marketing: true)end@@ -17,7 +17,7 @@ RSpec.describe 'Spree::Customer marketing consent' docustomer.update!(accepts_email_marketing: true)given_at = customer.email_marketing_consent_updated_at- Timecop.travel(1.hour.from_now) do+ travel(1.hour) docustomer.update!(accepts_email_marketing: false)enddiff --git a/spree/core/spec/models/spree/digital_asset_spec.rb b/spree/core/spec/models/spree/digital_asset_spec.rbindex 12bde8f64f..a3d944f2c1 100644--- a/spree/core/spec/models/spree/digital_asset_spec.rb+++ b/spree/core/spec/models/spree/digital_asset_spec.rb@@ -107,7 +107,7 @@ describe Spree::DigitalAsset, type: :model doexpect(digital_asset).to receive(:publish_event).with('digital.updated')expect(digital_asset).to receive(:publish_event).with('digital_asset.updated')- Timecop.travel(1.minute.from_now) { digital_asset.update_attribute(:updated_at, Time.current) }+ travel(1.minute) { digital_asset.update_attribute(:updated_at, Time.current) }endit 'does not emit either name on a bare touch' dodiff --git a/spree/core/spec/models/spree/digital_link_spec.rb b/spree/core/spec/models/spree/digital_link_spec.rbindex 2631e5dcc9..cc0519f426 100644--- a/spree/core/spec/models/spree/digital_link_spec.rb+++ b/spree/core/spec/models/spree/digital_link_spec.rb@@ -32,7 +32,7 @@ describe Spree::DigitalLink, type: :model doendit 'resets created_at timestamp' do- Timecop.travel Time.current + 1.day do+ travel 1.day doexpect dodigital_link.reset!digital_link.reload@@ -146,7 +146,7 @@ describe Spree::DigitalLink, type: :model doendit 'touches the digital_link when autorized' do- Timecop.travel Time.current + 1.day do+ travel 1.day doexpect dodigital_link.authorize!digital_link.reload@@ -155,7 +155,7 @@ describe Spree::DigitalLink, type: :model doendit 'does not touch the digital_link if not authorized' do- Timecop.travel Time.current + 1.day do+ travel 1.day doexpect dodigital_link_expired.authorize!digital_link_expired.reloaddiff --git a/spree/core/spec/models/spree/gift_card_batch_spec.rb b/spree/core/spec/models/spree/gift_card_batch_spec.rbindex 3bb1940776..f0098b858e 100644--- a/spree/core/spec/models/spree/gift_card_batch_spec.rb+++ b/spree/core/spec/models/spree/gift_card_batch_spec.rb@@ -20,7 +20,7 @@ RSpec.describe Spree::GiftCardBatch, type: :model doexpect(record).to receive(:publish_event).with('gift_card_batch.updated')allow(record).to receive(:publish_event).with(anything)- Timecop.travel(1.minute.from_now) do+ travel(1.minute) dorecord.update_attribute(:updated_at, Time.current)endenddiff --git a/spree/core/spec/models/spree/option_value_spec.rb b/spree/core/spec/models/spree/option_value_spec.rbindex 0fe6febaad..2747d4ba8a 100644--- a/spree/core/spec/models/spree/option_value_spec.rb+++ b/spree/core/spec/models/spree/option_value_spec.rb@@ -20,7 +20,7 @@ describe Spree::OptionValue, type: :model dolet!(:variant2) { create(:variant, option_values: [option_value]) }it 'touches all variants associated with the option value' do- Timecop.travel Time.current + 1.day do+ travel 1.day doexpect { option_value.send(:touch_all_variants) }.to change { [variant1.reload.updated_at, variant2.reload.updated_at] }endenddiff --git a/spree/core/spec/models/spree/order_spec.rb b/spree/core/spec/models/spree/order_spec.rbindex 73e9dfeeb8..f1bdfce1dc 100644--- a/spree/core/spec/models/spree/order_spec.rb+++ b/spree/core/spec/models/spree/order_spec.rb@@ -258,7 +258,7 @@ describe Spree::Order, type: :model docontext 'when canceled_at is not given' doit 'saves canceled_at to Time.current' do- Timecop.freeze(Time.current) do+ freeze_time dosubjectexpect(order.reload.canceled_at.to_s).to eq Time.current.to_sexpect(Spree::Deprecation).to have_received(:warn).with(/Order#canceled_by is deprecated/)@@ -268,7 +268,7 @@ describe Spree::Order, type: :model docontext 'when canceled_at is given' doit 'saves canceled_at to given time' do- Timecop.freeze(Time.current) do+ freeze_time doorder.canceled_by(admin_user, Time.current - 1.day)expect(order.reload.canceled_at.to_s).to eq (Time.current - 1.day).to_senddiff --git a/spree/core/spec/models/spree/pricing_provider/internal_resolution_spec.rb b/spree/core/spec/models/spree/pricing_provider/internal_resolution_spec.rbindex e6dda2dfbc..c75529f711 100644--- a/spree/core/spec/models/spree/pricing_provider/internal_resolution_spec.rb+++ b/spree/core/spec/models/spree/pricing_provider/internal_resolution_spec.rb@@ -114,7 +114,7 @@ describe Spree::PricingProvider::Internal::Resolution doit 'returns base price when outside date range' dobase_price = variant.prices.base_prices.with_currency(currency).first- Timecop.travel(2.days.from_now) do+ travel(2.days) doprice = resolver.resolveexpect(price).to eq(base_price)enddiff --git a/spree/core/spec/models/spree/stock_level_spec.rb b/spree/core/spec/models/spree/stock_level_spec.rbindex fc415fde60..e40e50ee5b 100644--- a/spree/core/spec/models/spree/stock_level_spec.rb+++ b/spree/core/spec/models/spree/stock_level_spec.rb@@ -314,11 +314,7 @@ describe Spree::StockLevel, type: :model dodescribe '#after_touch' doit 'touches its variant' do- Timecop.scale(1000) do- expect do- subject.touch- end.to change { subject.variant.updated_at }- end+ expect { travel(1.second) { subject.touch } }.to change { subject.variant.updated_at }endenddiff --git a/spree/core/spec/models/spree/stock_location_spec.rb b/spree/core/spec/models/spree/stock_location_spec.rbindex db7e2e7128..dece041517 100644--- a/spree/core/spec/models/spree/stock_location_spec.rb+++ b/spree/core/spec/models/spree/stock_location_spec.rb@@ -352,7 +352,7 @@ module Spreeit 'touches variants and stock levels' dopending 'active_changed? is always false inside after_update, so nothing is touched'- Timecop.travel(1.minute.from_now) do+ travel(1.minute) doexpect { subject.update(active: false) }.to change { variant.reload.updated_at }.and change { stock_level.reload.updated_at }end@@ -361,7 +361,7 @@ module Spreecontext 'active has not changed' doit 'does not touch variants' do- Timecop.travel(1.minute.from_now) do+ travel(1.minute) doexpect { subject.update(name: 'my other warehouse') }.not_to change { variant.reload.updated_at }endenddiff --git a/spree/core/spec/models/spree/variant_media_spec.rb b/spree/core/spec/models/spree/variant_media_spec.rbindex e300dd9c4b..c70f80684b 100644--- a/spree/core/spec/models/spree/variant_media_spec.rb+++ b/spree/core/spec/models/spree/variant_media_spec.rb@@ -24,7 +24,7 @@ RSpec.describe Spree::VariantMedia, type: :model dolink = described_class.create!(variant: variant, asset: asset)# MySQL stores DATETIME at second precision, so touching within the same# second as create wouldn't move updated_at. Advance the clock first.- Timecop.travel(Time.current + 1.second) do+ travel(1.second) doexpect { link.touch }.to change { variant.reload.updated_at }endenddiff --git a/spree/core/spec/models/spree/variant_spec.rb b/spree/core/spec/models/spree/variant_spec.rbindex 388615cc9c..3e55367517 100644--- a/spree/core/spec/models/spree/variant_spec.rb+++ b/spree/core/spec/models/spree/variant_spec.rb@@ -1219,9 +1219,7 @@ describe Spree::Variant, type: :model doendit 'changes updated_at' do- Timecop.scale(1000) do- expect { variant.discontinue! }.to change(variant.reload, :updated_at)- end+ expect { travel(1.second) { variant.discontinue! } }.to change(variant.reload, :updated_at)endenddiff --git a/spree/core/spec/services/spree/carts/remove_line_item_spec.rb b/spree/core/spec/services/spree/carts/remove_line_item_spec.rbindex fbcaa6e610..e0f1f1f2d0 100644--- a/spree/core/spec/services/spree/carts/remove_line_item_spec.rb+++ b/spree/core/spec/services/spree/carts/remove_line_item_spec.rb@@ -94,7 +94,7 @@ module Spree)original_expiry = Spree::StockReservation.find_by(line_item_id: other_line_item.id).expires_at- Timecop.freeze(2.minutes.from_now) do+ travel_to(2.minutes.from_now) dosubject.call(cart: cart, line_item: line_item)enddiff --git a/spree/core/spec/services/spree/carts/update_spec.rb b/spree/core/spec/services/spree/carts/update_spec.rbindex 28a675f9a5..1aa2f1176d 100644--- a/spree/core/spec/services/spree/carts/update_spec.rb+++ b/spree/core/spec/services/spree/carts/update_spec.rb@@ -955,7 +955,7 @@ module Spreeit 'extends existing reservations' dooriginal_expiry = Spree::StockReservation.where(cart_id: cart.id).maximum(:expires_at)- Timecop.freeze(2.minutes.from_now) do+ travel_to(2.minutes.from_now) dodescribed_class.call(cart: cart, params: params)enddiff --git a/spree/core/spec/services/spree/newsletter/verify_spec.rb b/spree/core/spec/services/spree/newsletter/verify_spec.rbindex d25ac299fc..4ccb13da84 100644--- a/spree/core/spec/services/spree/newsletter/verify_spec.rb+++ b/spree/core/spec/services/spree/newsletter/verify_spec.rb@@ -13,7 +13,7 @@ module Spreelet(:subscriber) { create(:newsletter_subscriber, :unverified, customer: user) }around do |example|- Timecop.freeze('2137-01-01') { example.run }+ travel_to('2137-01-01') { example.run }endcontext 'with associated user' dodiff --git a/spree/core/spec/services/spree/prices/bulk_upsert_spec.rb b/spree/core/spec/services/spree/prices/bulk_upsert_spec.rbindex 76737d007f..ddd777329b 100644--- a/spree/core/spec/services/spree/prices/bulk_upsert_spec.rb+++ b/spree/core/spec/services/spree/prices/bulk_upsert_spec.rb@@ -94,7 +94,7 @@ RSpec.describe Spree::Prices::BulkUpsert doendit 'touches the variant (and via touch: true, the product) after an upsert' do- Timecop.freeze(Time.current.change(usec: 0)) do+ freeze_time dovariant.update_columns(updated_at: 1.day.ago)product.update_columns(updated_at: 1.day.ago)diff --git a/spree/core/spec/services/spree/products/duplicator_spec.rb b/spree/core/spec/services/spree/products/duplicator_spec.rbindex 5485f87ee3..d084026cc5 100644--- a/spree/core/spec/services/spree/products/duplicator_spec.rb+++ b/spree/core/spec/services/spree/products/duplicator_spec.rb@@ -34,9 +34,7 @@ RSpec.describe Spree::Products::Duplicator doendit 'duplicates already duplicated product' do- Timecop.scale(3600)expect { 3.times { described_class.call(product: product) } }.to change { Spree::Product.count }.by(3)- Timecop.returnendcontext 'when a variant in another store has a matching sku' dodiff --git a/spree/core/spec/services/spree/stock_locations/stock_levels/create_spec.rb b/spree/core/spec/services/spree/stock_locations/stock_levels/create_spec.rbindex a7ba09d9df..3de6045263 100644--- a/spree/core/spec/services/spree/stock_locations/stock_levels/create_spec.rb+++ b/spree/core/spec/services/spree/stock_locations/stock_levels/create_spec.rb@@ -40,7 +40,7 @@ module Spreeendit 'sets the stock location data necessary for the inserted stock levels' do- Timecop.freeze(time_current) do+ travel_to(time_current) doresultexpect(created_stock_level_attrs).to(eq([@@ -55,7 +55,7 @@ module Spreeendit 'invalidates the Variant cache' do- Timecop.freeze(1.hour.from_now) do+ travel_to(1.hour.from_now) doexpect { result }.to change { unrelated_variant.reload.updated_at }endenddiff --git a/spree/core/spec/services/spree/stock_reservations/extend_spec.rb b/spree/core/spec/services/spree/stock_reservations/extend_spec.rbindex 238d6925dc..af142ae9b4 100644--- a/spree/core/spec/services/spree/stock_reservations/extend_spec.rb+++ b/spree/core/spec/services/spree/stock_reservations/extend_spec.rb@@ -9,7 +9,7 @@ describe Spree::StockReservations::Extend dobefore { stub_store_preferences(store, stock_reservations_enabled: true) }it 'pushes expires_at out by the store TTL' do- Timecop.freeze do+ freeze_time dodescribed_class.call(cart: order)expect(reservation.reload.expires_at).to be_within(1.second).of(12.minutes.from_now)enddiff --git a/spree/core/spec/services/spree/stock_reservations/reserve_spec.rb b/spree/core/spec/services/spree/stock_reservations/reserve_spec.rbindex 931f42d406..14939dc093 100644--- a/spree/core/spec/services/spree/stock_reservations/reserve_spec.rb+++ b/spree/core/spec/services/spree/stock_reservations/reserve_spec.rb@@ -31,7 +31,7 @@ describe Spree::StockReservations::Reserve doit 'sets expires_at according to the store TTL' dostore.update!(preferred_stock_reservation_ttl_minutes: 7)- Timecop.freeze do+ freeze_time doresultexpect(Spree::StockReservation.last.expires_at).to be_within(1.second).of(7.minutes.from_now)enddiff --git a/spree/core/spec/services/spree/store_credits/apply_spec.rb b/spree/core/spec/services/spree/store_credits/apply_spec.rbindex b2e97f39f1..47a154de3a 100644--- a/spree/core/spec/services/spree/store_credits/apply_spec.rb+++ b/spree/core/spec/services/spree/store_credits/apply_spec.rb@@ -204,12 +204,6 @@ describe Spree::StoreCredits::Apply, type: :service doendlet(:order) { create(:order, customer: older_store_credit.customer, total: order_total, store: store) }- before do- Timecop.scale(3600)- end-- after { Timecop.return }-it 'spends the oldest store credit first' doexpect(subject).to be_successdiff --git a/spree/core/spec/services/spree/update_check_spec.rb b/spree/core/spec/services/spree/update_check_spec.rbindex 98406db15d..14afd42a28 100644--- a/spree/core/spec/services/spree/update_check_spec.rb+++ b/spree/core/spec/services/spree/update_check_spec.rb@@ -105,7 +105,7 @@ RSpec.describe Spree::UpdateCheck doexpect(described_class.status).to have_attributes(releases: [], update_available?: false)expect(Net::HTTP).to have_received(:start).once- Timecop.travel(61.minutes.from_now) { described_class.status }+ travel(61.minutes) { described_class.status }expect(Net::HTTP).to have_received(:start).twiceendenddiff --git a/spree/core/spec/spec_helper.rb b/spree/core/spec/spec_helper.rbindex 0447a928b9..dc6f89aefc 100644--- a/spree/core/spec/spec_helper.rb+++ b/spree/core/spec/spec_helper.rb@@ -104,6 +104,7 @@ RSpec.configure do |config|config.include Spree::TestingSupport::Preferencesconfig.include Spree::TestingSupport::Kernelconfig.include Spree::TestingSupport::Imports+ config.include ActiveSupport::Testing::TimeHelpersconfig.order = :randomKernel.srand config.seeddiff --git a/spree/core/spec/workflows/spree/customers/anonymize_spec.rb b/spree/core/spec/workflows/spree/customers/anonymize_spec.rbindex b92522f893..f70998d7e4 100644--- a/spree/core/spec/workflows/spree/customers/anonymize_spec.rb+++ b/spree/core/spec/workflows/spree/customers/anonymize_spec.rb@@ -61,7 +61,7 @@ RSpec.describe Spree::Customers::Anonymize dodescribed_class.call(customer: customer, store: store)first_erased_at = customer.reload.anonymized_at- Timecop.travel(1.day.from_now) do+ travel(1.day) dodescribed_class.call(customer: customer.reload, store: store)end