Merge pull request #1762 from google/enhancement/1356-wordpress-deps-…

…update WordPress dependencies update
google · Jul 13, 2020 · 277f492 · 277f492
2 parents b5710ab + 734f372
commit 277f492
Show file tree

Hide file tree

Showing 6 changed files with 1,533 additions and 2,336 deletions.
diff --git a/assets/js/modules/adsense/settings/settings-main.test.js b/assets/js/modules/adsense/settings/settings-main.test.js
@@ -19,7 +19,7 @@
 /**
  * Internal dependencies
  */
-import { render, fireEvent, wait } from '../../../../../tests/js/test-utils';
+import { render, fireEvent, waitFor } from '../../../../../tests/js/test-utils';
 import { STORE_NAME } from '../datastore/constants';
 import { STORE_NAME as CORE_SITE } from '../../../googlesitekit/datastore/site/constants';
 import { STORE_NAME as CORE_USER } from '../../../googlesitekit/datastore/user/constants';
@@ -57,7 +57,7 @@ describe( 'SettingsMain', () => {
 
 		rerender( <SettingsMain isOpen={ true } isEditing={ true } /> );
 
-		await wait( () => container.querySelector( '.googlesitekit-setup-module__switch' ) );
+		await waitFor( () => container.querySelector( '.googlesitekit-setup-module__switch' ) );
 		fireEvent.click( container.querySelector( '.googlesitekit-setup-module__switch [role="switch"]' ) );
 		expect( select( STORE_NAME ).haveSettingsChanged() ).toBe( true );
 
@@ -80,9 +80,9 @@ describe( 'SettingsMain', () => {
 
 		rerender( <SettingsMain isOpen={ true } isEditing={ true } /> );
 
-		await wait( () => container.querySelector( '.googlesitekit-setup-module__switch' ) );
+		await waitFor( () => container.querySelector( '.googlesitekit-setup-module__switch' ) );
 		fireEvent.click( container.querySelector( '.googlesitekit-setup-module__switch [role="switch"]' ) );
-		await wait( () => select( STORE_NAME ).haveSettingsChanged() === true );
+		await waitFor( () => select( STORE_NAME ).haveSettingsChanged() === true );
 
 		// Rendering with isOpen: false and isEditing: true is possible by clicking the module header.
 		// Rerendering here manually for clarity.

diff --git a/assets/js/modules/analytics/settings/settings-main.test.js b/assets/js/modules/analytics/settings/settings-main.test.js
@@ -19,7 +19,7 @@
 /**
  * Internal dependencies
  */
-import { render, fireEvent, wait } from '../../../../../tests/js/test-utils';
+import { render, fireEvent, waitFor } from '../../../../../tests/js/test-utils';
 import { STORE_NAME } from '../datastore/constants';
 import { STORE_NAME as CORE_SITE } from '../../../googlesitekit/datastore/site/constants';
 import * as fixtures from '../datastore/__fixtures__';
@@ -55,7 +55,7 @@ describe( 'SettingsMain', () => {
 
 		rerender( <SettingsMain isOpen={ true } isEditing={ true } /> );
 
-		await wait( () => container.querySelector( '.googlesitekit-analytics-usesnippet' ) );
+		await waitFor( () => container.querySelector( '.googlesitekit-analytics-usesnippet' ) );
 		fireEvent.click( container.querySelector( '.googlesitekit-analytics-usesnippet [role="switch"]' ) );
 		expect( select( STORE_NAME ).haveSettingsChanged() ).toBe( true );
 
@@ -83,9 +83,9 @@ describe( 'SettingsMain', () => {
 
 		rerender( <SettingsMain isOpen={ true } isEditing={ true } /> );
 
-		await wait( () => container.querySelector( '.googlesitekit-analytics-usesnippet' ) );
+		await waitFor( () => container.querySelector( '.googlesitekit-analytics-usesnippet' ) );
 		fireEvent.click( container.querySelector( '.googlesitekit-analytics-usesnippet [role="switch"]' ) );
-		await wait( () => select( STORE_NAME ).haveSettingsChanged() === true );
+		await waitFor( () => select( STORE_NAME ).haveSettingsChanged() === true );
 
 		// Rendering with isOpen: false and isEditing: true is possible by clicking the module header.
 		// Rerendering here manually for clarity.

diff --git a/assets/js/modules/optimize/components/settings/SettingsMain.test.js b/assets/js/modules/optimize/components/settings/SettingsMain.test.js
@@ -19,7 +19,7 @@
 /**
  * Internal dependencies
  */
-import { render, fireEvent, wait } from '../../../../../../tests/js/test-utils';
+import { render, fireEvent, waitFor } from '../../../../../../tests/js/test-utils';
 import { STORE_NAME } from '../../datastore/constants';
 import SettingsMain from './SettingsMain';
 
@@ -44,7 +44,7 @@ describe( 'SettingsMain', () => {
 
 		rerender( <SettingsMain isOpen={ true } isEditing={ true } /> );
 
-		await wait( () => container.querySelector( '.mdc-text-field__input' ) );
+		await waitFor( () => container.querySelector( '.mdc-text-field__input' ) );
 		fireEvent.change( container.querySelector( '.mdc-text-field__input' ), { target: { value: 'OPT-2222222' } } );
 		expect( select( STORE_NAME ).haveSettingsChanged() ).toBe( true );
 
@@ -65,7 +65,7 @@ describe( 'SettingsMain', () => {
 
 		rerender( <SettingsMain isOpen={ true } isEditing={ true } /> );
 
-		await wait( () => container.querySelector( '.mdc-text-field__input' ) );
+		await waitFor( () => container.querySelector( '.mdc-text-field__input' ) );
 		fireEvent.change( container.querySelector( '.mdc-text-field__input' ), { target: { value: 'OPT-2222222' } } );
 		expect( select( STORE_NAME ).haveSettingsChanged() ).toBe( true );
 

diff --git a/assets/js/modules/tagmanager/components/common/AccountCreate.test.js b/assets/js/modules/tagmanager/components/common/AccountCreate.test.js
@@ -20,7 +20,7 @@
  * Internal dependencies
  */
 import AccountCreate from './AccountCreate';
-import { fireEvent, render, wait } from '../../../../../../tests/js/test-utils';
+import { fireEvent, render, waitFor } from '../../../../../../tests/js/test-utils';
 import { STORE_NAME } from '../../datastore/constants';
 import { STORE_NAME as CORE_SITE } from '../../../../googlesitekit/datastore/site/constants';
 import { STORE_NAME as CORE_USER } from '../../../../googlesitekit/datastore/user/constants';
@@ -66,7 +66,7 @@ describe( 'AccountCreate', () => {
 		muteFetch( /^\/google-site-kit\/v1\/modules\/tagmanager\/data\/containers/, [] );
 		fireEvent.click( refechMyAccountButton );
 
-		await wait( () => expect( fetchMock ).toHaveFetched( /^\/google-site-kit\/v1\/modules\/tagmanager\/data\/accounts/ ) );
+		await waitFor( () => expect( fetchMock ).toHaveFetched( /^\/google-site-kit\/v1\/modules\/tagmanager\/data\/accounts/ ) );
 	} );
 
 	describe( '"Create an account" button', () => {