Skip to content

Commit

Permalink
Unit test fixes
Browse files Browse the repository at this point in the history 
issue #635
  • Loading branch information
@ErisDS
ErisDS committed Oct 31, 2013
1 parent 6e44280 commit 2983e65
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions core/test/unit/storage_localfilesystem_spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*globals describe, beforeEach, it*/
/*globals describe, beforeEach, afterEach, it*/
var fs = require('fs-extra'),
path = require('path'),
should = require('should'),
Expand All @@ -10,7 +10,7 @@ describe('Local File System Storage', function() {

var image;

beforeEach(function() {
beforeEach(function () {
sinon.stub(fs, 'mkdirs').yields();
sinon.stub(fs, 'copy').yields();
sinon.stub(fs, 'exists').yields(false);
Expand All @@ -21,61 +21,61 @@ describe('Local File System Storage', function() {
};
});

afterEach(function() {
afterEach(function () {
fs.mkdirs.restore();
fs.copy.restore();
fs.exists.restore();
});

it('should send correct path to image when date is in Sep 2013', function(done) {
it('should send correct path to image when date is in Sep 2013', function (done) {
// Sat Sep 07 2013 21:24
var date = new Date(2013, 8, 7, 21, 24).getTime();
localfilesystem.save(date, image, 'GHOSTURL').then(function(url) {
localfilesystem.save(date, image, 'GHOSTURL').then(function (url) {
url.should.equal('GHOSTURL/content/images/2013/Sep/IMAGE.jpg');
return done();
});
});

it('should send correct path to image when original file has spaces', function(done) {
it('should send correct path to image when original file has spaces', function (done) {
var date = new Date(2013, 8, 7, 21, 24).getTime();
image.name = 'AN IMAGE.jpg';
localfilesystem.save(date, image, 'GHOSTURL').then(function(url) {
localfilesystem.save(date, image, 'GHOSTURL').then(function (url) {
url.should.equal('GHOSTURL/content/images/2013/Sep/AN_IMAGE.jpg');
return done();
});
});

it('should send correct path to image when date is in Jan 2014', function(done) {
it('should send correct path to image when date is in Jan 2014', function (done) {
// Jan 1 2014 12:00
var date = new Date(2014, 0, 1, 12).getTime()
localfilesystem.save(date, image, 'GHOSTURL').then(function(url) {
var date = new Date(2014, 0, 1, 12).getTime();
localfilesystem.save(date, image, 'GHOSTURL').then(function (url) {
url.should.equal('GHOSTURL/content/images/2014/Jan/IMAGE.jpg');
return done();
});
});
});

it('should create month and year directory', function(done) {
it('should create month and year directory', function (done) {
// Sat Sep 07 2013 21:24
var date = new Date(2013, 8, 7, 21, 24).getTime();
localfilesystem.save(date, image, 'GHOSTURL').then(function(url) {
localfilesystem.save(date, image, 'GHOSTURL').then(function (url) {
fs.mkdirs.calledOnce.should.be.true;
fs.mkdirs.args[0][0].should.equal('content/images/2013/Sep');
return done();
});
fs.mkdirs.args[0][0].should.equal(path.join('content/images/2013/Sep'));
done();
}).then(null, done);
});

it('should copy temp file to new location', function(done) {
it('should copy temp file to new location', function (done) {
// Sat Sep 07 2013 21:24
var date = new Date(2013, 8, 7, 21, 24).getTime();
localfilesystem.save(date, image, 'GHOSTURL').then(function(url) {
localfilesystem.save(date, image, 'GHOSTURL').then(function (url) {
fs.copy.calledOnce.should.be.true;
fs.copy.args[0][0].should.equal('tmp/123456.jpg');
fs.copy.args[0][1].should.equal('content/images/2013/Sep/IMAGE.jpg');
return done();
});
fs.copy.args[0][1].should.equal(path.join('content/images/2013/Sep/IMAGE.jpg'));
done();
}).then(null, done);
});

it('can upload two different images with the same name without overwriting the first', function(done) {
it('can upload two different images with the same name without overwriting the first', function (done) {
// Sun Sep 08 2013 10:57
var date = new Date(2013, 8, 8, 10, 57).getTime();
clock = sinon.useFakeTimers(date);
Expand All @@ -87,13 +87,13 @@ describe('Local File System Storage', function() {
fs.exists.withArgs('content\\images\\2013\\Sep\\IMAGE.jpg').yields(true);
fs.exists.withArgs('content\\images\\2013\\Sep\\IMAGE-1.jpg').yields(false);

localfilesystem.save(date, image, 'GHOSTURL').then(function(url) {
localfilesystem.save(date, image, 'GHOSTURL').then(function (url) {
url.should.equal('GHOSTURL/content/images/2013/Sep/IMAGE-1.jpg');
return done();
});
});

it('can upload five different images with the same name without overwriting the first', function(done) {
it('can upload five different images with the same name without overwriting the first', function (done) {
// Sun Sep 08 2013 10:57
var date = new Date(2013, 8, 8, 10, 57).getTime();
clock = sinon.useFakeTimers(date);
Expand All @@ -110,36 +110,36 @@ describe('Local File System Storage', function() {
fs.exists.withArgs('content\\images\\2013\\Sep\\IMAGE-3.jpg').yields(true);
fs.exists.withArgs('content\\images\\2013\\Sep\\IMAGE-4.jpg').yields(false);

localfilesystem.save(date, image, 'GHOSTURL').then(function(url) {
localfilesystem.save(date, image, 'GHOSTURL').then(function (url) {
url.should.equal('GHOSTURL/content/images/2013/Sep/IMAGE-4.jpg');
return done();
});
});


describe('on Windows', function() {
describe('on Windows', function () {
// TODO tests to check for working on windows

var truePathSep = path.sep;

beforeEach(function() {
beforeEach(function () {
sinon.stub(path, 'join');
});

afterEach(function() {
afterEach(function () {
path.join.restore();
path.sep = truePathSep;
});

it('should return url in proper format for windows', function(done) {
it('should return url in proper format for windows', function (done) {
path.sep = '\\';
path.join.returns('/content/images/2013/Sep/IMAGE.jpg');
path.join.withArgs('GHOSTURL', '/content/images/2013/Sep/IMAGE.jpg').returns('GHOSTURL\\content\\images\\2013\\Sep\\IMAGE.jpg');
var date = new Date(2013, 8, 7, 21, 24).getTime();
localfilesystem.save(date, image, 'GHOSTURL').then(function(url) {
localfilesystem.save(date, image, 'GHOSTURL').then(function (url) {
url.should.equal('GHOSTURL/content/images/2013/Sep/IMAGE.jpg');
return done();
});
});
});
});
});

0 comments on commit 2983e65

Please sign in to comment.