VC-1853 fix yoast saving and fix phpunit tests

Author: pavelthq

ci/phpunit-all-coverage.xml

@@ -20,7 +20,7 @@
   </php>
   <testsuites>
     <testsuite name="Whole project">
-      <directory prefix="test-" suffix=".php">../tests/phpunit</directory>
+      <directory suffix=".php">../tests/phpunit</directory>
     </testsuite>
   </testsuites>
   <logging/>

tests/phpunit/addons/DynamicFieldsAddonTest.php

@@ -264,7 +264,7 @@ public function testQueryResetInsideLoop()
         $originalId = $this->createPost($originalContent, 'post');
 
         // override global query!
-        global $wp_the_query, $wp_query;
+        global $wp_the_query, $wp_query, $post;
         $generalQuery = new \WP_Query(
             [
                 'post_type' => 'post',
@@ -273,6 +273,7 @@ public function testQueryResetInsideLoop()
         );
         $wp_the_query = $generalQuery;
         $wp_query = $generalQuery;
+        $post = get_post($originalId);
 
         add_shortcode(
             'test-query-reset',
@@ -300,7 +301,7 @@ function () {
             the_content();
         }
         $content = ob_get_clean();
-        $this->assertEquals('<p>title:random title' . md5($originalContent) . ' first</p>', trim($content));
+        $this->assertEquals('<p>title:random title' . rawurlencode($originalContent) . ' first</p>', trim($content));
 
         wp_reset_query();
     }
@@ -314,7 +315,7 @@ protected function createPost($content, $postType = 'page')
                 'post_type' => $postType,
                 'post_content' => $content,
                 'post_status' => 'publish',
-                'post_title' => 'random title' . md5($content),
+                'post_title' => 'random title' . rawurlencode($content),
             ]
         );
         $this->assertTrue(is_numeric($postId));

tests/phpunit/addons/test-dynamic-fields-addon.php

@@ -26,7 +26,6 @@ public function testIsActivated()
         $helper->setKey('foo-bar', $optionsHelper);
         $helper->setType('free', $optionsHelper);
 
-        $this->assertTrue($helper->isAnyActivated());
         $this->assertFalse($helper->isPremiumActivated());
 
         //reset

tests/phpunit/helpers/HelperFrontendTest.php

@@ -1,6 +1,6 @@
 <?php
 
-class TestApiFactoryController extends WP_UnitTestCase
+class ApiFactoryControllerTest extends WP_UnitTestCase
 {
     public function testRegister()
     {

tests/phpunit/helpers/HelpersLicenseTest.php

@@ -1,6 +1,6 @@
 <?php
 
-class TestElementsApiController extends WP_UnitTestCase
+class ElementsApiControllerTest extends WP_UnitTestCase
 {
     public function testElementsApi()
     {

tests/phpunit/modules/Account/TestAccountDeactivationController.php

@@ -1,6 +1,6 @@
 <?php
 
-class TestPostUpdate extends WP_UnitTestCase
+class PostUpdateTest extends WP_UnitTestCase
 {
     public function testGetUpdateablePost()
     {
@@ -42,14 +42,13 @@ public function testRenderUpdateFe()
         // Previous test have Post Update action.
         $optionsHelper = vchelper('Options');
         $licenseHelper = vchelper('License');
-        $licenseHelper->setType('free');
-        $licenseHelper->setKey('test');
         $this->assertFalse($optionsHelper->get('bundleUpdateRequired'));
         $optionsHelper = vchelper('Options');
         $postId = $this->createPost('megaTest3');
         vchelper('PostType')->setupPost($postId);
         $optionsHelper->set('hubAction:updatePosts', [$postId]);
         $optionsHelper->set('bundleUpdateRequired', 1);
+        $optionsHelper->set('agreeHubTerms', time());
         $actions = vcapp(\VisualComposer\Helpers\Hub\Update::class)->getRequiredActions();
         $this->assertNotEmpty($actions);
         $exceptionCalled = false;
@@ -71,7 +70,7 @@ public function testRenderUpdateFe()
             $this->assertEquals(1, count($matches[0]), 'Visual Composer Post Update');
         }
 
-        $this->assertTrue($exceptionCalled);
+        $this->assertTrue($exceptionCalled, 'exception called successfully');
         $licenseHelper->setType('');
         $licenseHelper->setKey('');
     }
@@ -143,9 +142,6 @@ protected function checkFeEditorVariables($output)
         preg_match_all('/window\.vcvGettingStartedUrl/', $output, $matches);
         $this->assertEquals(1, count($matches[0]), 'vcvGettingStartedUrl');
 
-        preg_match_all('/window\.vcvIsAnyActivated/', $output, $matches);
-        $this->assertEquals(1, count($matches[0]), 'vcvIsAnyActivated');
-
         preg_match_all('/Object\.defineProperty\(window, \'VCV_LICENSE_KEY\', {/', $output, $matches);
         $this->assertEquals(1, count($matches[0]), 'VCV_LICENSE_KEY');
 

tests/phpunit/modules/Api/TestApiFactoryController.php tests/phpunit/modules/Api/ApiFactoryControllerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-class TestVariables extends WP_UnitTestCase
+class VariablesTest extends WP_UnitTestCase
 {
     public function testVariablesTypes()
     {
@@ -38,7 +38,7 @@ public function testEnvVariables()
         $this->assertIsNumeric($keyEnv);
         $this->assertTrue(isset($variables[ $keyEnv ]));
         $this->assertTrue(isset($variables[ $keyEnv ]['value']));
-        $this->assertContains('VCV_HUB_URL', $variables[ $keyEnv ]['value']);
+        $this->arrayHasKey('VCV_HUB_URL', $variables[ $keyEnv ]['value']);
         $this->assertEquals(\VcvEnv::all(), $variables[ $keyEnv ]['value']);
     }
 
@@ -159,7 +159,6 @@ public function testEditorVariables()
         $this->assertContains('vcvGoPremiumUrl', $variableKeys, 'vcvGoPremiumUrl');
         $this->assertContains('vcvGettingStartedUrl', $variableKeys, 'vcvGettingStartedUrl');
         $this->assertContains('vcvGutenbergEditorUrl', $variableKeys, 'vcvGutenbergEditorUrl');
-        $this->assertContains('vcvIsAnyActivated', $variableKeys, 'vcvIsAnyActivated');
     }
 
     public function testJsonVariables()

tests/phpunit/modules/Api/TestElementsApiController.php tests/phpunit/modules/Api/ElementsApiControllerTest.php

@@ -6,7 +6,6 @@ public function testLicenseActivation()
     {
         vchelper('Options')->setTransient('lastBundleUpdate', time());
         $this->assertNotEmpty(vcvenv('VCV_ACTIVATE_LICENSE_URL'));
-        $this->assertFalse(vchelper('License')->isAnyActivated());
         $loggerHelper = vchelper('Logger');
         $loggerHelper->reset();