MAGETWO-34125: Merge MAGETWO-32073 and design changes to mainline

- fix tests

Author: Alex Bomko

setup/src/Magento/Setup/Test/Unit/Controller/CustomizeYourStoreTest.php

@@ -40,6 +40,10 @@ public function setup()
     public function testIndexAction($expected)
     {
         $this->sampleData->expects($this->once())->method('isDeployed')->willReturn($expected['isSampledataEnabled']);
+        $this->sampleData->expects($this->once())->method('isInstalledSuccessfully')
+            ->willReturn($expected['isSampleDataInstalled']);
+        $this->sampleData->expects($this->once())->method('isInstallationError')
+            ->willReturn($expected['isSampleDataErrorInstallation']);
         $this->lists->expects($this->once())->method('getTimezoneList')->willReturn($expected['timezone']);
         $this->lists->expects($this->once())->method('getCurrencyList')->willReturn($expected['currency']);
         $this->lists->expects($this->once())->method('getLocaleList')->willReturn($expected['language']);
@@ -64,8 +68,13 @@ public function indexActionDataProvider()
         $timezones = ['timezone' => ['America/New_York'=>'EST', 'America/Chicago' => 'CST']];
         $currency = ['currency' => ['USD'=>'US Dollar', 'EUR' => 'Euro']];
         $language = ['language' => ['en_US'=>'English (USA)', 'en_UK' => 'English (UK)']];
-        $sampleDataTrue = ['isSampledataEnabled' => true];
-        $sampleDataFalse = ['isSampledataEnabled' => false];
+        $sampleData = [
+            'isSampleDataInstalled' => null,
+            'isSampleDataErrorInstallation' => null,
+            'isSampledataEnabled' => null
+        ];
+        $sampleDataTrue = array_merge($sampleData, ['isSampledataEnabled' => true]);
+        $sampleDataFalse = array_merge($sampleData, ['isSampledataEnabled' => false]);
 
         return [
             'with_all_data' => [array_merge($timezones, $currency, $language, $sampleDataTrue)],
@@ -76,7 +85,7 @@ public function indexActionDataProvider()
             'empty_timezone_data' => [array_merge(['timezone' => []], $currency, $language, $sampleDataTrue)],
             'empty_language_data' => [array_merge($timezones, $currency, ['language' => []], $sampleDataTrue)],
             'false_sample_data' => [array_merge($timezones, $currency, $language, $sampleDataFalse)],
-            'no_sample_data' => [array_merge($timezones, $currency, $language, ['isSampledataEnabled' => null])],
+            'no_sample_data' => [array_merge($timezones, $currency, $language, $sampleData)],
         ];
     }