Skip to content

Commit 494fae3

Browse files
authored
fix: dark mode in useCDN case (#383)
1 parent fe9accc commit 494fae3

File tree

4 files changed

+37
-1
lines changed

4 files changed

+37
-1
lines changed

lib/generate-report.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const { Duration } = require('luxon');
1010
const collectJSONS = require('./collect-jsons');
1111

1212
const REPORT_STYLESHEET = 'style.css';
13+
const DARK_MODE_JS = './assets/js/darkmode.js';
1314
const GENERIC_JS = 'generic.js';
1415
const INDEX_HTML = 'index.html';
1516
const FEATURE_FOLDER = 'features';
@@ -612,6 +613,7 @@ function generateReport(options) {
612613
customStyle: _readTemplateFile(suite.customStyle),
613614
styles: _readTemplateFile(suite.style),
614615
useCDN: suite.useCDN,
616+
darkmodeScript: _readTemplateFile(DARK_MODE_JS),
615617
genericScript: _readTemplateFile(GENERIC_JS),
616618
pageTitle: pageTitle,
617619
reportName: reportName,
@@ -664,6 +666,7 @@ function generateReport(options) {
664666
useCDN: suite.useCDN,
665667
customStyle: _readTemplateFile(suite.customStyle),
666668
styles: _readTemplateFile(suite.style),
669+
darkmodeScript: _readTemplateFile(DARK_MODE_JS),
667670
genericScript: _readTemplateFile(GENERIC_JS),
668671
pageTitle: pageTitle,
669672
reportName: reportName,

templates/feature-overview.index.tmpl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
<![endif]-->
2424

2525
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
26+
27+
<!-- Darkmode -->
28+
<script>
29+
<%= darkmodeScript %>
30+
</script>
2631
<% } else { %>
2732
<!-- Bootstrap -->
2833
<link rel="stylesheet" href="../assets/css/bootstrap.min.css" >

templates/features-overview.index.tmpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.10.19/css/dataTables.bootstrap.min.css" />
2727
<link rel="stylesheet" href="https://cdn.datatables.net/responsive/2.1.1/css/responsive.dataTables.min.css">
2828

29+
<!-- Darkmode -->
30+
<script>
31+
<%= darkmodeScript %>
32+
</script>
2933
<% } else { %>
3034
<!-- Bootstrap -->
3135
<link rel="stylesheet" href="assets/css/bootstrap.min.css" >
@@ -138,7 +142,7 @@
138142
legend: false,
139143
responsive: false
140144
};
141-
145+
142146
var getColor = function(selector, defaultColor) {
143147
if (document.querySelector(selector)) {
144148
return getComputedStyle(document.querySelector(selector)).color

test/test.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,30 @@ test.generate({
2626
}
2727
});
2828

29+
/**
30+
* Generate a report for browsers wit useCDN true
31+
*/
32+
test.generate({
33+
saveCollectedJSON: true,
34+
jsonDir: './test/unit/data/json/',
35+
reportPath: './.tmp/browsers-with-cdn-usage/',
36+
reportName: 'Report with CDN usage',
37+
customMetadata: false,
38+
displayDuration: true,
39+
durationInMS: true,
40+
useCDN: true,
41+
customData: {
42+
title: 'Run info',
43+
data: [
44+
{label: 'Project', value: 'Custom project'},
45+
{label: 'Release', value: '1.2.3'},
46+
{label: 'Cycle', value: 'B11221.34321'},
47+
{label: 'Execution Start Time', value: 'Nov 19th 2017, 02:31 PM EST'},
48+
{label: 'Execution End Time', value: 'Nov 19th 2017, 02:56 PM EST'}
49+
]
50+
}
51+
});
52+
2953
/**
3054
* Generate a report with array of embedded data
3155
*/

0 commit comments

Comments
 (0)