diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2b4d74d..577c9d4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -97,7 +97,7 @@ jobs: steps: - name: Define Test Group Name id: test-group - uses: mad9000/actions-find-and-replace-string@5 + uses: mad9000/actions-find-and-replace-string@6 with: source: ${{ matrix.test-groups }} find: '/' @@ -235,9 +235,6 @@ jobs: - name: Start nginx run: sudo systemctl start nginx.service - - - name: Install chromedriver - uses: nanasess/setup-chromedriver@master - name: Start chromedriver run: | @@ -262,22 +259,20 @@ jobs: # Write any secrets, such as API keys, to the .env.testing file now. - name: Define GitHub Secrets in .env.dist.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_API_KEY_NO_DATA=${{ env.CONVERTKIT_API_KEY_NO_DATA }} - CONVERTKIT_API_SECRET_NO_DATA=${{ env.CONVERTKIT_API_SECRET_NO_DATA }} - 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 }} - KIT_OAUTH_REDIRECT_URI=${{ env.KIT_OAUTH_REDIRECT_URI }} - write-mode: overwrite + run: | + cat > ${{ env.PLUGIN_DIR }}/.env.testing << 'ENVEOF' + CONVERTKIT_API_KEY=${{ env.CONVERTKIT_API_KEY }} + CONVERTKIT_API_SECRET=${{ env.CONVERTKIT_API_SECRET }} + CONVERTKIT_API_KEY_NO_DATA=${{ env.CONVERTKIT_API_KEY_NO_DATA }} + CONVERTKIT_API_SECRET_NO_DATA=${{ env.CONVERTKIT_API_SECRET_NO_DATA }} + 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 }} + KIT_OAUTH_REDIRECT_URI=${{ env.KIT_OAUTH_REDIRECT_URI }} + ENVEOF # Installs wp-browser, Codeception, PHP CodeSniffer and anything else needed to run tests. - name: Run Composer diff --git a/composer.json b/composer.json index eeb6d36..23a1ad6 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "project", "license": "GPLv3", "require": { - "convertkit/convertkit-wordpress-libraries": "2.1.6" + "convertkit/convertkit-wordpress-libraries": "2.1.7" }, "require-dev": { "php-webdriver/webdriver": "^1.0", diff --git a/tests/EndToEnd/forms/FormBackwardCompatCest.php b/tests/EndToEnd/forms/FormBackwardCompatCest.php index 6c80d12..edb0686 100644 --- a/tests/EndToEnd/forms/FormBackwardCompatCest.php +++ b/tests/EndToEnd/forms/FormBackwardCompatCest.php @@ -323,8 +323,8 @@ public function testCreateFormWithInvalidCustomField(EndToEndTester $I) $I->waitForElementVisible('.wpforms-confirmation-scroll'); $I->seeInSource('Thanks for contacting us! We will be in touch with you shortly.'); - // Check subscriber does not exist, as specifying an invalid custom field will result in an API error. - $I->apiCheckSubscriberDoesNotExist($I, $emailAddress); + // Check API to confirm subscriber was sent. + $I->apiCheckSubscriberExists($I, $emailAddress, $firstName); } /**