iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test(docs-infra): fix double-slash in URL of `aio_monitoring` test (#25641) 

As part of the tests run in the CircleCI `aio_monitoring` job, we need
to retrieve `sitemap.xml` from the site under test. Previously, the URL
used to retrieve that contained a double-slash (`//`). At some point,
Firebase (which is used for hosting the site) stopped normalizing
double-slashes to a single slash, causing the test to fail.

This commit fixes the problem by ensuring that the constructed URLs do
not contain double-slashes.

PR Close #25641
This commit is contained in:
George Kalpakas 2018-08-23 21:24:14 +03:00 committed by Misko Hevery
parent 010e35d995
commit 13b8399d0c
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
aio/tests/deployment/e2e/redirection.e2e-spec.ts
View File

@ -3,8 +3,9 @@ import { SitePage } from './site.po';
describe(browser.baseUrl, () => { describe(browser.baseUrl, () => {
const page = new SitePage(); const page = new SitePage();
const getCurrentUrl = async () => (await browser.getCurrentUrl()).replace(/\?.*$/, ''); const getCurrentUrl = () => browser.getCurrentUrl().then(stripQuery).then(stripTrailingSlash);
const prependBaseUrl = (url: string) => browser.baseUrl.replace(/\/$/, '') + url; const stripQuery = (url: string) => url.replace(/\?.*$/, '');
const stripTrailingSlash = (url: string) => url.replace(/\/$/, '');
beforeAll(done => page.init().then(done)); beforeAll(done => page.init().then(done));
@ -16,7 +17,7 @@ describe(browser.baseUrl, () => {
it(`should not redirect '${url}' (${i + 1}/${page.sitemapUrls.length})`, async () => { it(`should not redirect '${url}' (${i + 1}/${page.sitemapUrls.length})`, async () => {
await page.goTo(url); await page.goTo(url);
const expectedUrl = prependBaseUrl(url); const expectedUrl = stripTrailingSlash(page.baseUrl + url);
const actualUrl = await getCurrentUrl(); const actualUrl = await getCurrentUrl();
expect(actualUrl).toBe(expectedUrl); expect(actualUrl).toBe(expectedUrl);
@ -29,7 +30,7 @@ describe(browser.baseUrl, () => {
it(`should redirect '${fromUrl}' to '${toUrl}' (${i + 1}/${page.legacyUrls.length})`, async () => { it(`should redirect '${fromUrl}' to '${toUrl}' (${i + 1}/${page.legacyUrls.length})`, async () => {
await page.goTo(fromUrl); await page.goTo(fromUrl);
const expectedUrl = /^http/.test(toUrl) ? toUrl : prependBaseUrl(toUrl); const expectedUrl = stripTrailingSlash(/^http/.test(toUrl) ? toUrl : page.baseUrl + toUrl);
const actualUrl = await getCurrentUrl(); const actualUrl = await getCurrentUrl();
expect(actualUrl).toBe(expectedUrl); expect(actualUrl).toBe(expectedUrl);
@ -66,8 +67,8 @@ describe(browser.baseUrl, () => {
expect(homeNavLink.isPresent()).toBe(true); expect(homeNavLink.isPresent()).toBe(true);
await homeNavLink.click(); await homeNavLink.click();
const expectedUrl = browser.baseUrl; const expectedUrl = page.baseUrl;
const actualUrl = await browser.getCurrentUrl(); const actualUrl = await getCurrentUrl();
expect(actualUrl).toBe(expectedUrl); expect(actualUrl).toBe(expectedUrl);
}); });

5
aio/tests/deployment/e2e/site.po.ts
View File

@ -1,6 +1,9 @@
import { browser, by, element, ExpectedConditions } from 'protractor'; import { browser, by, element, ExpectedConditions } from 'protractor';
export class SitePage { export class SitePage {
/** The base URL with the trailing `/` stripped off (if any). */
baseUrl = browser.baseUrl.replace(/\/$/, '');
/** All URLs found in the app's `sitemap.xml` (i.e. valid URLs tha should not be redirected). */ /** All URLs found in the app's `sitemap.xml` (i.e. valid URLs tha should not be redirected). */
sitemapUrls: string[] = browser.params.sitemapUrls; sitemapUrls: string[] = browser.params.sitemapUrls;
@ -44,7 +47,7 @@ export class SitePage {
.then(regs => Promise.all(regs.map(reg => reg.unregister()))) .then(regs => Promise.all(regs.map(reg => reg.unregister())))
.then(cb); .then(cb);
await browser.get(url || browser.baseUrl); await browser.get(url || this.baseUrl);
await browser.executeScript('document.body.classList.add(\'no-animations\')'); await browser.executeScript('document.body.classList.add(\'no-animations\')');
await browser.executeAsyncScript(unregisterServiceWorker); await browser.executeAsyncScript(unregisterServiceWorker);
await browser.waitForAngular(); await browser.waitForAngular();

1
aio/tests/deployment/shared/helpers.ts
View File

@ -49,6 +49,7 @@ export function loadLocalSitemapUrls() {
} }
export async function loadRemoteSitemapUrls(host: string) { export async function loadRemoteSitemapUrls(host: string) {
host = host.replace(/\/$/, '');
const urlToSiteMap = `${host}/generated/sitemap.xml`; const urlToSiteMap = `${host}/generated/sitemap.xml`;
const get = /^https:/.test(host) ? httpsGet : httpGet; const get = /^https:/.test(host) ? httpsGet : httpGet;