aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVojta Jina2011-07-27 22:18:51 +0200
committerVojta Jina2011-07-27 22:18:51 +0200
commit72e46548b869335705735d30dd3d2709a1ea3b93 (patch)
tree8ebb1f506e88f8a8a536de2c6634ab0892694222 /src
parent9dea9de44917b0b72a786122e619d451ccb8b0dc (diff)
downloadangular.js-72e46548b869335705735d30dd3d2709a1ea3b93.tar.bz2
test(filter.date): fix e2e test to pass on different time zones
Diffstat (limited to 'src')
-rw-r--r--src/filters.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/filters.js b/src/filters.js
index 40bf2157..7239b9f6 100644
--- a/src/filters.js
+++ b/src/filters.js
@@ -365,7 +365,7 @@ var NUMBER_STRING = /^\d+$/;
<doc:scenario>
it('should format date', function(){
expect(binding("1288323623006 | date:'medium'")).
- toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} pm/);
+ toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} (am|pm)/);
expect(binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")).
toMatch(/2010\-10\-2\d \d{2}:\d{2}:\d{2} \-?\d{4}/);
expect(binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")).