Merge pull request #253 from lucatume/release/2.2.12

Release 2.2.12
lucatume · Jun 10, 2019 · c495d5f · c495d5f
2 parents 2c79aa7 + 584b936
commit c495d5f
Show file tree

Hide file tree

Showing 25 changed files with 89 additions and 69 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [unreleased] Unreleased
 
+## [2.2.12] 2019-06-10;
+### Fixed
+- make sure Cron is disabled while `WPLoader` module is installing WordPress in isolation (default mode)
+
 ## [2.2.11] 2019-06-06;
 ## Added
 - support for `timeout` parameter in WPCLI module configuration
@@ -894,7 +898,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Reference to ModuleConfigException class in WPLoader class.
 
-[unreleased]: https://github.com/lucatume/wp-browser/compare/2.2.11...HEAD
+[unreleased]: https://github.com/lucatume/wp-browser/compare/2.2.12...HEAD
+[2.2.12]: https://github.com/lucatume/wp-browser/compare/2.2.11...2.2.12:
 [2.2.11]: https://github.com/lucatume/wp-browser/compare/2.2.10...2.2.11:
 [2.2.10]: https://github.com/lucatume/wp-browser/compare/2.2.9...2.2.10
 [2.2.9]: https://github.com/lucatume/wp-browser/compare/2.2.8...2.2.9

diff --git a/composer.json b/composer.json
@@ -34,6 +34,7 @@
     "wp-cli/wp-cli-bundle": ">=2.0 <3.0.0"
   },
   "require-dev": {
+    "phpunit/phpunit": "<8.2.0",
     "erusev/parsedown": "^1.7",
     "lucatume/codeception-snapshot-assertions": "^0.2",
     "mikey179/vfsstream": "^1.6",

diff --git a/src/includes/isolated-install.php b/src/includes/isolated-install.php
@@ -54,7 +54,6 @@ function wpbrowser_write_patchwork_config(array $configuration) {
 
 $multisite = !empty($argv[2]) ? $argv[2] : false;
 
-
 // require_once 'vendor/autoload.php';
 require_once $configuration['autoload'];
 
@@ -80,6 +79,15 @@ function wpbrowser_write_patchwork_config(array $configuration) {
 	$activePlugins = [];
 }
 
+// If Cron is not disable it's disabled here.
+if ( ! isset( $configuration['constants']['DISABLE_WP_CRON'] ) ) {
+    print( "Disabling cron\n" );
+    $configuration['constants']['DISABLE_WP_CRON'] = true;
+} else {
+    $enabled = DISABLE_WP_CRON ? 'yes' : 'no';
+    print( "Cron disabled (via 'DISABLE_WP_CRON' constant): {$enabled}\n" );
+}
+
 printf("\nConfiguration:\n\n%s\n\n", json_encode($configuration, JSON_PRETTY_PRINT));
 
 foreach ($configuration['constants'] as $key => $value) {

diff --git a/src/tad/WPBrowser/Module/Support/WPHealthcheck.php b/src/tad/WPBrowser/Module/Support/WPHealthcheck.php
@@ -153,7 +153,8 @@ protected function getConstants()
             'DB_PASSWORD' => $this->constants->constant('DB_PASSWORD', 'not set'),
             'DB_USER' => $this->constants->constant('DB_USER', 'not set'),
             'CUSTOM_USER_TABLE' => $this->constants->constant('CUSTOM_USER_TABLE', 'not set'),
-            'CUSTOM_USER_META_TABLE' => $this->constants->constant('CUSTOM_USER_META_TABLE', 'not set')
+            'CUSTOM_USER_META_TABLE' => $this->constants->constant('CUSTOM_USER_META_TABLE', 'not set'),
+            'DISABLE_WP_CRON' => $this->constants->constant('DISABLE_WP_CRON', 'not set')
         ];
     }
 

diff --git a/tests/_data/dump.sql b/tests/_data/dump.sql
diff --git a/tests/_data/empty/.gitignore b/tests/_data/empty/.gitignore
diff --git a/...ts__/WPHealthcheckTest__test_multisite_with_missing_blogs_entry_for_site__0.snapshot.json b/...ts__/WPHealthcheckTest__test_multisite_with_missing_blogs_entry_for_site__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_"

diff --git a/...upport/__snapshots__/WPHealthcheckTest__test_report_with_empty_constants__0.snapshot.json b/...upport/__snapshots__/WPHealthcheckTest__test_report_with_empty_constants__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "not set",
         "DB_USER": "not set",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_ (guessed, global not set)"

diff --git a/...Support/__snapshots__/WPHealthcheckTest__test_with_available_wpdb_global__0.snapshot.json b/...Support/__snapshots__/WPHealthcheckTest__test_with_available_wpdb_global__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_"

diff --git a/...Support/__snapshots__/WPHealthcheckTest__test_with_broken_pdo_connection__0.snapshot.json b/...Support/__snapshots__/WPHealthcheckTest__test_with_broken_pdo_connection__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_ (guessed, global not set)"

diff --git a/...HealthcheckTest__test_with_diff_set_of_tables_specified_from_wpdb_global__0.snapshot.json b/...HealthcheckTest__test_with_diff_set_of_tables_specified_from_wpdb_global__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_"

diff --git a/...althcheckTest__test_with_empty_and_missing_template_and_stylesheet_files__0.snapshot.json b/...althcheckTest__test_with_empty_and_missing_template_and_stylesheet_files__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_"

diff --git a/...rt/__snapshots__/WPHealthcheckTest__test_with_empty_mu_plugins_directory__0.snapshot.json b/...rt/__snapshots__/WPHealthcheckTest__test_with_empty_mu_plugins_directory__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_"

diff --git a/.../Support/__snapshots__/WPHealthcheckTest__test_with_empty_plugins_folder__0.snapshot.json b/.../Support/__snapshots__/WPHealthcheckTest__test_with_empty_plugins_folder__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_"

diff --git a/...dule/Support/__snapshots__/WPHealthcheckTest__test_with_inactive_plugins__0.snapshot.json b/...dule/Support/__snapshots__/WPHealthcheckTest__test_with_inactive_plugins__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_"

diff --git a/...upport/__snapshots__/WPHealthcheckTest__test_with_missing_siteurl_option__0.snapshot.json b/...upport/__snapshots__/WPHealthcheckTest__test_with_missing_siteurl_option__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_"

diff --git a/...t/__snapshots__/WPHealthcheckTest__test_with_mu_plugins_dir_constant_set__0.snapshot.json b/...t/__snapshots__/WPHealthcheckTest__test_with_mu_plugins_dir_constant_set__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_"

diff --git a/...shots__/WPHealthcheckTest__test_with_no_results_in_blogs_for_blog_domain__0.snapshot.json b/...shots__/WPHealthcheckTest__test_with_no_results_in_blogs_for_blog_domain__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_"

diff --git a/.../Support/__snapshots__/WPHealthcheckTest__test_with_no_tables_for_prefix__0.snapshot.json b/.../Support/__snapshots__/WPHealthcheckTest__test_with_no_tables_for_prefix__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "not_existing_"

diff --git a/...odule/Support/__snapshots__/WPHealthcheckTest__test_with_no_tables_in_db__0.snapshot.json b/...odule/Support/__snapshots__/WPHealthcheckTest__test_with_no_tables_in_db__0.snapshot.json
@@ -12,19 +12,20 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_"
     },
     "checks": {
         "Site is multisite": "no",
         "ABSPATH points to valid WordPress directory": "Yes, wp-load.php file found in WordPress root directory.",
-        "Database connection works": "No, connection errors: SQLSTATE[HY000] [1049] Unknown database 'empty'",
-        "Database structure as expected": "No, structure errors: cannot connect to database to check structure.",
-        "Blog installed": "No, blog is not installed: cannot connect to database to check if blog is installed.",
-        "Theme :": "Cannot connect to database to check for current theme.",
+        "Database connection works": "Yes, connection successful.",
+        "Database structure as expected": "No, structure errors: no tables found in database.",
+        "Blog installed": "No, blog is not installed: database table [wp_options] does not contain a 'siteurl' option.",
+        "Theme :": "Cannot find the 'template' option in the database.",
         "Must-use plugins health-check:": "mu-plugins directory(wp-content/mu-plugins) does not exist.",
-        "Plugins health-check:": "Cannot connect to database to check on plugins."
+        "Plugins health-check:": "The 'active_plugins' option was not found in the database . "
     }
 }
diff --git a/...er/Module/Support/__snapshots__/WPHealthcheckTest__test_with_set_ABSPATH__0.snapshot.json b/...er/Module/Support/__snapshots__/WPHealthcheckTest__test_with_set_ABSPATH__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "not set",
         "DB_USER": "not set",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_ (guessed, global not set)"

diff --git a/.../Support/__snapshots__/WPHealthcheckTest__test_with_working_installation__0.snapshot.json b/.../Support/__snapshots__/WPHealthcheckTest__test_with_working_installation__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_"

diff --git a/..._snapshots__/WPHealthcheckTest__test_with_working_multisite_installation__0.snapshot.json b/..._snapshots__/WPHealthcheckTest__test_with_working_multisite_installation__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_"

diff --git a/..._snapshots__/WPHealthcheckTest__test_with_working_subdomain_installation__0.snapshot.json b/..._snapshots__/WPHealthcheckTest__test_with_working_subdomain_installation__0.snapshot.json
@@ -12,7 +12,8 @@
         "DB_PASSWORD": "",
         "DB_USER": "root",
         "CUSTOM_USER_TABLE": "not set",
-        "CUSTOM_USER_META_TABLE": "not set"
+        "CUSTOM_USER_META_TABLE": "not set",
+        "DISABLE_WP_CRON": "not set"
     },
     "globals": {
         "table_prefix": "wp_"

diff --git a/tests/wploadersuite/CronDeactivationTest.php b/tests/wploadersuite/CronDeactivationTest.php
@@ -0,0 +1,14 @@
+<?php
+
+class CronDeactivationTest extends \Codeception\TestCase\WPTestCase
+{
+    /**
+     * It should disable CRON by default
+     *
+     * @test
+     */
+    public function should_disable_cron_by_default()
+    {
+        $this->assertEquals(true, (bool)DISABLE_WP_CRON);
+    }
+}