@@ -8,17 +8,12 @@ import createWrapper from '../../../lib/components/test-utils/selectors';
88import styles from '../../../lib/components/icon/styles.selectors.js' ;
99
1010const dynamicIconSelector = createWrapper ( ) . findIcon ( '#dynamic-test-2' ) . toSelector ( ) ;
11- const staticIconSelector = createWrapper ( ) . findIcon ( '#static-test' ) . toSelector ( ) ;
1211const removedIconSelector = createWrapper ( ) . findIcon ( '#visibility-test-1' ) . toSelector ( ) ;
1312const hiddenIconSelector = createWrapper ( ) . findIcon ( '#visibility-test-2' ) . toSelector ( ) ;
1413
1514const dynamicHeightInput = '#height-input' ;
1615
1716class IconSizeInherit extends BasePageObject {
18- async toggleMode ( ) {
19- await this . click ( 'label=Visual refresh' ) ;
20- }
21-
2217 async toggleVisibility ( ) {
2318 await this . click ( '#visibility-toggle' ) ;
2419 }
@@ -34,13 +29,11 @@ class IconSizeInherit extends BasePageObject {
3429}
3530
3631describe ( 'Icon' , ( ) => {
37- const setupTest = ( testFn : ( page : IconSizeInherit ) => Promise < void > ) => {
32+ const setupTest = ( testFn : ( page : IconSizeInherit ) => Promise < void > , classic ?: boolean ) => {
3833 return useBrowser ( async browser => {
3934 const page = new IconSizeInherit ( browser ) ;
40- await browser . url ( ' #/light/icon/size-inherit' ) ;
35+ await browser . url ( ` #/light/icon/size-inherit?visualRefresh= ${ ! classic } ` ) ;
4136 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 ( ) ;
4437 await testFn ( page ) ;
4538 } ) ;
4639 } ;
@@ -56,18 +49,6 @@ describe('Icon', () => {
5649 await expect ( page . hasSize ( 'size-medium' ) ) . resolves . toBe ( true ) ;
5750 } )
5851 ) ;
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- ) ;
7152 test (
7253 'Hidden icon should have correct height and size after becoming visible' ,
7354 setupTest ( async page => {
@@ -76,11 +57,29 @@ describe('Icon', () => {
7657 await expect ( page . isExisting ( removedIconSelector ) ) . resolves . toBe ( true ) ;
7758 await expect ( page . isExisting ( hiddenIconSelector ) ) . resolves . toBe ( true ) ;
7859
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 ) ;
8162
8263 await expect ( page . getHeight ( hiddenIconSelector ) ) . resolves . toEqual ( 27 ) ;
8364 await expect ( page . hasSize ( 'size-medium' , hiddenIconSelector ) ) . resolves . toBe ( true ) ;
8465 } )
8566 ) ;
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+ } ) ;
8685} ) ;
0 commit comments