diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index bba75f0..e465cd8 100644 --- 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 \ No newline at end of file + run: composer run-script phpunit \ No newline at end of file diff --git a/.gitignore b/.gitignore index b29633a..992a030 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ assets/js/build languages/riverbank.pot .DS_Store +.phpunit.result.cache \ No newline at end of file diff --git a/assets/js/src/design-pack-notice.js b/assets/js/src/design-pack-notice.js index 386d59e..bca5088 100644 --- 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( 'riverbank-design-pack-notice' ); +const container = document.createElement( 'div' ); +container.id = 'riverbank-design-pack-notice'; +document.body.appendChild( container ); if ( container ) { createRoot( container ).render( ); diff --git a/composer.json b/composer.json index af8d5e6..4d1823c 100644 --- 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 index f39d1b6..7b503a6 100644 --- a/inc/Admin.php +++ b/inc/Admin.php @@ -72,9 +72,6 @@ public function add_fse_design_pack_notice() { ), 'designPackNoticeData' ); - - - echo '
'; } diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 565f696..5ab92d0 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -8,6 +8,11 @@ define( 'RIVERBANK_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'; }