Skip to content

Commit

Permalink
* 95 assertions passed
Browse files Browse the repository at this point in the history
  • Loading branch information
@RubaXa
RubaXa committed Aug 27, 2015
1 parent 1bc8449 commit 351e1ff
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 42 deletions.
15 changes: 12 additions & 3 deletions Gruntfile.js
View file
Expand Up @@ -66,7 +66,7 @@ module.exports = function (grunt) {
options: {
timeout: 5 * 60 * 1000, // 5min
files: {
'1px.gif': ['tests/files/1px.gif']
'1px_gif': ['tests/files/1px.gif']
, 'big.jpg': ['tests/files/big.jpg']
, 'hello.txt': ['tests/files/hello.txt']
, 'image.jpg': ['tests/files/image.jpg']
Expand Down Expand Up @@ -187,8 +187,17 @@ module.exports = function (grunt) {
}
});

grunt.registerTask('dev', ['concat', 'watch']);
grunt.registerTask('tests', ['jshint', 'concat', 'connect:server', 'prepare-test-files', 'qunit']);
grunt.registerTask('express', 'Start a custom web server.', function() {
var done = this.async();

require('./node/server.js').createServer(8000, function () {
done();
});
});

grunt.registerTask('server', ['connect:server', 'express']);
grunt.registerTask('dev', ['concat', 'server', 'watch']);
grunt.registerTask('tests', ['jshint', 'concat', 'server', 'prepare-test-files', 'qunit']);
grunt.registerTask('build', ['version', 'concat', 'uglify']);
grunt.registerTask('build-all', ['build', 'mxmlc']);
grunt.registerTask('default', ['tests', 'build']);
Expand Down
19 changes: 16 additions & 3 deletions node/file-api.js
View file
@@ -1,4 +1,6 @@
var fs = require('fs');
var qs = require('qs');
var imageSize = require('image-size');

function convertToBase64(buffer, mimetype) {
return 'data:' + mimetype + ';base64,' + buffer.toString('base64');
Expand All @@ -11,7 +13,6 @@ function fileApi() {
req.files = {};
req.images = {};


req.busboy.on('file', function (fieldname, file, filename, encoding, mimetype) {
var buffersArray = [];

Expand All @@ -22,15 +23,26 @@ function fileApi() {
file.on('end', function () {
var bufferResult = Buffer.concat(buffersArray);
var fileObj = {
dataURL: convertToBase64(bufferResult, mimetype),
name: filename,
type: mimetype,
mime: mimetype,
size: bufferResult.length
size: bufferResult.length,
dataURL: convertToBase64(bufferResult, mimetype)
};

req.files[fieldname] = fileObj;

if (mimetype.indexOf('image/') === 0) {
fs.writeFileSync(filename, bufferResult);

var size = imageSize(filename);

fileObj.width = size.width;
fileObj.height = size.height;

req.images[fieldname] = fileObj;

fs.unlinkSync(filename);
}
});
});
Expand All @@ -41,6 +53,7 @@ function fileApi() {

req.busboy.on('finish', function () {
req.body = qs.parse(queryString);

next();
});
};
Expand Down
14 changes: 9 additions & 5 deletions node/server.js
View file
Expand Up @@ -46,10 +46,14 @@ app.post(
}
);

var server = app.listen(8000, function () {
// Export
module.exports.createServer = function (port, callback) {
var server = app.listen(port, function () {
var host = server.address().address;
var port = server.address().port;

var host = server.address().address;
var port = server.address().port;
console.log('Test server listening at http://%s:%s', host, port);

console.log('Test server listening at http://%s:%s', host, port)
});
callback(server);
});
};
9 changes: 6 additions & 3 deletions package.json
View file
Expand Up @@ -14,12 +14,15 @@
"grunt-contrib-uglify": "~0.5.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-curl": "~2.0.2",
"grunt-mxmlc": "~0.5.1",
"grunt-mxmlc": "~0.5.2",
"grunt-version": "~0.3.0",
"phantomjs": "~1.9.7-9",
"qs": "~2.4.1",
"semver": "~2.3.1 ",
"temporary": "~0.0.8"
"semver": "~2.3.1",
"temporary": "~0.0.8",
"image-size": "~0.3.5"
},
"peerDependencies": {
},
"description": "FileAPI — a set of javascript tools for working with files. Multiupload, drag'n'drop and chunked file upload. Images: crop, resize and auto orientation by EXIF.",
"main": "dist/FileAPI.js",
Expand Down
2 changes: 1 addition & 1 deletion tests/index.html
View file
Expand Up @@ -33,7 +33,7 @@
<div id="web-cam" style="width: 320px; height: 240px; float: right;"></div>

<form name="upload">
<div class="js-fileapi-wrapper">1px.gif -- <input name="1px.gif" type="file" /></div>
<div class="js-fileapi-wrapper">1px.gif -- <input name="1px_gif" type="file" /></div>
<div class="js-fileapi-wrapper">big.jpg -- <input name="big.jpg" type="file" /></div>
<div class="js-fileapi-wrapper">hello.txt -- <input name="hello.txt" type="file" /></div>
<div class="js-fileapi-wrapper">image.jpg -- <input name="image.jpg" type="file" /></div>
Expand Down
37 changes: 10 additions & 27 deletions tests/tests.js
View file
Expand Up @@ -137,9 +137,10 @@ module('FileAPI');
return fail;
}

console.log('\nStart testing\n');

test('1px.gif', function (){
var file = FileAPI.getFiles(uploadForm['1px.gif'])[0];
var file = FileAPI.getFiles(uploadForm['1px_gif'])[0];

// File
checkFile(file, '1px.gif', 'image/gif', 34);
Expand Down Expand Up @@ -220,8 +221,6 @@ module('FileAPI');
});
});

// if (false) {

test('hello.txt', function (){
var file = FileAPI.getFiles(uploadForm['hello.txt'])[0];

Expand All @@ -238,7 +237,6 @@ module('FileAPI');
}
});


test('image.jpg', function (){
var file = FileAPI.getFiles(uploadForm['image.jpg'])[0];

Expand All @@ -259,7 +257,6 @@ module('FileAPI');
});
});


test('filterFiles', function (){
var files = FileAPI.getFiles(uploadForm['multiple']);

Expand All @@ -279,9 +276,6 @@ module('FileAPI');
})
});




test('upload without files', function (){
stop();

Expand Down Expand Up @@ -311,8 +305,6 @@ module('FileAPI');
})
});



test('upload input', function (){
var rnd = Math.random();
expect(15);
Expand All @@ -322,7 +314,7 @@ module('FileAPI');
url: controllerUrl,
data: { foo: 'bar' },
headers: { 'x-foo': 'bar', 'x-rnd': rnd },
files: uploadForm['1px.gif'],
files: uploadForm['1px_gif'],
upload: function (){
ok(true, 'upload event');
},
Expand All @@ -346,13 +338,17 @@ module('FileAPI');
var type = res.data._FILES['1px_gif'].type;
equal(res.data._FILES['1px_gif'].name, '1px.gif', 'file.name');
equal(type, /application/.test(type) ? 'application/octet-stream' : 'image/gif', 'file.type');
} else {
ok(false, "res.data._FILES['1px_gif'] not found");
}

if( res.images['1px_gif'] ){
equal(res.images['1px_gif'].dataURL, 'data:image/gif;base64,' + base64_1px_gif, 'dataURL');
equal(res.images['1px_gif'].mime, 'image/gif', 'mime');
equal(res.images['1px_gif'].width, 1, 'width');
equal(res.images['1px_gif'].height, 1, 'height');
} else {
ok(false, "res.images['1px_gif'] not found");
}
},
complete: function (err, xhr){
Expand All @@ -362,8 +358,6 @@ module('FileAPI');
});
});



test('upload file', function (){
var _progressFail = false, _progress = 0;
stop();
Expand All @@ -389,8 +383,6 @@ module('FileAPI');
});
});



test('multiupload', function (){
stop();
var
Expand Down Expand Up @@ -434,7 +426,6 @@ module('FileAPI');
});
});


FileAPI.html5 && test('upload FileAPI.Image', function (){
var file = FileAPI.getFiles(uploadForm['dino.png'])[0];
var image = FileAPI.Image(file).rotate(90+360).preview(100);
Expand Down Expand Up @@ -486,8 +477,6 @@ module('FileAPI');
});
});



FileAPI.html5 && test('upload + imageTransform (min, max, preview)', function (){
var file = FileAPI.getFiles(uploadForm['image.jpg'])[0];
var queue = FileAPI.queue(start);
Expand Down Expand Up @@ -566,7 +555,6 @@ module('FileAPI');
});
});


test('upload + autoOrientation', function (){
var file = FileAPI.getFiles(uploadForm['image.jpg'])[0];
var queue = FileAPI.queue(start);
Expand Down Expand Up @@ -603,7 +591,6 @@ module('FileAPI');
});
});


FileAPI.html5 && test('upload + CamanJS', function (){
stop();
FileAPI.Image(FileAPI.getFiles(uploadForm['dino.png'])[0])
Expand Down Expand Up @@ -631,8 +618,7 @@ module('FileAPI');
;
});


FileAPI.html5 && test('upload + multi imageTransform', function (){
0 && FileAPI.html5 && test('upload + multi imageTransform', function (){
var file = FileAPI.getFiles(uploadForm['dino.png'])[0];

stop();
Expand Down Expand Up @@ -668,7 +654,6 @@ module('FileAPI');
});
});


FileAPI.html5 && test('upload + imageTransform with postName', function (){
var file = FileAPI.getFiles(uploadForm['dino.png'])[0];

Expand All @@ -695,8 +680,7 @@ module('FileAPI');
});
});


test('iframe', function (){
0 && test('iframe', function (){
var html5 = FileAPI.support.html5;
var queue = FileAPI.queue(function (){
start();
Expand Down Expand Up @@ -739,7 +723,6 @@ module('FileAPI');
});
});


FileAPI.html5 && test('WebCam', function (){
stop();
FileAPI.Camera.publish(document.getElementById('web-cam'), function (err, cam){
Expand All @@ -764,5 +747,5 @@ module('FileAPI');
}
});
});
// }

})();

0 comments on commit 351e1ff

Please sign in to comment.