TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-30 21:40:39 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4823 from jaswilli/fixup-test

Browse Source 
Assume datetime in import filename is UTC
This commit is contained in:
Hannah Wolfe 2015-01-19 18:49:08 +00:00
commit c946230171
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/server/data/importer/handlers/markdown.js
View File

@ -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;

18
core/test/unit/importer_spec.js
View File

@ -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