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

DEV: Clean up skipped tests (#15747)

Browse Source 
Many of the tests work now that other, general fixes have been made.
I've deleted some that seem to have lost functionality.
This commit is contained in:
Robin Ward
2022-01-31 15:31:13 -05:00
committed by GitHub
parent 18116433ee
commit e3c5a40432
8 changed files with 128 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/assets/javascripts/discourse-common/addon/lib/get-url.js
View File

@ -1,6 +1,8 @@
let cdn, baseUrl, baseUri, baseUriMatcher;
let S3BaseUrl, S3CDN;
let snapshot;
export default function getURL(url) {
if (baseUri === undefined) {
setPrefix($('meta[name="discourse-base-uri"]').attr("content") || "");
@ -59,15 +61,43 @@ export function setPrefix(configBaseUri) {
baseUriMatcher = new RegExp(`^${baseUri}(/|$)`);
}
export function setupURL(configCdn, configBaseUrl, configBaseUri) {
export function setupURL(configCdn, configBaseUrl, configBaseUri, opts) {
opts = opts || {};
cdn = configCdn;
baseUrl = configBaseUrl;
setPrefix(configBaseUri);
if (opts?.snapshot) {
snapshot = {
cdn,
baseUri,
baseUrl,
configBaseUrl,
baseUriMatcher,
};
}
}
export function setupS3CDN(configS3BaseUrl, configS3CDN) {
// In a test environment we might change these values and, after tests, want to restore them.
export function restoreBaseUri() {
if (snapshot) {
cdn = snapshot.cdn;
baseUri = snapshot.baseUri;
baseUrl = snapshot.baseUrl;
baseUriMatcher = snapshot.baseUriMatcher;
S3BaseUrl = snapshot.S3BaseUrl;
S3CDN = snapshot.S3CDN;
}
}
export function setupS3CDN(configS3BaseUrl, configS3CDN, opts) {
S3BaseUrl = configS3BaseUrl;
S3CDN = configS3CDN;
if (opts?.snapshot) {
snapshot = snapshot || {};
snapshot.S3BaseUrl = S3BaseUrl;
snapshot.S3CDN = S3CDN;
}
}
// We can use this to identify when navigating on the same host but outside of the