github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 09:08:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: make sure pasting an image in the composer is considered as an image instead of an attachment

Browse Source
This commit is contained in:
Régis Hanol
2015-01-23 19:17:33 +01:00
parent 256519dddf
commit e6f849f873
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/javascripts/lib/utilities-test.js.es6
View File

@ -60,14 +60,16 @@ test("prevents files that are too big from being uploaded", function() {
ok(bootbox.alert.calledWith(I18n.t('post.errors.file_too_large', { max_size_kb: 5 })));
});
var imageSize = 10 * 1024;
var dummyBlob = function() {
var BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
if (BlobBuilder) {
var bb = new BlobBuilder();
bb.append([1]);
bb.append([new Int8Array(imageSize)]);
return bb.getBlob("image/png");
} else {
return new Blob([1], { "type" : "image\/png" });
return new Blob([new Int8Array(imageSize)], { "type" : "image\/png" });
}
};
@ -75,10 +77,11 @@ test("allows valid uploads to go through", function() {
Discourse.User.resetCurrent(Discourse.User.create());
Discourse.User.currentProp("trust_level", 1);
Discourse.SiteSettings.max_image_size_kb = 15;
Discourse.SiteSettings.max_attachment_size_kb = 1;
sandbox.stub(bootbox, "alert");
// image
var image = { name: "image.png", size: 10 * 1024 };
var image = { name: "image.png", size: imageSize };
ok(validUpload([image]));
// pasted image
var pastedImage = dummyBlob();