Skip to content

Commit

Permalink
Fix 1.13.2 release tests (#11104)
Browse files Browse the repository at this point in the history 
* Fix release test url pattern

* Copy entire release test setup

* Remove unused examples

* Okay CSS, you too
  • Loading branch information
@rreusser
rreusser committed Oct 7, 2021
1 parent db11541 commit 18ec8ff
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 66 deletions.
3 changes: 2 additions & 1 deletion test/release/index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body {

#top {
height:60px;
background:#4264fb;
background:#000000;
display:flex;
flex-direction: row;
flex-wrap: nowrap;
Expand All @@ -32,6 +32,7 @@ body {
padding:4px 20px;
line-height:0.9em;
text-overflow:ellipsis;
padding-left: 100px;
}

.navbar-expand {
Expand Down
5 changes: 3 additions & 2 deletions test/release/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<link rel="stylesheet" type="text/css" href="index.css">
<script src="https://api.mapbox.com/mapbox-gl-js/versions.jsonp"></script>
<script>const mapboxgl = {};</script>
<script src='../../debug/access_token_generated.js'></script>
<script src="index.js"></script>
<script>(function(){var script=document.createElement('script');script.onload=function(){var stats=new Stats();stats.showPanel(1);document.body.appendChild(stats.dom);requestAnimationFrame(function loop(){stats.update();requestAnimationFrame(loop)});};script.src='//mrdoob.github.io/stats.js/build/stats.min.js';document.head.appendChild(script);})()</script>
</head>

<body>
Expand All @@ -27,6 +27,7 @@
<div class="navbar-item"><a class="button" id="next"><svg aria-hidden="true" viewBox="0 0 8 16"><path fill-rule="evenodd" d="M7.5 8l-5 5L1 11.5 4.75 8 1 4.5 2.5 3l5 5z"/></svg><span>next</span></a></div>
</div>
</nav>
<section id="container"></section>
<section id="container">
</section>
</body>
</html>
168 changes: 105 additions & 63 deletions test/release/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,67 +5,92 @@
/* global mapboxgl */
/* global mapboxglVersions */

const pages = {
"geojson-markers": {
const pages = [
{
"key": "geojson-markers",
"title": "Add GeoJSON marker"
},
"animate-point-along-line": {
{
"key": "animate-point-along-line",
"title": "Animate point"
},
"queryrenderedfeatures": {
{
"key": "queryrenderedfeatures",
"title": "Get features under the mouse pointer"
},
"scroll-fly-to": {
{
"key": "scroll-fly-to",
"title": "Fly to a location based on scroll position"
},
"popup-on-click": {
{
"key": "popup-on-click",
"title": "Display a popup on click"
},
"hover-styles": {
{
"key": "hover-styles",
"title": "Create a hover effect"
},
"satellite-map": {
{
"key": "satellite-map",
"title": "Display a satellite map"
},
"custom-marker-icons": {
{
"key": "custom-marker-icons",
"title": "Add custom icons with Markers"
},
"filter-features-within-map-view": {
{
"key": "filter-features-within-map-view",
"title": "Filter features within map view"
},
"video-on-a-map": {
{
"key": "video-on-a-map",
"title": "Add a video"
},
"custom-style-layer": {
{
"key": "custom-style-layer",
"title": "Add a custom style layer"
},
"adjust-layer-opacity": {
{
"key": "adjust-layer-opacity",
"title": "Adjust a layer's opacity"
},
"check-for-support": {
{
"key": "check-for-support",
"title": "Check for browser support"
},
"mapbox-gl-geocoder": {
{
"key": "mapbox-gl-geocoder",
"title": "Add a geocoder"
},
"mapbox-gl-directions": {
{
"key": "mapbox-gl-directions",
"title": "Display driving directions"
},
"mapbox-gl-draw": {
{
"key": "mapbox-gl-draw",
"title": "Show drawn polygon area"
},
"mapbox-gl-compare": {
{
"key": "mapbox-gl-compare",
"title": "Swipe between maps"
},
"mapbox-gl-rtl-text": {
{
"key": "mapbox-gl-rtl-text",
"title": "Add support for right-to-left scripts"
},
"heatmap-layer": {
{
"key": "heatmap-layer",
"title": "Add a heatmap layer"
},
{
"key": "image-on-a-map",
"title": "Image Source"
},
{
"key": "locate-user",
"title": "Locate the user"
}
};

const pageKeys = Object.keys(pages);
];

const versions = {
'latest': {}
Expand Down Expand Up @@ -98,8 +123,9 @@ document.addEventListener('DOMContentLoaded', function() {
});

const params = {
page: pages[0],
version: 'latest'
page: pages[0].key,
version: 'latest',
index: 0
};

location.hash.substr(1).split('&').forEach(function (param) {
Expand All @@ -115,31 +141,38 @@ document.addEventListener('DOMContentLoaded', function() {
}
}

let pageIndex = pageKeys.indexOf(params.page);
if (pageIndex < 0) pageIndex = 0;
params.page = pageKeys[pageIndex];

titleElement.addEventListener('click', function() {
versionItem.classList.remove('active');
titleItem.classList[titleItem.classList.contains('active') ? 'remove' : 'add']('active');
});

Object.keys(pages).forEach(function(page) {
let pageIndex = 0;
for (let i = 0; i < pages.length; i++) {
if (params.page === pages[i].key) {
pageIndex = i;
break;
}
}
params.index = pageIndex;
params.page = pages[pageIndex].key;

for (let i = 0; i < pages.length; ++i) {
const page = pages[i];
const item = document.createElement('a');
item.classList.add('dropdown-item');
const metadata = pages[page];
item.innerHTML = '<span class="item-title">' + metadata.title + '</span>';
item.innerHTML = '<span class="item-title">' + page.title + '</span>';
item.dataset.page = page;
item.dataset.index = i;
item.addEventListener('click', function() {
params.page = this.dataset.page;
pageIndex = pageKeys.indexOf(this.dataset.page);
pageIndex = this.dataset.index;
if (pageIndex < 0) pageIndex = 0;
params.page = pageKeys[pageIndex];
params.page = pages[pageIndex].key;
params.index = pageIndex;
titleItem.classList.remove('active');
load();
});
titleDropdown.appendChild(item);
});
}

if (!(params.version in versions)) {
params.version = 'latest';
Expand Down Expand Up @@ -178,17 +211,17 @@ document.addEventListener('DOMContentLoaded', function() {

while (container.firstChild) container.removeChild(container.firstChild);

params.page = pageKeys[pageIndex];
const page = params.page;
params.page = pages[pageIndex].key;
const version = params.version;

const metadata = pages[page];
titleElement.innerText = metadata.title;
const page = pages[pageIndex];
titleElement.innerText = page.title;
versionNumber.innerText = params.version;

req = new XMLHttpRequest();
req.addEventListener("load", loadedHTML);
url = metadata.url ? metadata.url : 'https://raw.githubusercontent.com/mapbox/mapbox-gl-js-docs/publisher-production/docs/pages/example/' + page + '.html';

url = page.url ? page.url : 'https://docs.mapbox.com/mapbox-gl-js/assets/' + page.key + '-demo.html';
req.open("GET", url);
req.send();

Expand All @@ -204,32 +237,41 @@ document.addEventListener('DOMContentLoaded', function() {
const js = version === 'latest' ? jsLatest.href : 'https://api.mapbox.com/mapbox-gl-js/' + version + '/mapbox-gl.js';
const css = version === 'latest' ? cssLatest.href : 'https://api.mapbox.com/mapbox-gl-js/' + version + '/mapbox-gl.css';

iframeDoc.write([
'<!DOCTYPE html>',
'<html>',
'<head>',
' <title>Mapbox GL JS debug page</title>',
' <meta charset="utf-8">',
' <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">',
' <script src="' + js + '"><\/script>',
' <script>mapboxgl.accessToken = "' + params.access_token + '";<\/script>',
' <link rel="stylesheet" href="' + css + '" />',
' <style>',
' body { margin: 0; padding: 0; }',
' html, body, #map { height: 100%; }',
' </style>',
'</head>',
'<body>',
req.response,
'</body>',
'</html>' ].join(''));
let doc = req.response;

if (!page.url) { // Perform cleanups for pages hosted on docs.mapbox.com, otherwise directly use demo code
const versionLibRegex = /https:\/\/api\.mapbox\.com\/mapbox-gl-js\/v[0-9]+\.[0-9]+\.[0-9]+\/mapbox-gl\.js/g;
const versionCSSRegex = /https:\/\/api\.mapbox\.com\/mapbox-gl-js\/v[0-9]+\.[0-9]+\.[0-9]+\/mapbox-gl\.css/g;
const sentryRegex = /<script src="https:\/\/js\.sentry-cdn\.com\/[0-9a-f]*\.min\.js"\s*crossorigin="anonymous"><\/script>/g;
const instrumentileRegex = /<script>if\(window\.map instanceof mapboxgl\.Map\)var i=new instrumentile.*<\/script>/g;
const apiKeyRegex = /pk\..*?"/g;

// Update versions + api key
doc = doc.replace(versionLibRegex, js);
doc = doc.replace(versionCSSRegex, css);
doc = doc.replace(apiKeyRegex, params.access_token + '"');

// Remove extraneous analytics
doc = doc.replace(instrumentileRegex, '');
doc = doc.replace(sentryRegex, '');
} else { // Perform cleanups of pages locally referenced
const versionLibRegex = /<script src='(.*)mapbox-gl(.*)\.js'><\/script>/g;
const versionCSSRegex = /<link rel='stylesheet'(.*)mapbox-gl\.css'(.*)\/>/g;
const apiKeyRegex = /<script(.*)access_token_generated\.js(.*)\/script>/g;

doc = doc.replace(versionLibRegex, '<script src="' + js + '"></script>');
doc = doc.replace(versionCSSRegex, '<link rel="stylesheet" href="' + css + '" />');
doc = doc.replace(apiKeyRegex, '<script>mapboxgl.accessToken="' + params.access_token + '"</script>');
}

iframeDoc.write([doc].join(''));
iframeDoc.close();
}

prevButton.classList[(pageIndex === 0) ? 'add' : 'remove']('disabled');
nextButton.classList[(pageIndex + 1 === pageKeys.length) ? 'add' : 'remove']('disabled');
nextButton.classList[(pageIndex + 1 === pages.length) ? 'add' : 'remove']('disabled');

let hash = 'page=' + page;
let hash = 'page=' + page.key;
if (version !== 'latest') {
hash += '&version=' + version;
}
Expand All @@ -247,7 +289,7 @@ document.addEventListener('DOMContentLoaded', function() {
});

nextButton.addEventListener('click', function() {
if (pageIndex + 1 <= pageKeys.length) {
if (pageIndex + 1 < pages.length) {
pageIndex++;
load();
}
Expand Down

0 comments on commit 18ec8ff

Please sign in to comment.