MC-18762: Fix incorrect website name rendering

SeruyV · SeruyV · commit db2b978b962e · 2019-10-25T16:55:32.000+03:00
diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/Cms/OptionsTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/Cms/OptionsTest.php
@@ -71,7 +71,7 @@ public function testToOptionArray()
         $expectedOptions = [
             [
                 'label' => __('All Store Views'),
-                'value' => '0'
+                'value' => '0',
             ],
             [
                 'label' => 'Main Website',
@@ -81,11 +81,14 @@ public function testToOptionArray()
                         'value' => [
                             [
                                 'label' => '        Default Store View',
-                                'value' => '1'
+                                'value' => '1',
+                                '__disableTmpl' => true,
                             ]
-                        ]
+                        ],
+                        '__disableTmpl' => true,
                     ]
-                ]
+                ],
+                '__disableTmpl' => true,
             ]
         ];
 
@@ -104,14 +107,6 @@ public function testToOptionArray()
         $this->storeMock->expects($this->atLeastOnce())->method('getName')->willReturn('Default Store View');
         $this->storeMock->expects($this->atLeastOnce())->method('getId')->willReturn('1');
 
-        $this->escaperMock->expects($this->atLeastOnce())->method('escapeHtml')->willReturnMap(
-            [
-                ['Default Store View', null, 'Default Store View'],
-                ['Main Website Store', null, 'Main Website Store'],
-                ['Main Website', null, 'Main Website']
-            ]
-        );
-
         $this->assertEquals($expectedOptions, $this->options->toOptionArray());
     }
 }
diff --git a/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php b/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php
@@ -99,7 +99,6 @@ protected function generateCurrentOptions()
                         $groups[$name]['label'] = str_repeat(' ', 4) . $name;
                         $groups[$name]['value'] = array_values($stores);
                         $groups[$name]['__disableTmpl'] = true;
-
                     }
                 }
             }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php
@@ -237,9 +237,11 @@ public static function getEntityStoresDataProvider()
                     ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
                     [
                         'label' => '    Main Website Store',
-                        'value' => [['label' => '    Default Store View', 'value' => 1]],
-                        '__disableTmpl' => true
-                    ]
+                        'value' => [
+                            ['label' => '    Default Store View', 'value' => 1, '__disableTmpl' => true],
+                        ],
+                        '__disableTmpl' => true,
+                    ],
                 ],
             ],
             [
@@ -249,10 +251,12 @@ public static function getEntityStoresDataProvider()
                     ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
                     [
                         'label' => '    Main Website Store',
-                        'value' => [['label' => '    Default Store View', 'value' => 1]],
-                        '__disableTmpl' => true
-                    ]
-                ]
+                        'value' => [
+                            ['label' => '    Default Store View', 'value' => 1, '__disableTmpl' => true],
+                        ],
+                        '__disableTmpl' => true,
+                    ],
+                ],
             ],
             [
                 ['entity_id' => 2, 'name' => 'product2', 'url_key' => 'product2', 'store_ids' => [1]],
@@ -261,11 +265,13 @@ public static function getEntityStoresDataProvider()
                     ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
                     [
                         'label' => '    Main Website Store',
-                        'value' => [['label' => '    Default Store View', 'value' => 1]],
-                        '__disableTmpl' => true
-                    ]
-                ]
-            ]
+                        'value' => [
+                            ['label' => '    Default Store View', 'value' => 1, '__disableTmpl' => true],
+                        ],
+                        '__disableTmpl' => true,
+                    ],
+                ],
+            ],
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php
@@ -81,8 +81,10 @@ public function testGetEntityStores()
             ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
             [
                 'label' => '    Main Website Store',
-                'value' => [['label' => '    Default Store View', 'value' => 1]],
-                '__disableTmpl' => true
+                'value' => [
+                    ['label' => '    Default Store View', 'value' => 1, '__disableTmpl' => true]
+                ],
+                '__disableTmpl' => true,
             ],
         ];
         $this->assertEquals($expectedStores, $form->getElement('store_id')->getValues());

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function testToOptionArray()`
`71`	`71`	`$expectedOptions = [`
`72`	`72`	`[`
`73`	`73`	`'label' => __('All Store Views'),`
`74`		`- 'value' => '0'`
	`74`	`+ 'value' => '0',`
`75`	`75`	`],`
`76`	`76`	`[`
`77`	`77`	`'label' => 'Main Website',`
`@@ -81,11 +81,14 @@ public function testToOptionArray()`
`81`	`81`	`'value' => [`
`82`	`82`	`[`
`83`	`83`	`'label' => ' Default Store View',`
`84`		`- 'value' => '1'`
	`84`	`+ 'value' => '1',`
	`85`	`+ '__disableTmpl' => true,`
`85`	`86`	`]`
`86`		`- ]`
	`87`	`+ ],`
	`88`	`+ '__disableTmpl' => true,`
`87`	`89`	`]`
`88`		`- ]`
	`90`	`+ ],`
	`91`	`+ '__disableTmpl' => true,`
`89`	`92`	`]`
`90`	`93`	`];`
`91`	`94`
`@@ -104,14 +107,6 @@ public function testToOptionArray()`
`104`	`107`	`$this->storeMock->expects($this->atLeastOnce())->method('getName')->willReturn('Default Store View');`
`105`	`108`	`$this->storeMock->expects($this->atLeastOnce())->method('getId')->willReturn('1');`
`106`	`109`
`107`		`- $this->escaperMock->expects($this->atLeastOnce())->method('escapeHtml')->willReturnMap(`
`108`		`- [`
`109`		`- ['Default Store View', null, 'Default Store View'],`
`110`		`- ['Main Website Store', null, 'Main Website Store'],`
`111`		`- ['Main Website', null, 'Main Website']`
`112`		`- ]`
`113`		`- );`
`114`		`-`
`115`	`110`	`$this->assertEquals($expectedOptions, $this->options->toOptionArray());`
`116`	`111`	`}`
`117`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,6 @@ protected function generateCurrentOptions()`
`99`	`99`	`$groups[$name]['label'] = str_repeat(' ', 4) . $name;`
`100`	`100`	`$groups[$name]['value'] = array_values($stores);`
`101`	`101`	`$groups[$name]['__disableTmpl'] = true;`
`102`		`-`
`103`	`102`	`}`
`104`	`103`	`}`
`105`	`104`	`}`