Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Fix admin time helpers and tooltip (#13207)

Jawaria Waris37cf06082cd6
diff --git a/admin/app/helpers/spree/admin/base_helper.rb b/admin/app/helpers/spree/admin/base_helper.rb
index 760eca0ed8..c9a9967c40 100644
--- a/admin/app/helpers/spree/admin/base_helper.rb
+++ b/admin/app/helpers/spree/admin/base_helper.rb
@@ -336,12 +336,13 @@ module Spree
# @param time [Time] the time to format
# @return [String] the local time ago
def spree_time_ago(time, options = {})
+ return '' if time.blank?
options[:data] ||= {}
options[:data][:controller] = 'tooltip'
# Generate the time ago element with tooltip
content_tag(:span, options) do
- tooltip_text = strip_tags(spree_time(time))
+ tooltip_text = spree_time(time)
local_time_ago(time, class: '', title: nil) + tooltip(tooltip_text)
end
end
diff --git a/admin/spec/helpers/spree/admin/base_helper_spec.rb b/admin/spec/helpers/spree/admin/base_helper_spec.rb
index 5a11a5f40e..ebb0d00164 100644
--- a/admin/spec/helpers/spree/admin/base_helper_spec.rb
+++ b/admin/spec/helpers/spree/admin/base_helper_spec.rb
@@ -20,4 +20,17 @@ describe Spree::Admin::BaseHelper do
end
end
end
+
+ describe '#spree_time_ago' do
+ it 'returns the local time ago with a tooltip' do
+ time = Time.zone.parse('2025-10-21 12:00')
+ html = helper.spree_time_ago(time)
+ expect(html).to include('<time datetime="2025-10-21T12:00')
+ expect(html).to include('tooltip-container')
+ end
+
+ it 'returns empty string for blank time' do
+ expect(helper.spree_time_ago(nil)).to eq('')
+ end
+ end
end