MAGECLOUD-1246: Cover different RabbitMQ relationship names

Author: oshmyheliuk

src/Process/Deploy/InstallUpdate/ConfigUpdate/Amqp.php

@@ -73,7 +73,7 @@ public function execute()
             $config['queue']['amqp']['port'] = $amqpConfig['port'];
             $config['queue']['amqp']['user'] = $amqpConfig['username'];
             $config['queue']['amqp']['password'] = $amqpConfig['password'];
-            $config['queue']['amqp']['virtualhost'] = '/';
+            $config['queue']['amqp']['virtualhost'] = isset($amqpConfig['vhost']) ? $amqpConfig['vhost'] : '/';
             $config['queue']['amqp']['ssl'] = '';
         } else {
             $config = $this->removeAmqpConfig($config);

src/Test/Unit/Process/Deploy/InstallUpdate/ConfigUpdate/AmqpTest.php

@@ -88,28 +88,8 @@ public function testExecuteWithoutAmqp()
      * @return void
      * @dataProvider executeAddUpdateDataProvider
      */
-    public function testExecuteAddUpdate(array $config)
+    public function testExecuteAddUpdate(array $config, array $amqpConfig, array $resultConfig)
     {
-        $amqpConfig = [[
-            'host' => 'localhost',
-            'port' => '777',
-            'username' => 'login',
-            'password' => 'pswd'
-        ]];
-        $resultConfig = [
-            'some config',
-            'queue' => [
-                'amqp' => [
-                    'host' => 'localhost',
-                    'port' => '777',
-                    'user' => 'login',
-                    'password' => 'pswd',
-                    'virtualhost' => '/',
-                    'ssl' => '',
-                ]
-            ],
-        ];
-
         $this->environmentMock->expects($this->exactly(2))
             ->method('getRelationship')
             ->withConsecutive(
@@ -139,20 +119,86 @@ public function testExecuteAddUpdate(array $config)
     public function executeAddUpdateDataProvider(): array
     {
         return [
-            [['some config']],
-            [[
-                'some config',
-                'queue' => [
-                    'amqp' => [
-                        'host' => 'some-host',
-                        'port' => '888',
-                        'user' => 'mylogin',
-                        'password' => 'mysqwwd',
-                        'virtualhost' => 'virtualhost',
-                        'ssl' => '1',
-                    ]
+            [
+                ['some config'],
+                [[
+                    'host' => 'localhost',
+                    'port' => '777',
+                    'username' => 'login',
+                    'password' => 'pswd',
+                    'vhost' => 'virtualhost'
+                ]],
+                [
+                    'some config',
+                    'queue' => [
+                        'amqp' => [
+                            'host' => 'localhost',
+                            'port' => '777',
+                            'user' => 'login',
+                            'password' => 'pswd',
+                            'virtualhost' => 'virtualhost',
+                            'ssl' => '',
+                        ]
+                    ],
+                ]
+            ],
+            [
+                ['some config'],
+                [[
+                    'host' => 'localhost',
+                    'port' => '777',
+                    'username' => 'login',
+                    'password' => 'pswd',
+                ]],
+                [
+                    'some config',
+                    'queue' => [
+                        'amqp' => [
+                            'host' => 'localhost',
+                            'port' => '777',
+                            'user' => 'login',
+                            'password' => 'pswd',
+                            'virtualhost' => '/',
+                            'ssl' => '',
+                        ]
+                    ],
+                ]
+            ],
+            [
+                [
+                    'some config',
+                    'queue' => [
+                        'amqp' => [
+                            'host' => 'some-host',
+                            'port' => '888',
+                            'user' => 'mylogin',
+                            'password' => 'mysqwwd',
+                            'virtualhost' => 'virtualhost',
+                            'ssl' => '1',
+                        ]
+                    ],
                 ],
-            ]]
+                [[
+                    'host' => 'localhost',
+                    'port' => '777',
+                    'username' => 'login',
+                    'password' => 'pswd',
+                    'vhost' => 'virtualhost'
+                ]],
+                [
+                    'some config',
+                    'queue' => [
+                        'amqp' => [
+                            'host' => 'localhost',
+                            'port' => '777',
+                            'user' => 'login',
+                            'password' => 'pswd',
+                            'virtualhost' => 'virtualhost',
+                            'ssl' => '',
+                        ]
+                    ],
+                ]
+            ]
         ];
     }