Skip to content

Commit a51edd9

Browse files
castastrophecastastrophe
castastrophe
and
castastrophe
authored
chore: Update tests and build scripts (#1607)
* chore: Update tests and build scripts * chore: Fix modal inconsistency * chore: Remove unnecessary package * chore: Update baselines * chore: Update tests to prevent false failures * chore: Update pfe-toast baselines * chore: Add support for * in the validateElements tool Co-authored-by: castastrophe <[email protected]>
1 parent 1f1bec8 commit a51edd9

File tree

25 files changed

+97
-99
lines changed

25 files changed

+97
-99
lines changed

‎elements/pfe-band/demo/demo.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pfe-band {
4545
}
4646

4747
#test-custom {
48-
--pfe-band--BackgroundColor: rgb(6, 105, 6);
48+
--pfe-band--BackgroundColor: green;
4949
--context: saturated;
5050
}
5151

‎elements/pfe-band/demo/index.html‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,28 @@
1010
<link rel="stylesheet" type="text/css" href="../../pfe-styles/dist/red-hat-font.min.css">
1111

1212
<!-- Stylesheets for testing light DOM styles.
13-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap-reboot.css">
14-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/typebase.css/0.5.0/typebase.css">
15-
-->
16-
<link rel="stylesheet" href="../../pfe-styles/dist/pf-vars-rem.css" />
17-
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-base.css" />
18-
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-context.css" />
19-
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-layouts.css" />
13+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap-reboot.css">
14+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/typebase.css/0.5.0/typebase.css">
15+
-->
2016

2117
<noscript>
2218
<link href="../../pfelement/dist/pfelement--noscript.min.css" rel="stylesheet">
2319
</noscript>
2420

2521
<link href="../../pfelement/dist/pfelement.min.css" rel="stylesheet">
2622

27-
<link href="demo.css" rel="stylesheet">
23+
<link rel="stylesheet" href="../../pfe-styles/dist/pf-vars-rem.css" />
24+
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-base.css" />
25+
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-context.css" />
26+
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-layouts.css" />
2827

2928
<!-- uncomment the es5-adapter if you're using the umd version -->
3029
<script src="https://unpkg.com/@webcomponents/[email protected]/custom-elements-es5-adapter.js"></script>
3130
<script src="https://unpkg.com/@webcomponents/[email protected]/webcomponents-bundle.js"></script>
3231
<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"></script>
3332

33+
<link href="demo.css" rel="stylesheet">
34+
3435
<script>
3536
require([
3637
'../dist/pfe-band.umd.js',

‎elements/pfe-band/src/pfe-band.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
$LOCAL: band;
44

5-
65
$LOCAL-VARIABLES: (
76
// Default spacing values
87
Padding--vertical: calc( #{pfe-var(container-spacer)} * 4),

‎elements/pfe-clipboard/demo/index.html‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,29 @@
66
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
77
<title>PatternFly Element | pfe-clipboard Demo</title>
88

9+
<link rel="stylesheet" type="text/css" href="../../pfe-styles/dist/red-hat-font.min.css">
10+
11+
<!-- Stylesheets for testing light DOM styles.
12+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap-reboot.css">
13+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/typebase.css/0.5.0/typebase.css">
14+
-->
15+
916
<noscript>
10-
<link href="../../pfelement/dist/pfelement-noscript.min.css" rel="stylesheet">
17+
<link href="../../pfelement/dist/pfelement--noscript.min.css" rel="stylesheet">
1118
</noscript>
1219

1320
<link href="../../pfelement/dist/pfelement.min.css" rel="stylesheet">
1421

15-
<!-- Stylesheets for testing light DOM styles.
16-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap-reboot.css">
17-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/typebase.css/0.5.0/typebase.css">
18-
-->
19-
22+
<link rel="stylesheet" href="../../pfe-styles/dist/pf-vars-rem.css" />
2023
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-base.css" />
2124
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-context.css" />
2225
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-layouts.css" />
23-
<link rel="stylesheet" type="text/css" href="../../pfe-styles/dist/red-hat-font.min.css">
2426

2527
<!-- uncomment the es5-adapter if you're using the umd version -->
2628
<script src="https://unpkg.com/@webcomponents/[email protected]/custom-elements-es5-adapter.js"></script>
27-
28-
<!-- Use webcomponents-loader when you are adding support for more modern browsers -->
29-
<!-- <script src="https://unpkg.com/@webcomponents/[email protected]/webcomponents-loader.min.js"></script> -->
30-
31-
<!-- IE11 test: use bundle + require with umd files -->
32-
<!-- Use webcomponents-bundle when supporting much older browsers like IE11 -->
3329
<script src="https://unpkg.com/@webcomponents/[email protected]/webcomponents-bundle.js"></script>
34-
35-
36-
<!-- Tests require pulling in the UMD version of the files -->
3730
<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"></script>
31+
3832
<script>
3933
require([
4034
"../dist/pfe-clipboard.umd.js",

‎elements/pfe-clipboard/test/pfe-clipboard_e2e.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const element = require("../package.json").pfelement.elementName;
33
describe(element, () => {
44
before(() => {
55
browser.url(`/elements/${element}/demo`);
6+
browser.pause(1000);
67
});
78

89
it("should take a screenshot", () => {

‎elements/pfe-collapse/demo/index.html‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,17 @@
77
<meta charset="utf-8">
88
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
99

10+
<link rel="stylesheet" type="text/css" href="../../pfe-styles/dist/red-hat-font.min.css">
11+
<link rel="stylesheet" href="../../pfe-styles/dist/pf-vars-rem.css" />
12+
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-base.css" />
13+
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-context.css" />
14+
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-layouts.css" />
15+
1016
<noscript>
11-
<link href="../../pfelement/dist/pfelement--noscript.min.css" rel="stylesheet">
17+
<link href="../../pfelement/dist/pfelement--noscript.min.css" rel="stylesheet" />
1218
</noscript>
1319

14-
<link href="../../pfelement/dist/pfelement.min.css" rel="stylesheet">
15-
16-
<link rel="stylesheet" type="text/css" href="../../pfe-styles/dist/red-hat-font.min.css">
20+
<link href="../../pfelement/dist/pfelement.min.css" rel="stylesheet" />
1721

1822
<!-- uncomment the es5-adapter if you're using the umd version -->
1923
<script src="https://unpkg.com/@webcomponents/[email protected]/custom-elements-es5-adapter.js"></script>

‎elements/pfe-collapse/test/pfe-collapse_e2e.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@ describe(element, () => {
44
before(() => {
55
browser.url(`/elements/${element}/demo`);
66

7-
const collapse = $("#collapse");
8-
collapse.$(function () {
9-
this.toggle();
7+
browser.execute(function () {
8+
Promise.all([
9+
customElements.whenDefined("pfe-collapse")
10+
]).then(function () {
11+
document.querySelector("pfe-collapse").toggle();
12+
});
1013
});
14+
1115
browser.pause(1000);
1216
});
1317

‎elements/pfe-dropdown/demo/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap-reboot.css">
1414
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/typebase.css/0.5.0/typebase.css">
1515
-->
16-
16+
<link rel="stylesheet" href="../../pfe-styles/dist/pf-vars-rem.css" />
1717
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-base.css" />
1818
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-context.css" />
1919
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-layouts.css" />

‎elements/pfe-icon/demo/index_e2e.html‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@
77

88
<title>PatternFly Element | pfe-icon Demo</title>
99

10+
<link rel="stylesheet" type="text/css" href="../../pfe-styles/dist/red-hat-font.min.css">
11+
12+
<!-- Stylesheets for testing light DOM styles.
13+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap-reboot.css">
14+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/typebase.css/0.5.0/typebase.css">
15+
-->
16+
<link rel="stylesheet" href="../../pfe-styles/dist/pf-vars-rem.css" />
17+
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-base.css" />
18+
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-context.css" />
19+
<link rel="stylesheet" href="../../pfe-styles/dist/pfe-layouts.css" />
20+
1021
<noscript>
1122
<link href="../../pfelement/dist/pfelement--noscript.min.css" rel="stylesheet">
1223
</noscript>
@@ -21,17 +32,11 @@
2132
<script>
2233
require([
2334
'../dist/pfe-icon.umd.js',
24-
'../../pfe-card/dist/pfe-card.umd.js'
35+
'../../pfe-card/dist/pfe-card.umd.js',
36+
'../../pfe-band/dist/pfe-band.umd.js'
2537
])
2638

2739
</script>
28-
29-
<noscript>
30-
<link href="../../pfelement/dist/pfelement--noscript.min.css" rel="stylesheet">
31-
</noscript>
32-
33-
<link href="../../pfelement/dist/pfelement.min.css" rel="stylesheet">
34-
<link href="../../pfe-styles/dist/pfe-layouts.min.css" rel="stylesheet">
3540
</head>
3641

3742
<body unresolved>
@@ -601,13 +606,6 @@ <h3>Forced stretch</h3>
601606
<pfe-icon color="darker" size="lg" circled icon="rh-icon-app-unsecured"></pfe-icon>
602607
</div>
603608
</pfe-card>
604-
<!-- <pfe-card color="lightest" border>
605-
<h3>Locally hosted icons</h3>
606-
<pfe-icon size="xl" icon="local-square" class="has-fallback">
607-
Icon failed to load.</pfe-icon>
608-
<pfe-icon size="xl" color="complement" icon="local-rh-icon-api" class="has-fallback">Icon
609-
failed to load.</pfe-icon>
610-
</pfe-card> -->
611609
</div>
612610
</pfe-band>
613611

‎elements/pfe-icon/test/pfe-icon_e2e.js‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@ describe(element, () => {
55
browser.url(`/elements/${element}/demo/index_e2e.html`);
66
});
77

8-
it("should take a screenshot", () => {
9-
browser.pause(15000);
10-
browser.saveFullPageScreen(element);
11-
});
8+
if (browser.capabilities.browserName !== "IE") {
9+
it.skip("should take a screenshot");
10+
} else {
11+
it("should take a screenshot", () => {
12+
browser.pause(5000);
13+
browser.saveFullPageScreen(element);
14+
});
1215

13-
it("should compare to the baseline", () => {
14-
expect(browser.checkFullPageScreen(element)).toBeLessThan(1.25);
15-
});
16+
it("should compare to the baseline", () => {
17+
expect(browser.checkFullPageScreen(element)).toBeLessThan(1.25);
18+
});
19+
}
1620
});

0 commit comments

Comments
 (0)