From d5d7919d26b03bb2a3fa5e0dda143b325af41187 Mon Sep 17 00:00:00 2001
From: Jason Williams <jaswilli@gmail.com>
Date: Sun, 18 Jan 2015 14:24:41 -0600
Subject: [PATCH] Assume datetime in import filename is UTC

No issue.
- Add missing catch handlers to async tests.
---
 core/server/data/importer/handlers/markdown.js |  2 +-
 core/test/unit/importer_spec.js                | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/server/data/importer/handlers/markdown.js b/core/server/data/importer/handlers/markdown.js
index a298e2433c..d4e1c119ad 100644
--- a/core/server/data/importer/handlers/markdown.js
+++ b/core/server/data/importer/handlers/markdown.js
@@ -16,7 +16,7 @@ var _       = require('lodash'),
 // Takes a date from the filename in y-m-d-h-m form, and converts it into a Date ready to import
 processDateTime = function (post, datetime) {
     var format = 'YYYY-MM-DD-HH-mm';
-    datetime = moment(datetime, format).valueOf();
+    datetime = moment.utc(datetime, format).valueOf();
 
     if (post.status && post.status === 'published') {
         post.published_at = datetime;
diff --git a/core/test/unit/importer_spec.js b/core/test/unit/importer_spec.js
index a654c7e83a..2a28780d08 100644
--- a/core/test/unit/importer_spec.js
+++ b/core/test/unit/importer_spec.js
@@ -485,7 +485,7 @@ describe('Importer', function () {
                 storeSpy.lastCall.args[1].newPath.should.eql('/content/images/puppy.jpg');
 
                 done();
-            });
+            }).catch(done);
         });
     });
 
@@ -514,11 +514,11 @@ describe('Importer', function () {
                 result.data.posts[0].slug.should.eql('test-1');
                 result.data.posts[0].title.should.eql('test-1');
                 result.data.posts[0].created_at.should.eql(1418990400000);
-                moment(result.data.posts[0].created_at).format('DD MM YY HH:mm').should.eql('19 12 14 12:00');
+                moment.utc(result.data.posts[0].created_at).format('DD MM YY HH:mm').should.eql('19 12 14 12:00');
                 result.data.posts[0].should.not.have.property('image');
 
                 done();
-            });
+            }).catch(done);
         });
 
         it('can parse a title from a markdown file', function (done) {
@@ -537,7 +537,7 @@ describe('Importer', function () {
                 result.data.posts[0].should.not.have.property('image');
 
                 done();
-            });
+            }).catch(done);
         });
 
         it('can parse a featured image from a markdown file if there is a title', function (done) {
@@ -556,7 +556,7 @@ describe('Importer', function () {
                 result.data.posts[0].image.should.eql('/images/kitten.jpg');
 
                 done();
-            });
+            }).catch(done);
         });
 
         it('can import a published post', function (done) {
@@ -572,11 +572,11 @@ describe('Importer', function () {
                 result.data.posts[0].slug.should.eql('test-1');
                 result.data.posts[0].title.should.eql('Welcome to Ghost');
                 result.data.posts[0].published_at.should.eql(1418990400000);
-                moment(result.data.posts[0].published_at).format('DD MM YY HH:mm').should.eql('19 12 14 12:00');
+                moment.utc(result.data.posts[0].published_at).format('DD MM YY HH:mm').should.eql('19 12 14 12:00');
                 result.data.posts[0].should.not.have.property('image');
 
                 done();
-            });
+            }).catch(done);
         });
 
         it('does not import deleted posts', function (done) {
@@ -590,7 +590,7 @@ describe('Importer', function () {
                 result.data.posts.should.be.empty;
 
                 done();
-            });
+            }).catch(done);
         });
 
         it('can import multiple files', function (done) {
@@ -619,7 +619,7 @@ describe('Importer', function () {
                 result.data.posts[one].slug.should.eql('test-1');
                 result.data.posts[one].title.should.eql('Welcome to Ghost');
                 result.data.posts[one].published_at.should.eql(1418990400000);
-                moment(result.data.posts[one].published_at).format('DD MM YY HH:mm').should.eql('19 12 14 12:00');
+                moment.utc(result.data.posts[one].published_at).format('DD MM YY HH:mm').should.eql('19 12 14 12:00');
                 result.data.posts[one].should.not.have.property('image');
 
                 // draft-2014-12-19-test-3.md