update unit tests

Author: sivaram7

src/Step/Deploy/PreDeploy/ConfigUpdate/Cache.php

@@ -123,6 +123,10 @@ public function execute()
                 );
                 unset($config['cache']);
             } else {
+                if(isset($cacheConfig['frontend']['default'])) {
+                    $cacheConfig['frontend']['default']['backend_options']['_useLua'] = $luaConfigKey;
+                    $cacheConfig['frontend']['default']['backend_options']['use_lua'] = $luaConfig;
+                }
                 $this->logger->info('Updating cache configuration.');
                 $config['cache'] = $cacheConfig;
             }
@@ -131,13 +135,6 @@ public function execute()
                 $config['cache']['graphql'] = $graphqlConfig;
             }
 
-            if (!empty($luaConfigKey)) {
-                $config['cache']['frontend']['default']['backend_options']['_useLua'] = $luaConfigKey;
-            }
-
-            if (!empty($luaConfig)) {
-                $config['cache']['frontend']['default']['backend_options']['use_lua'] = $luaConfig;
-            }
             $this->configWriter->create($config);
         } catch (FileSystemException $e) {
             throw new StepException($e->getMessage(), Error::DEPLOY_ENV_PHP_IS_NOT_WRITABLE);

src/Test/Unit/Config/Validator/Deploy/AppropriateVersionTest.php

@@ -15,6 +15,7 @@
 use Magento\MagentoCloud\Package\MagentoVersion;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\MagentoCloud\Config\Stage\DeployInterface;
 
 /**
  * @inheritdoc
@@ -60,16 +61,12 @@ protected function setUp(): void
         );
     }
 
-    public function testValidateVersionGreaterTwoDotTwo()
+    public function testValidateVersion()
     {
-        $this->magentoVersion->expects($this->once())
-            ->method('isGreaterOrEqual')
-            ->with('2.2')
-            ->willReturn(true);
-        $this->magentoVersion->expects($this->once())
+        $this->magentoVersion->expects($this->exactly(2))
             ->method('isGreaterOrEqual')
-            ->with('2.4.7')
-            ->willReturn(true);
+            ->withConsecutive(['2.2'], ['2.4.7'])
+            ->willReturnOnConsecutiveCalls(true, true);
         $this->magentoVersion->expects($this->once())
             ->method('satisfies')
             ->willReturn(true);
@@ -79,40 +76,32 @@ public function testValidateVersionGreaterTwoDotTwo()
         $this->assertInstanceOf(Success::class, $this->validator->validate());
     }
 
-    public function testValidateVersionTwoDotOneAndVariablesNotConfigured()
+    public function testValidateVersionAndVariablesNotConfigured()
     {
-        $this->magentoVersion->expects($this->once())
+        $this->magentoVersion->expects($this->exactly(2))
             ->method('isGreaterOrEqual')
-            ->with('2.2')
-            ->willReturn(false);
-        $this->magentoVersion->expects($this->once())
-            ->method('isGreaterOrEqual')
-            ->with('2.4.7')
-            ->willReturn(false);
+            ->withConsecutive(['2.2'], ['2.4.7'])
+            ->willReturnOnConsecutiveCalls(false, false);
         $this->magentoVersion->expects($this->once())
             ->method('satisfies')
             ->willReturn(false);
-        $this->configurationCheckerMock->expects($this->exactly(4))
+        $this->configurationCheckerMock->expects($this->exactly(6))
             ->method('isConfigured')
             ->willReturn(false);
 
         $this->assertInstanceOf(Success::class, $this->validator->validate());
     }
 
-    public function testValidateVersionTwoDotOneAndAllVariablesAreConfigured()
+    public function testValidateVersionAndAllVariablesAreConfigured()
     {
-        $this->magentoVersion->expects($this->once())
+        $this->magentoVersion->expects($this->exactly(2))
             ->method('isGreaterOrEqual')
-            ->with('2.2')
-            ->willReturn(false);
-        $this->magentoVersion->expects($this->once())
-            ->method('isGreaterOrEqual')
-            ->with('2.4.7')
-            ->willReturn(false);
+            ->withConsecutive(['2.2'], ['2.4.7'])
+            ->willReturnOnConsecutiveCalls(false, false);
         $this->magentoVersion->expects($this->once())
             ->method('satisfies')
             ->willReturn(false);
-        $this->configurationCheckerMock->expects($this->exactly(4))
+        $this->configurationCheckerMock->expects($this->exactly(6))
             ->method('isConfigured')
             ->willReturn(true);
         $this->resultFactoryMock->expects($this->once())
@@ -123,7 +112,9 @@ public function testValidateVersionTwoDotOneAndAllVariablesAreConfigured()
                     'CRON_CONSUMERS_RUNNER is available for Magento 2.2.0 and later.',
                     'SCD_STRATEGY is available for Magento 2.2.0 and later.',
                     'SCD_MAX_EXECUTION_TIME is available for Magento 2.2.0 and later.',
-                    'GENERATED_CODE_SYMLINK is available for Magento 2.1.x.'
+                    'GENERATED_CODE_SYMLINK is available for Magento 2.1.x.',
+                    'USE_LUA is available for Magento 2.4.7 and later.',
+                    'LUA_KEY is available for Magento 2.4.7 and later.'
                 ])
             );