aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorIgor Minar2011-08-12 02:28:45 -0700
committerIgor Minar2011-08-14 23:44:21 -0700
commit37b5c5cfe9df70fa2a2c6c681a903b7c356aec74 (patch)
tree53a01012cd69c194d40325613313450a1285d494 /test
parent966cbd4cf8d795b1706ff400f604c6002d7e81f9 (diff)
downloadangular.js-37b5c5cfe9df70fa2a2c6c681a903b7c356aec74.tar.bz2
break(date): remove support for 'long', 'longtime' date formats and 'z' flag
The support for the 'z' formatting flag was removed becase the timezone info can't be retrieved from the browser apis (except for en-US locale on some but not all browsers). For this reason we don't want to support this flag at all. Related to this, since the 'long' and 'longtime' datetime formats require the 'z' flag in the formatting string, we are removing support for this format as well.
Diffstat (limited to 'test')
-rw-r--r--test/FiltersSpec.js41
-rw-r--r--test/angular-mocksSpec.js6
2 files changed, 7 insertions, 40 deletions
diff --git a/test/FiltersSpec.js b/test/FiltersSpec.js
index a09ef481..2673b36e 100644
--- a/test/FiltersSpec.js
+++ b/test/FiltersSpec.js
@@ -195,8 +195,6 @@ describe('filter', function() {
var noon = new TzDate(+5, '2010-09-03T17:05:08.000Z'); //12pm
var midnight = new TzDate(+5, '2010-09-03T05:05:08.000Z'); //12am
var earlyDate = new TzDate(+5, '0001-09-03T05:05:08.000Z');
- var timZoneDate = new TzDate(+5, '2010-09-03T05:05:08.000Z',
- 'Mon Sep 3 2010 00:05:08 GMT+0500 (XYZ)'); //12am
var context, date;
@@ -225,16 +223,13 @@ describe('filter', function() {
toEqual('10-09-03 07:05:08');
expect(date(midnight, "yyyy-M-d h=H:m:saZ")).
- toEqual('2010-9-3 12=0:5:8am0500');
+ toEqual('2010-9-3 12=0:5:8AM0500');
expect(date(midnight, "yyyy-MM-dd hh=HH:mm:ssaZ")).
- toEqual('2010-09-03 12=00:05:08am0500');
+ toEqual('2010-09-03 12=00:05:08AM0500');
expect(date(noon, "yyyy-MM-dd hh=HH:mm:ssaZ")).
- toEqual('2010-09-03 12=12:05:08pm0500');
-
- expect(date(timZoneDate, "yyyy-MM-dd hh=HH:mm:ss a z")).
- toEqual('2010-09-03 12=00:05:08 am XYZ');
+ toEqual('2010-09-03 12=12:05:08PM0500');
expect(date(noon, "EEE, MMM d, yyyy")).
toEqual('Fri, Sep 3, 2010');
@@ -258,14 +253,11 @@ describe('filter', function() {
it('should accept default formats', function() {
- expect(date(timZoneDate, "long")).
- toEqual('September 3, 2010 12:05:08 am XYZ');
-
expect(date(noon, "medium")).
- toEqual('Sep 3, 2010 12:05:08 pm');
+ toEqual('Sep 3, 2010 12:05:08 PM');
expect(date(noon, "short")).
- toEqual('9/3/10 12:05 pm');
+ toEqual('9/3/10 12:05 PM');
expect(date(noon, "fullDate")).
toEqual('Friday, September 3, 2010');
@@ -279,32 +271,13 @@ describe('filter', function() {
expect(date(noon, "shortDate")).
toEqual('9/3/10');
- expect(date(timZoneDate, "longTime")).
- toEqual('12:05:08 am XYZ');
-
expect(date(noon, "mediumTime")).
- toEqual('12:05:08 pm');
+ toEqual('12:05:08 PM');
expect(date(noon, "shortTime")).
- toEqual('12:05 pm');
+ toEqual('12:05 PM');
});
-
- it('should parse timezone identifier from various toString values', function() {
- //chrome and firefox format
- expect(date(new TzDate(+5, '2010-09-03T17:05:08.000Z',
- 'Mon Sep 3 2010 17:05:08 GMT+0500 (XYZ)'), "z")).toBe('XYZ');
-
- //opera format
- expect(date(new TzDate(+5, '2010-09-03T17:05:08.000Z',
- '2010-09-03T17:05:08Z'), "z")).toBe('0500');
-
- //ie 8 format
- expect(date(new TzDate(+5, '2010-09-03T17:05:08.000Z',
- 'Mon Sep 3 17:05:08 XYZ 2010'), "z")).toBe('XYZ');
- });
-
-
it('should be able to parse ISO 8601 dates/times using', function() {
var isoString = '2010-09-03T05:05:08.872Z';
expect(date(isoString)).
diff --git a/test/angular-mocksSpec.js b/test/angular-mocksSpec.js
index f24f6e57..bf5c7816 100644
--- a/test/angular-mocksSpec.js
+++ b/test/angular-mocksSpec.js
@@ -123,12 +123,6 @@ describe('mocks', function(){
});
- it('should fake toString method when a third param is passed in', function() {
- var t = new TzDate(0, 0, 'Mon Sep 3 2010 17:05:08 GMT+0500 (XYZ)');
- expect(t.toString()).toBe('Mon Sep 3 2010 17:05:08 GMT+0500 (XYZ)');
- });
-
-
it('should throw error when no third param but toString called', function() {
expect(function() { new TzDate(0,0).toString(); }).
toThrow('Method \'toString\' is not implemented in the TzDate mock');