mirror of
https://github.com/discourse/discourse.git
synced 2025-05-29 01:31:35 +08:00
FIX: Don't load images that don't exist in test
This makes 404 requests and fills up the logs with junk
This commit is contained in:
@ -112,7 +112,7 @@ QUnit.test("Composer upload placeholder", async assert => {
|
|||||||
original_filename: "test.png",
|
original_filename: "test.png",
|
||||||
thumbnail_width: 200,
|
thumbnail_width: 200,
|
||||||
thumbnail_height: 300,
|
thumbnail_height: 300,
|
||||||
url: "/uploads/test1.ext"
|
url: "/images/avatar.png?1"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -124,7 +124,7 @@ QUnit.test("Composer upload placeholder", async assert => {
|
|||||||
original_filename: "test.png",
|
original_filename: "test.png",
|
||||||
thumbnail_width: 100,
|
thumbnail_width: 100,
|
||||||
thumbnail_height: 200,
|
thumbnail_height: 200,
|
||||||
url: "/uploads/test2.ext"
|
url: "/images/avatar.png?2"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -136,7 +136,7 @@ QUnit.test("Composer upload placeholder", async assert => {
|
|||||||
original_filename: "image.png",
|
original_filename: "image.png",
|
||||||
thumbnail_width: 300,
|
thumbnail_width: 300,
|
||||||
thumbnail_height: 400,
|
thumbnail_height: 400,
|
||||||
url: "/uploads/test3.ext"
|
url: "/images/avatar.png?3"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -148,7 +148,7 @@ QUnit.test("Composer upload placeholder", async assert => {
|
|||||||
original_filename: "ima++ge.png",
|
original_filename: "ima++ge.png",
|
||||||
thumbnail_width: 300,
|
thumbnail_width: 300,
|
||||||
thumbnail_height: 400,
|
thumbnail_height: 400,
|
||||||
url: "/uploads/test3.ext"
|
url: "/images/avatar.png?3"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -177,19 +177,19 @@ QUnit.test("Composer upload placeholder", async assert => {
|
|||||||
await find(".wmd-controls").trigger("fileuploaddone", data2);
|
await find(".wmd-controls").trigger("fileuploaddone", data2);
|
||||||
assert.equal(
|
assert.equal(
|
||||||
find(".d-editor-input").val(),
|
find(".d-editor-input").val(),
|
||||||
"[Uploading: test.png...]()  [Uploading: ima++ge.png...]() [Uploading: image.png...]() "
|
"[Uploading: test.png...]()  [Uploading: ima++ge.png...]() [Uploading: image.png...]() "
|
||||||
);
|
);
|
||||||
|
|
||||||
await find(".wmd-controls").trigger("fileuploaddone", data3);
|
await find(".wmd-controls").trigger("fileuploaddone", data3);
|
||||||
assert.equal(
|
assert.equal(
|
||||||
find(".d-editor-input").val(),
|
find(".d-editor-input").val(),
|
||||||
"[Uploading: test.png...]()  [Uploading: ima++ge.png...]()  "
|
"[Uploading: test.png...]()  [Uploading: ima++ge.png...]()  "
|
||||||
);
|
);
|
||||||
|
|
||||||
await find(".wmd-controls").trigger("fileuploaddone", data1);
|
await find(".wmd-controls").trigger("fileuploaddone", data1);
|
||||||
assert.equal(
|
assert.equal(
|
||||||
find(".d-editor-input").val(),
|
find(".d-editor-input").val(),
|
||||||
"  [Uploading: ima++ge.png...]()  "
|
"  [Uploading: ima++ge.png...]()  "
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -760,7 +760,7 @@ QUnit.test("Image resizing buttons", async assert => {
|
|||||||
// 4 Wrapped in backquetes should not work
|
// 4 Wrapped in backquetes should not work
|
||||||
"``",
|
"``",
|
||||||
// 5 html image - should not work
|
// 5 html image - should not work
|
||||||
"<img src='http://someimage.jpg' wight='20' height='20'>",
|
"<img src='/images/avatar.png' wight='20' height='20'>",
|
||||||
// 6 two images one the same line, but both are syntactically correct - both should work
|
// 6 two images one the same line, but both are syntactically correct - both should work
|
||||||
" ",
|
" ",
|
||||||
// 7 & 8 Identical images - both should work
|
// 7 & 8 Identical images - both should work
|
||||||
@ -771,7 +771,7 @@ QUnit.test("Image resizing buttons", async assert => {
|
|||||||
// 10 Image with markdown title - should work
|
// 10 Image with markdown title - should work
|
||||||
``,
|
``,
|
||||||
// 11 bbcode - should not work
|
// 11 bbcode - should not work
|
||||||
"[img]http://example.com/image.jpg[/img]",
|
"[img]/images/avatar.png[/img]",
|
||||||
// 12 Image with data attributes
|
// 12 Image with data attributes
|
||||||
""
|
""
|
||||||
];
|
];
|
||||||
|
@ -24,8 +24,8 @@ componentTest("resolves short URLs", {
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
short_url: "upload://a.png",
|
short_url: "upload://a.png",
|
||||||
url: "/uploads/default/original/3X/c/b/1.png",
|
url: "/images/avatar.png",
|
||||||
short_path: "/uploads/short-url/a.png"
|
short_path: "/images/d-logo-sketch.png"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
@ -38,9 +38,6 @@ componentTest("resolves short URLs", {
|
|||||||
|
|
||||||
test(assert) {
|
test(assert) {
|
||||||
const html = find(".post-body")[0].innerHTML.trim();
|
const html = find(".post-body")[0].innerHTML.trim();
|
||||||
assert.equal(
|
assert.equal(html, '<p><img src="/images/avatar.png" alt="an image"></p>');
|
||||||
html,
|
|
||||||
'<p><img src="/uploads/default/original/3X/c/b/1.png" alt="an image"></p>'
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -814,7 +814,7 @@ export function applyDefaultHandlers(pretender) {
|
|||||||
<a href="http://test.com/somepage" target="_blank">test.com</a>
|
<a href="http://test.com/somepage" target="_blank">test.com</a>
|
||||||
</header>
|
</header>
|
||||||
<article class="onebox-body">
|
<article class="onebox-body">
|
||||||
<div class="aspect-image" style="--aspect-ratio:690/362;"><img src="https://test.com/image.png" class="thumbnail"></div>
|
<div class="aspect-image" style="--aspect-ratio:690/362;"><img src="" class="thumbnail"></div>
|
||||||
<h3><a href="http://test.com/somepage" target="_blank">Test Page</a></h3>
|
<h3><a href="http://test.com/somepage" target="_blank">Test Page</a></h3>
|
||||||
<p>Yet another collaboration tool</p>
|
<p>Yet another collaboration tool</p>
|
||||||
</article>
|
</article>
|
||||||
|
@ -41,7 +41,7 @@ QUnit.test("load - successful onebox", async assert => {
|
|||||||
<a href="http://test.com/somepage" target="_blank">test.com</a>
|
<a href="http://test.com/somepage" target="_blank">test.com</a>
|
||||||
</header>
|
</header>
|
||||||
<article class="onebox-body">
|
<article class="onebox-body">
|
||||||
<div class="aspect-image" style="--aspect-ratio:690/362;"><img src="https://test.com/image.png" class="thumbnail"></div>
|
<div class="aspect-image" style="--aspect-ratio:690/362;"><img src="" class="thumbnail"></div>
|
||||||
<h3><a href="http://test.com/somepage" target="_blank">Test Page</a></h3>
|
<h3><a href="http://test.com/somepage" target="_blank">Test Page</a></h3>
|
||||||
<p>Yet another collaboration tool</p>
|
<p>Yet another collaboration tool</p>
|
||||||
</article>
|
</article>
|
||||||
|
@ -15,17 +15,17 @@ function stubUrls(imageSrcs, attachmentSrcs, otherMediaSrcs) {
|
|||||||
imageSrcs = [
|
imageSrcs = [
|
||||||
{
|
{
|
||||||
short_url: "upload://a.jpeg",
|
short_url: "upload://a.jpeg",
|
||||||
url: "/uploads/default/original/3X/c/b/1.jpeg",
|
url: "/images/avatar.png?a",
|
||||||
short_path: "/uploads/short-url/a.jpeg"
|
short_path: "/uploads/short-url/a.jpeg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
short_url: "upload://b.jpeg",
|
short_url: "upload://b.jpeg",
|
||||||
url: "/uploads/default/original/3X/c/b/2.jpeg",
|
url: "/images/avatar.png?b",
|
||||||
short_path: "/uploads/short-url/b.jpeg"
|
short_path: "/uploads/short-url/b.jpeg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
short_url: "upload://z.jpeg",
|
short_url: "upload://z.jpeg",
|
||||||
url: "/uploads/default/original/3X/c/b/9.jpeg",
|
url: "/images/avatar.png?z",
|
||||||
short_path: "/uploads/short-url/z.jpeg"
|
short_path: "/uploads/short-url/z.jpeg"
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
@ -89,14 +89,14 @@ QUnit.test("resolveAllShortUrls", async assert => {
|
|||||||
lookup = lookupCachedUploadUrl("upload://a.jpeg");
|
lookup = lookupCachedUploadUrl("upload://a.jpeg");
|
||||||
|
|
||||||
assert.deepEqual(lookup, {
|
assert.deepEqual(lookup, {
|
||||||
url: "/uploads/default/original/3X/c/b/1.jpeg",
|
url: "/images/avatar.png?a",
|
||||||
short_path: "/uploads/short-url/a.jpeg"
|
short_path: "/uploads/short-url/a.jpeg"
|
||||||
});
|
});
|
||||||
|
|
||||||
lookup = lookupCachedUploadUrl("upload://b.jpeg");
|
lookup = lookupCachedUploadUrl("upload://b.jpeg");
|
||||||
|
|
||||||
assert.deepEqual(lookup, {
|
assert.deepEqual(lookup, {
|
||||||
url: "/uploads/default/original/3X/c/b/2.jpeg",
|
url: "/images/avatar.png?b",
|
||||||
short_path: "/uploads/short-url/b.jpeg"
|
short_path: "/uploads/short-url/b.jpeg"
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -136,8 +136,8 @@ QUnit.test(
|
|||||||
.eq(1);
|
.eq(1);
|
||||||
let link = fixture().find("a");
|
let link = fixture().find("a");
|
||||||
|
|
||||||
assert.equal(image1.attr("src"), "/uploads/default/original/3X/c/b/1.jpeg");
|
assert.equal(image1.attr("src"), "/images/avatar.png?a");
|
||||||
assert.equal(image2.attr("src"), "/uploads/default/original/3X/c/b/2.jpeg");
|
assert.equal(image2.attr("src"), "/images/avatar.png?b");
|
||||||
assert.equal(link.attr("href"), "/uploads/short-url/c.pdf");
|
assert.equal(link.attr("href"), "/uploads/short-url/c.pdf");
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@ -176,7 +176,7 @@ QUnit.test("resolveAllShortUrls - scoped", async assert => {
|
|||||||
lookup = lookupCachedUploadUrl("upload://z.jpeg");
|
lookup = lookupCachedUploadUrl("upload://z.jpeg");
|
||||||
|
|
||||||
assert.deepEqual(lookup, {
|
assert.deepEqual(lookup, {
|
||||||
url: "/uploads/default/original/3X/c/b/9.jpeg",
|
url: "/images/avatar.png?z",
|
||||||
short_path: "/uploads/short-url/z.jpeg"
|
short_path: "/uploads/short-url/z.jpeg"
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user