From 9dd031452137ec01238da5d1088f0cff224c79da Mon Sep 17 00:00:00 2001 From: Tim Carr Date: Tue, 30 Jun 2026 11:11:20 +0800 Subject: [PATCH 1/2] Tests: Update GitHub Actions for Node 20 deprecation --- .github/workflows/tests.yml | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9c7ea58..7f7d157 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -129,22 +129,19 @@ jobs: # Write any secrets, such as API keys, to the .env.testing file now. - name: Define GitHub Secrets in .env.testing - uses: DamianReeves/write-file-action@v1.3 - with: - path: ${{ env.PLUGIN_DIR }}/.env.testing - contents: | - CONVERTKIT_API_KEY=${{ env.CONVERTKIT_API_KEY }} - CONVERTKIT_API_SECRET=${{ env.CONVERTKIT_API_SECRET }} - CONVERTKIT_OAUTH_ACCESS_TOKEN=${{ env.CONVERTKIT_OAUTH_ACCESS_TOKEN }} - CONVERTKIT_OAUTH_REFRESH_TOKEN=${{ env.CONVERTKIT_OAUTH_REFRESH_TOKEN }} - CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA=${{ env.CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA }} - CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA=${{ env.CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA }} - CONVERTKIT_OAUTH_CLIENT_ID=${{ env.CONVERTKIT_OAUTH_CLIENT_ID }} - CONVERTKIT_OAUTH_REDIRECT_URI=${{ env.CONVERTKIT_OAUTH_REDIRECT_URI }} - CONVERTKIT_API_SIGNED_SUBSCRIBER_ID=${{ env.CONVERTKIT_API_SIGNED_SUBSCRIBER_ID }} - CONVERTKIT_API_SUBSCRIBER_TOKEN=${{ env.CONVERTKIT_API_SUBSCRIBER_TOKEN }} - - write-mode: append + run: | + cat > ${{ env.PLUGIN_DIR }}/.env.testing << 'ENVEOF' + CONVERTKIT_API_KEY=${{ env.CONVERTKIT_API_KEY }} + CONVERTKIT_API_SECRET=${{ env.CONVERTKIT_API_SECRET }} + CONVERTKIT_OAUTH_ACCESS_TOKEN=${{ env.CONVERTKIT_OAUTH_ACCESS_TOKEN }} + CONVERTKIT_OAUTH_REFRESH_TOKEN=${{ env.CONVERTKIT_OAUTH_REFRESH_TOKEN }} + CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA=${{ env.CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA }} + CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA=${{ env.CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA }} + CONVERTKIT_OAUTH_CLIENT_ID=${{ env.CONVERTKIT_OAUTH_CLIENT_ID }} + CONVERTKIT_OAUTH_REDIRECT_URI=${{ env.CONVERTKIT_OAUTH_REDIRECT_URI }} + CONVERTKIT_API_SIGNED_SUBSCRIBER_ID=${{ env.CONVERTKIT_API_SIGNED_SUBSCRIBER_ID }} + CONVERTKIT_API_SUBSCRIBER_TOKEN=${{ env.CONVERTKIT_API_SUBSCRIBER_TOKEN }} + ENVEOF # Installs wp-browser, Codeception, PHP CodeSniffer and anything else needed to run tests. - name: Run Composer From 7958e65f5233d9933694a63c591c15840a2a3a05 Mon Sep 17 00:00:00 2001 From: Tim Carr Date: Thu, 2 Jul 2026 18:25:04 +0800 Subject: [PATCH 2/2] Tests: Revert `testCreateSubscriberWithInvalidCustomFields` --- tests/Integration/APITest.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/Integration/APITest.php b/tests/Integration/APITest.php index 1620130..b4a9fc6 100644 --- a/tests/Integration/APITest.php +++ b/tests/Integration/APITest.php @@ -3924,7 +3924,7 @@ public function testCreateSubscriberWithInvalidSubscriberState() } /** - * Test that create_subscriber() returns a WP_Error + * Test that create_subscriber() returns the expected data * when an invalid custom field is included. * * @since 2.0.0 @@ -3940,8 +3940,14 @@ public function testCreateSubscriberWithInvalidCustomFields() 'not_a_custom_field' => 'value', ] ); - $this->assertInstanceOf(\WP_Error::class, $result); - $this->assertEquals($result->get_error_code(), $this->errorCode); + $this->assertNotInstanceOf(\WP_Error::class, $result); + $this->assertIsArray($result); + + // Set subscriber_id to ensure subscriber is unsubscribed after test. + $this->subscriber_ids[] = $result['subscriber']['id']; + + // Assert subscriber exists with correct data. + $this->assertEquals($result['subscriber']['email_address'], $emailAddress); } /**