diff --git a/.env.dist.testing b/.env.dist.testing index 8241188..48caed0 100644 --- a/.env.dist.testing +++ b/.env.dist.testing @@ -28,8 +28,8 @@ CHROMEDRIVER_HOST=localhost CHROMEDRIVER_PORT=9515 # The user agents used in end-to-end tests. -TEST_SITE_HTTP_USER_AGENT=HeadlessChrome -TEST_SITE_HTTP_USER_AGENT_MOBILE=HeadlessChromeMobile +TEST_SITE_HTTP_USER_AGENT="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/150.0.0.0 Safari/537.36 WordPress/7.0.1;PHP/8.4.1;ConvertKit/3.3.6;http://example.com" +TEST_SITE_HTTP_USER_AGENT_MOBILE="Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/150.0.0.0 Mobile Safari/537.36 WordPress/7.0.1;PHP/8.4.1;ConvertKit/3.3.6;http://example.com" # Kit specific variables. CONVERTKIT_API_ACCOUNT_ID=841415 diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 24bdfee..448b28d 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -70,7 +70,7 @@ jobs: # Defines the WordPress and PHP Versions matrix to run tests on. strategy: matrix: - wp-versions: [ 'latest' ] #[ '6.1.1', 'latest' ] + wp-versions: [ '7.1-RC3' ] #[ '6.1.1', 'latest' ] php-versions: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] #[ '7.3', '7.4', '8.0', '8.1' ] # Steps to install, configure and run tests diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 577c9d4..edfc2cb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -81,7 +81,7 @@ jobs: strategy: fail-fast: false matrix: - wp-versions: [ 'latest' ] #[ '6.1.1', 'latest' ] + wp-versions: [ '7.1-RC3' ] #[ '6.1.1', 'latest' ] php-versions: [ '8.1', '8.2', '8.3', '8.4' ] #[ '7.3', '7.4', '8.0', '8.1' ] # Folder names within the 'tests' folder to run tests in parallel. diff --git a/composer.json b/composer.json index 23a1ad6..526f8a5 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "project", "license": "GPLv3", "require": { - "convertkit/convertkit-wordpress-libraries": "2.1.7" + "convertkit/convertkit-wordpress-libraries": "2.6.0" }, "require-dev": { "php-webdriver/webdriver": "^1.0", diff --git a/tests/Support/Helper/ThirdPartyPlugin.php b/tests/Support/Helper/ThirdPartyPlugin.php index 9ca7f73..54e9e3f 100644 --- a/tests/Support/Helper/ThirdPartyPlugin.php +++ b/tests/Support/Helper/ThirdPartyPlugin.php @@ -32,7 +32,7 @@ public function activateThirdPartyPlugin($I, $name) $I->waitForElementVisible('body.plugins-php'); // Activate the Plugin. - $I->checkOption('//*[@data-slug="' . $name . '"]/th/input'); + $I->checkOption('//*[@data-slug="' . $name . '"]//input[@type="checkbox"]'); $I->selectOption('action', 'activate-selected'); $I->click('#doaction'); @@ -66,7 +66,7 @@ public function deactivateThirdPartyPlugin($I, $name) $I->waitForElementVisible('body.plugins-php'); // Deactivate the Plugin. - $I->checkOption('//*[@data-slug="' . $name . '"]/th/input'); + $I->checkOption('//*[@data-slug="' . $name . '"]//input[@type="checkbox"]'); $I->selectOption('action', 'deactivate-selected'); $I->click('#doaction');