Skip to content

Commit 248d0c1

Browse files
committed
chore(e2e): add css back to e2e tests where it was missing
add css back to e2e tests where it was missing
1 parent 9bfabfc commit 248d0c1

File tree

5 files changed

+132
-5
lines changed

5 files changed

+132
-5
lines changed

demos/src/loading/app.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { Component } from '@angular/core';
22
import { LoadingController, NavController } from 'ionic-angular';
33

44
@Component({
5-
templateUrl: 'page.html'
5+
templateUrl: 'page.html',
6+
styleUrls: ['style.css']
67
})
78
export class Page1 {
89
constructor(public loadingCtrl: LoadingController, public navCtrl: NavController) {}

src/components/loading/test/basic/app-module.ts

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,81 @@ import { IonicApp, IonicModule, LoadingController, NavController } from '../../.
33

44

55
@Component({
6-
templateUrl: 'main.html'
6+
templateUrl: 'main.html',
7+
styles: [
8+
`
9+
/* Fix the spinner used in e2e */
10+
.fixed-spinner svg {
11+
animation: none;
12+
}
13+
`,
14+
`
15+
.custom-spinner-container {
16+
position: relative;
17+
display: inline-block;
18+
box-sizing: border-box;
19+
}
20+
`,
21+
`
22+
.custom-spinner-box {
23+
position: relative;
24+
box-sizing: border-box;
25+
border: 4px solid #000;
26+
width: 60px;
27+
height: 60px;
28+
animation: spin 3s infinite linear;
29+
}
30+
`,
31+
`
32+
.custom-spinner-box:before {
33+
content: '';
34+
position: absolute;
35+
top: 50%;
36+
left: 50%;
37+
transform: translate(-50%, -50%);
38+
box-sizing: border-box;
39+
border: 4px solid #000;
40+
width: 40px;
41+
height: 40px;
42+
animation: pulse 1.5s infinite ease;
43+
}
44+
`,
45+
`
46+
.wp .custom-spinner-box,
47+
.wp .custom-spinner-box:before {
48+
border-color: #fff;
49+
}
50+
`
51+
,
52+
`
53+
@-webkit-keyframes pulse {
54+
50% {
55+
border-width: 20px;
56+
}
57+
}
58+
`,
59+
`
60+
@keyframes pulse {
61+
50% {
62+
border-width: 20px;
63+
}
64+
}
65+
`,
66+
`
67+
@-webkit-keyframes spin {
68+
100% {
69+
-webkit-transform: rotate(360deg);
70+
transform: rotate(360deg);
71+
}
72+
}
73+
`,
74+
`@keyframes spin {
75+
100% {
76+
-webkit-transform: rotate(360deg);
77+
transform: rotate(360deg);
78+
}
79+
}`
80+
]
781
})
882
export class E2EPage {
983
constructor(public loadingCtrl: LoadingController, public navCtrl: NavController) {}

src/components/tabs/test/badges/app-module.ts

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,24 @@ export class E2EPage {}
77

88
@Component({
99
templateUrl: 'main.html',
10-
encapsulation: ViewEncapsulation.None
10+
encapsulation: ViewEncapsulation.None,
11+
styles: [
12+
`
13+
ion-tabs {
14+
margin-bottom: 20px;
15+
}
16+
`,
17+
`
18+
ion-tabs,
19+
ion-tabs ion-tabbar {
20+
position: relative;
21+
top: auto;
22+
height: auto;
23+
visibility: visible;
24+
opacity: 1;
25+
}
26+
`
27+
]
1128
})
1229
export class E2EApp {
1330
root = E2EPage;

src/components/tabs/test/colors/app-module.ts

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,25 @@ export class E2EPage {}
88

99
@Component({
1010
templateUrl: 'main.html',
11-
encapsulation: ViewEncapsulation.None
11+
encapsulation: ViewEncapsulation.None,
12+
styles: [
13+
`
14+
ion-tabs {
15+
margin-bottom: 20px;
16+
}
17+
`,
18+
19+
`
20+
ion-tabs,
21+
ion-tabs ion-tabbar {
22+
position: relative;
23+
top: auto;
24+
height: auto;
25+
visibility: visible;
26+
opacity: 1;
27+
}
28+
`
29+
]
1230
})
1331
export class E2EApp {
1432
root = E2EPage;

src/components/tabs/test/tab-bar-scenarios/app-module.ts

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,24 @@ export class E2EPage {}
88

99
@Component({
1010
templateUrl: 'main.html',
11-
encapsulation: ViewEncapsulation.None
11+
encapsulation: ViewEncapsulation.None,
12+
styles: [
13+
`
14+
ion-tabs {
15+
margin-bottom: 20px;
16+
}
17+
`,
18+
`
19+
ion-tabs,
20+
ion-tabs ion-tabbar {
21+
position: relative;
22+
top: auto;
23+
height: auto;
24+
visibility: visible;
25+
opacity: 1;
26+
}
27+
`
28+
]
1229
})
1330
export class E2EApp {
1431
root = E2EPage;

0 commit comments

Comments
 (0)