Merge pull request #55 from Codeinwp/fix/design-pack-error

Fix/design pack error
Codeinwp · Aug 20, 2024 · d84acf1 · d84acf1
2 parents 7abff52 + 6741dfe
commit d84acf1
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Setup PHP version
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.1'
+          php-version: '7.2'
           extensions: simplexml, mysql
           tools: phpunit-polyfills
       - name: Checkout source code
@@ -69,4 +69,4 @@ jobs:
       - name: Install composer
         run: composer install --prefer-dist --no-progress --no-suggest
       - name: Run phpunit
-        run: phpunit
+        run: composer run-script phpunit
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ assets/js/build
 languages/fork.pot
 
 .DS_Store
+phpunit.result.cache
diff --git a/assets/js/src/design-pack-notice.js b/assets/js/src/design-pack-notice.js
@@ -2,7 +2,9 @@ import { createRoot } from '@wordpress/element';
 
 import DesignPackNotice from './components/DesignPackNotice';
 
-const container = document.getElementById( 'fork-design-pack-notice' );
+const container = document.createElement( 'div' );
+container.id = 'fork-design-pack-notice';
+document.body.appendChild( container );
 
 if ( container ) {
 	createRoot( container ).render( <DesignPackNotice /> );

diff --git a/composer.json b/composer.json
@@ -51,6 +51,7 @@
         "format": "phpcbf --standard=phpcs.xml --report-summary --report-source -s  --runtime-set testVersion 7.0- ",
         "phpcs": "phpcs --standard=phpcs.xml -s  --runtime-set testVersion 7.0-",
         "lint": "composer run-script phpcs",
-        "phpcs-i": "phpcs -i"
+        "phpcs-i": "phpcs -i",
+        "phpunit": "phpunit"
     }
 }
diff --git a/inc/Admin.php b/inc/Admin.php
@@ -73,8 +73,6 @@ public function add_fse_design_pack_notice() {
 			),
 			'designPackNoticeData'
 		);
-
-		echo '<div id="fork-design-pack-notice"></div>';
 	}
 
 	/**

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -8,6 +8,11 @@
 define( 'FORK_IGNORE_SOURCE_CHECK', true );
 
 $_tests_dir = getenv( 'WP_TESTS_DIR' );
+
+if ( class_exists( '\Yoast\PHPUnitPolyfills\Autoload' ) === false ) {
+	require_once dirname( dirname( __FILE__ ) ) . '/vendor/yoast/phpunit-polyfills/phpunitpolyfills-autoload.php';
+}
+
 if ( ! $_tests_dir ) {
 	$_tests_dir = '/tmp/wordpress-tests-lib';
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,4 @@ assets/js/build
		languages/fork.pot

		.DS_Store
		phpunit.result.cache
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,8 +73,6 @@ public function add_fse_design_pack_notice() { @@
     			),
     			'designPackNoticeData'
     		);
-    		echo '<div id="fork-design-pack-notice"></div>';
     	}
     	/**
@@ Expand Down @@