diff --git a/.eslintignore b/.eslintignore index 36bcf4d6274..c7d94701a8d 100644 --- a/.eslintignore +++ b/.eslintignore @@ -3,5 +3,4 @@ /assets/vendor/* /dist/* /tests/backstop/html_report/* -/tests/qunit/* /vendor/* diff --git a/assets/js/components/setup/setup-proxy.js b/assets/js/components/setup/setup-proxy.js index cc5f62a1919..3324d53ebe5 100644 --- a/assets/js/components/setup/setup-proxy.js +++ b/assets/js/components/setup/setup-proxy.js @@ -26,12 +26,12 @@ import Layout from 'GoogleComponents/layout/layout'; import Optin from 'GoogleComponents/optin'; import { sendAnalyticsTrackingEvent } from 'GoogleUtil'; import { getSiteKitAdminURL } from 'SiteKitCore/util'; -import { Component, Fragment } from 'GoogleUtil/react-features'; import { delay } from 'lodash'; /** * WordPress dependencies */ +import { Component, Fragment } from '@wordpress/element'; import { __, sprintf } from '@wordpress/i18n'; import { getQueryArg } from '@wordpress/url'; diff --git a/tests/e2e/specs/auth-flow-proxy.test.js b/tests/e2e/specs/auth-flow-proxy.test.js new file mode 100644 index 00000000000..76aab07eef0 --- /dev/null +++ b/tests/e2e/specs/auth-flow-proxy.test.js @@ -0,0 +1,17 @@ +/** + * WordPress dependencies + */ +import { visitAdminPage } from '@wordpress/e2e-test-utils'; + +describe( 'Site Kit set up flow for the first time', () => { + it( 'renders a splash page for proxy set up when no GCP credentials are provided', async () => { + await visitAdminPage( 'admin.php', 'page=googlesitekit-splash' ); + + await page.waitForSelector( '.googlesitekit-start-setup' ); + + await expect( page ).toMatchElement( '.googlesitekit-setup__title', { text: 'The Site Kit plugin is active but requires setup' } ); + await expect( page ).toMatchElement( '.googlesitekit-start-setup', { text: 'Start setup' } ); + await expect( page ).toMatchElement( '.googlesitekit-start-setup', { href: /^https:\/\/sitekit.withgoogle.com\/site-management\/setup\/\?/i } ); + } ); +} ); +