@@ -8,17 +8,12 @@ import createWrapper from '../../../lib/components/test-utils/selectors';
8
8
import styles from '../../../lib/components/icon/styles.selectors.js' ;
9
9
10
10
const dynamicIconSelector = createWrapper ( ) . findIcon ( '#dynamic-test-2' ) . toSelector ( ) ;
11
- const staticIconSelector = createWrapper ( ) . findIcon ( '#static-test' ) . toSelector ( ) ;
12
11
const removedIconSelector = createWrapper ( ) . findIcon ( '#visibility-test-1' ) . toSelector ( ) ;
13
12
const hiddenIconSelector = createWrapper ( ) . findIcon ( '#visibility-test-2' ) . toSelector ( ) ;
14
13
15
14
const dynamicHeightInput = '#height-input' ;
16
15
17
16
class IconSizeInherit extends BasePageObject {
18
- async toggleMode ( ) {
19
- await this . click ( 'label=Visual refresh' ) ;
20
- }
21
-
22
17
async toggleVisibility ( ) {
23
18
await this . click ( '#visibility-toggle' ) ;
24
19
}
@@ -34,13 +29,11 @@ class IconSizeInherit extends BasePageObject {
34
29
}
35
30
36
31
describe ( 'Icon' , ( ) => {
37
- const setupTest = ( testFn : ( page : IconSizeInherit ) => Promise < void > ) => {
32
+ const setupTest = ( testFn : ( page : IconSizeInherit ) => Promise < void > , classic ?: boolean ) => {
38
33
return useBrowser ( async browser => {
39
34
const page = new IconSizeInherit ( browser ) ;
40
- await browser . url ( ' #/light/icon/size-inherit' ) ;
35
+ await browser . url ( ` #/light/icon/size-inherit?visualRefresh= ${ ! classic } ` ) ;
41
36
await page . waitForVisible ( dynamicIconSelector ) ;
42
- // The default theme is VR by default, so we toggle once to go to classic mode
43
- await page . toggleMode ( ) ;
44
37
await testFn ( page ) ;
45
38
} ) ;
46
39
} ;
@@ -56,18 +49,6 @@ describe('Icon', () => {
56
49
await expect ( page . hasSize ( 'size-medium' ) ) . resolves . toBe ( true ) ;
57
50
} )
58
51
) ;
59
- test (
60
- 'Should update icon height and size on visual mode change' ,
61
- setupTest ( async page => {
62
- await expect ( page . getHeight ( staticIconSelector ) ) . resolves . toEqual ( 22 ) ;
63
- await expect ( page . hasSize ( 'size-normal' , staticIconSelector ) ) . resolves . toBe ( true ) ;
64
-
65
- await page . toggleMode ( ) ;
66
-
67
- await expect ( page . getHeight ( staticIconSelector ) ) . resolves . toEqual ( 24 ) ;
68
- await expect ( page . hasSize ( 'size-medium' , staticIconSelector ) ) . resolves . toBe ( true ) ;
69
- } )
70
- ) ;
71
52
test (
72
53
'Hidden icon should have correct height and size after becoming visible' ,
73
54
setupTest ( async page => {
@@ -76,11 +57,29 @@ describe('Icon', () => {
76
57
await expect ( page . isExisting ( removedIconSelector ) ) . resolves . toBe ( true ) ;
77
58
await expect ( page . isExisting ( hiddenIconSelector ) ) . resolves . toBe ( true ) ;
78
59
79
- await expect ( page . getHeight ( removedIconSelector ) ) . resolves . toEqual ( 36 ) ;
80
- await expect ( page . hasSize ( 'size-big ' , removedIconSelector ) ) . resolves . toBe ( true ) ;
60
+ await expect ( page . getHeight ( removedIconSelector ) ) . resolves . toEqual ( 30 ) ;
61
+ await expect ( page . hasSize ( 'size-medium ' , removedIconSelector ) ) . resolves . toBe ( true ) ;
81
62
82
63
await expect ( page . getHeight ( hiddenIconSelector ) ) . resolves . toEqual ( 27 ) ;
83
64
await expect ( page . hasSize ( 'size-medium' , hiddenIconSelector ) ) . resolves . toBe ( true ) ;
84
65
} )
85
66
) ;
67
+
68
+ describe ( 'Classic' , ( ) => {
69
+ test (
70
+ 'Hidden icon should have correct height and size after becoming visible' ,
71
+ setupTest ( async page => {
72
+ await expect ( page . isExisting ( removedIconSelector ) ) . resolves . toBe ( false ) ;
73
+ await page . toggleVisibility ( ) ;
74
+ await expect ( page . isExisting ( removedIconSelector ) ) . resolves . toBe ( true ) ;
75
+ await expect ( page . isExisting ( hiddenIconSelector ) ) . resolves . toBe ( true ) ;
76
+
77
+ await expect ( page . getHeight ( removedIconSelector ) ) . resolves . toEqual ( 36 ) ;
78
+ await expect ( page . hasSize ( 'size-big' , removedIconSelector ) ) . resolves . toBe ( true ) ;
79
+
80
+ await expect ( page . getHeight ( hiddenIconSelector ) ) . resolves . toEqual ( 27 ) ;
81
+ await expect ( page . hasSize ( 'size-medium' , hiddenIconSelector ) ) . resolves . toBe ( true ) ;
82
+ } , true )
83
+ ) ;
84
+ } ) ;
86
85
} ) ;
0 commit comments