Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding PHP 7.2 testing with Travis. #8212

Merged
merged 5 commits into from
Feb 6, 2018
Merged

Adding PHP 7.2 testing with Travis. #8212

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
85467ef
Adding PHP 7.2 testing with Travis.
zinigor Nov 20, 2017
c09754a
Removed separate process requirement for tests to avoid failures on W…
zinigor Feb 5, 2018
b792e50
Disabled tests that fail due to deprecation of each on WP 4.8.
zinigor Feb 5, 2018
d4b7e9f
Added a unified skip statement for PHP 7.2 and WP 4.8.
zinigor Feb 5, 2018
4dd3c30
Fixed whitespace.
zinigor Feb 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ matrix:
- php: "5.6"
- php: "7.0"
- php: "7.1"
- php: "7.2"

allow_failures:
- php: "7.0"
Expand Down
29 changes: 10 additions & 19 deletions tests/php/sync/test_class.jetpack-sync-plugins-updates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,17 @@ class WP_Test_Jetpack_Sync_Plugins_Updates extends WP_Test_Jetpack_Sync_Base {
public function setUp() {
parent::setUp();


require ABSPATH . 'wp-includes/version.php';
if ( defined( 'PHP_VERSION_ID' ) && PHP_VERSION_ID < 50300 ) {
$this->markTestIncomplete("Right now this doesn't work on PHP 5.2");
$this->markTestIncomplete( "Right now this doesn't work on PHP 5.2");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you added a space before the first ", maybe you want to add one at the end as well?

}

if (
version_compare( $wp_version, '4.9.0', '<' )
&& defined( 'PHP_VERSION_ID' )
&& PHP_VERSION_ID >= 70200
) {
$this->markTestIncomplete( "Right now this doesn't work on PHP 7.2 with WordPress < 4.9" );
}

$this->server_event_storage->reset();
Expand All @@ -40,9 +48,6 @@ public static function tearDownAfterClass() {
}

public function test_updating_a_plugin_is_synced() {
if ( defined( 'PHP_VERSION_ID' ) && PHP_VERSION_ID < 50300 ) {
$this->markTestIncomplete( "Right now this doesn't work on PHP 5.2");
}
$skins = array(
new Plugin_Upgrader_Skin( compact( 'title', 'url', 'nonce', 'plugin', 'api' ) ),
new Automatic_Upgrader_Skin( compact( 'title', 'url', 'nonce', 'plugin', 'api' ) ),
Expand All @@ -59,9 +64,6 @@ public function test_updating_a_plugin_is_synced() {
}

public function test_updating_plugin_in_bulk_is_synced() {
if ( defined( 'PHP_VERSION_ID' ) && PHP_VERSION_ID < 50300 ) {
$this->markTestIncomplete("Right now this doesn't work on PHP 5.2");
}
$skins = array(
new Plugin_Upgrader_Skin( compact( 'title', 'url', 'nonce', 'plugin', 'api' ) ),
new Automatic_Upgrader_Skin( compact( 'title', 'url', 'nonce', 'plugin', 'api' ) ),
Expand Down Expand Up @@ -102,9 +104,6 @@ public function test_updating_a_plugin_error_is_synced() {
}

public function test_updating_plugin_error_in_bulk_is_synced() {
if ( defined( 'PHP_VERSION_ID' ) && PHP_VERSION_ID < 50300 ) {
$this->markTestIncomplete("Right now this doesn't work on PHP 5.2");
}
$skins = array(
new Plugin_Upgrader_Skin( compact( 'title', 'url', 'nonce', 'plugin', 'api' ) ),
new Automatic_Upgrader_Skin( compact( 'title', 'url', 'nonce', 'plugin', 'api' ) ),
Expand All @@ -123,10 +122,6 @@ public function test_updating_plugin_error_in_bulk_is_synced() {
}

function test_updating_error_with_autoupdate_constant_results_in_proper_state() {
if ( defined( 'PHP_VERSION_ID' ) && PHP_VERSION_ID < 50300 ) {
$this->markTestIncomplete("Right now this doesn't work on PHP 5.2");
}

Jetpack_Constants::set_constant( 'JETPACK_PLUGIN_AUTOUPDATE', true );

$this->set_error();
Expand All @@ -139,10 +134,6 @@ function test_updating_error_with_autoupdate_constant_results_in_proper_state()
}

function test_updating_with_autoupdate_constant_results_in_proper_state() {
if ( defined( 'PHP_VERSION_ID' ) && PHP_VERSION_ID < 50300 ) {
$this->markTestIncomplete("Right now this doesn't work on PHP 5.2");
}

Jetpack_Constants::set_constant( 'JETPACK_PLUGIN_AUTOUPDATE', true );
$this->update_bulk_plugins( new WP_Ajax_Upgrader_Skin( compact( 'title', 'url', 'nonce', 'plugin', 'api' ) ) );
$this->sender->do_sync();
Expand Down
5 changes: 0 additions & 5 deletions tests/php/test_class.jetpack-client-server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public function test_jetpack_client_server_initialize() {

/**
* @author scotchfield
* @runInSeparateProcess
* @covers Jetpack_Client_Server::authorize
* @since 3.2
*/
Expand All @@ -45,7 +44,6 @@ public function test_jetpack_client_server_authorize_role_cap() {

/**
* @author scotchfield
* @runInSeparateProcess
* @covers Jetpack_Client_Server::authorize
* @since 3.2
*/
Expand All @@ -66,7 +64,6 @@ public function test_jetpack_client_server_authorize_no_role() {

/**
* @author scotchfield
* @runInSeparateProcess
* @covers Jetpack_Client_Server::authorize
* @since 3.2
*/
Expand All @@ -87,7 +84,6 @@ public function test_jetpack_client_server_authorize_data_error() {

/**
* @author scotchfield
* @runInSeparateProcess
* @covers Jetpack_Client_Server::deactivate_plugin
* @since 3.2
*/
Expand All @@ -101,7 +97,6 @@ public function test_jetpack_client_server_deactivate_plugin() {

/**
* @author scotchfield
* @runInSeparateProcess
* @covers Jetpack_Client_Server::get_token
* @since 3.2
*/
Expand Down