From 91a1864a535ce5ef320fde7c6d22a1daa6bd8b46 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 20 Jun 2013 18:00:31 +1000 Subject: [PATCH] fix invalid tests due to formatting rule changes --- test/javascripts/components/formatter_test.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/javascripts/components/formatter_test.js b/test/javascripts/components/formatter_test.js index 0bdc4d5135f..1895ca24638 100644 --- a/test/javascripts/components/formatter_test.js +++ b/test/javascripts/components/formatter_test.js @@ -40,9 +40,9 @@ test("formating medium length dates", function() { } leaveAgo = true; - equal(strip(formatMins(1.4)), "1 minute ago"); - equal(strip(formatMins(2)), "2 minutes ago"); - equal(strip(formatMins(56)), "56 minutes ago"); + equal(strip(formatMins(1.4)), "1 min ago"); + equal(strip(formatMins(2)), "2 mins ago"); + equal(strip(formatMins(56)), "56 mins ago"); equal(strip(formatMins(57)), "1 hour ago"); equal(strip(formatHours(4)), "4 hours ago"); equal(strip(formatHours(22)), "22 hours ago"); @@ -51,9 +51,9 @@ test("formating medium length dates", function() { leaveAgo = false; equal(strip(formatMins(0)), "just now"); - equal(strip(formatMins(1.4)), "1 minute"); - equal(strip(formatMins(2)), "2 minutes"); - equal(strip(formatMins(56)), "56 minutes"); + equal(strip(formatMins(1.4)), "1 min"); + equal(strip(formatMins(2)), "2 mins"); + equal(strip(formatMins(56)), "56 mins"); equal(strip(formatMins(57)), "1 hour"); equal(strip(formatHours(4)), "4 hours"); equal(strip(formatHours(22)), "22 hours"); @@ -117,5 +117,5 @@ test("updateRelativeAge", function(){ Discourse.Formatter.updateRelativeAge($elem); - equal($elem.html(), "2 minutes ago"); + equal($elem.html(), "2 mins ago"); });