Use upstream utils when possible

woocommerce · Apr 2, 2023 · c025afa · c025afa
1 parent a3c13c2
commit c025afa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/tests/e2e/utils.js b/tests/e2e/utils.js
@@ -14,11 +14,11 @@ import {
 	enterEditMode,
 	getAllBlocks,
 	ensureSidebarOpened,
+	switchBlockInspectorTab,
 } from '@wordpress/e2e-test-utils';
 import { addQueryArgs } from '@wordpress/url';
 import { WP_ADMIN_DASHBOARD } from '@woocommerce/e2e-utils';
 import fs from 'fs';
-import { switchBlockInspectorTabWhenGutenbergIsInstalled } from '@woocommerce/blocks-test-utils';
 
 /**
  * Internal dependencies
@@ -506,7 +506,7 @@ export const insertAllProductsBlock = async () => {
 
 export const enableApplyFiltersButton = async () => {
 	await ensureSidebarOpened();
-	await switchBlockInspectorTabWhenGutenbergIsInstalled( 'Settings' );
+	await switchBlockInspectorTab( 'Settings' );
 
 	await page.waitForXPath( SELECTORS.editor.filterButtonToggle );
 

diff --git a/tests/utils/switch-block-inspector-tab-when-gutenberg-is-installed.ts b/tests/utils/switch-block-inspector-tab-when-gutenberg-is-installed.ts
@@ -1,18 +1,16 @@
 /**
  * External dependencies
  */
-import { switchBlockInspectorTab } from '@wordpress/e2e-test-utils';
-
-/**
- * Internal dependencies
- */
-import { openSettingsSidebar } from '../e2e/utils.js';
+import {
+	ensureSidebarOpened,
+	switchBlockInspectorTab,
+} from '@wordpress/e2e-test-utils';
 
 export const switchBlockInspectorTabWhenGutenbergIsInstalled = async (
 	tabName: string
 ) => {
 	// Open the sidebar in case it was closed.
-	await openSettingsSidebar();
+	await ensureSidebarOpened();
 
 	const blockButton = await page.waitForXPath(
 		"//button[contains(text(), 'Block')]"