From 7ac0651112d9ba88800749a1fc59e51ecd1b66ea Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Wed, 18 Oct 2023 11:39:45 -0600 Subject: [PATCH 1/5] Add workflow to run PHPUnit tests --- .github/workflows/phpunit.yml | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/phpunit.yml diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml new file mode 100644 index 0000000..010e271 --- /dev/null +++ b/.github/workflows/phpunit.yml @@ -0,0 +1,49 @@ +name: PHPUnit + +on: + push: + branches: + - develop + - trunk + paths: + - '**.php' + pull_request: + branches: + - develop + paths: + - '**.php' + +jobs: + phpunit: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - uses: getong/mariadb-action@v1.1 + + - name: Setup proper PHP version + uses: shivammathur/setup-php@v2 + with: + php-version: 7.4 + + - name: Get composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache dependencies + uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: ${{ runner.os }}-composer- + + - name: Install dependencies + run: composer install + + - name: Setup WP Tests + run: bash bin/install-wp-tests.sh wordpress_test root '' 127.0.0.1 + + - name: PHPUnit + run: './vendor/bin/phpunit' From 8994e31f1eedddcd6a39f3ee20949ee523470976 Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Wed, 18 Oct 2023 11:42:12 -0600 Subject: [PATCH 2/5] Test PHP change --- block-catalog.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block-catalog.php b/block-catalog.php index 5b2f68e..38e6518 100755 --- a/block-catalog.php +++ b/block-catalog.php @@ -50,3 +50,5 @@ // Bootstrap. BlockCatalog\setup(); + +// Test change From 7634bfbc2baadaa5bc74c26230d839bac111db55 Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Wed, 18 Oct 2023 13:03:24 -0600 Subject: [PATCH 3/5] Try running tests in multisite --- phpunit.xml.dist | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 215c91d..dfb8978 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -17,4 +17,10 @@ ./includes + + + + + + From 76522f33c2c1351bc3789f9228831be5b6dc4965 Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Wed, 18 Oct 2023 13:07:10 -0600 Subject: [PATCH 4/5] Break code to ensure it is caught --- block-catalog.php | 2 -- includes/classes/PostFinder.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/block-catalog.php b/block-catalog.php index 38e6518..5b2f68e 100755 --- a/block-catalog.php +++ b/block-catalog.php @@ -50,5 +50,3 @@ // Bootstrap. BlockCatalog\setup(); - -// Test change diff --git a/includes/classes/PostFinder.php b/includes/classes/PostFinder.php index 3a3a336..fc48665 100644 --- a/includes/classes/PostFinder.php +++ b/includes/classes/PostFinder.php @@ -162,7 +162,7 @@ public function get_tax_query_terms( $args = [] ) { $slugs = []; foreach ( $args as $index => $arg ) { - $slug = sanitize_title( $arg ); + $slug = $arg; $slug_term = get_term_by( 'slug', $slug, BLOCK_CATALOG_TAXONOMY ); /** From 3288c66c43ade07171f602bb740db23c6fff9a44 Mon Sep 17 00:00:00 2001 From: Darin Kotter Date: Wed, 18 Oct 2023 13:08:38 -0600 Subject: [PATCH 5/5] Revert break --- includes/classes/PostFinder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/classes/PostFinder.php b/includes/classes/PostFinder.php index fc48665..3a3a336 100644 --- a/includes/classes/PostFinder.php +++ b/includes/classes/PostFinder.php @@ -162,7 +162,7 @@ public function get_tax_query_terms( $args = [] ) { $slugs = []; foreach ( $args as $index => $arg ) { - $slug = $arg; + $slug = sanitize_title( $arg ); $slug_term = get_term_by( 'slug', $slug, BLOCK_CATALOG_TAXONOMY ); /**