MAGETWO-51580: Misleading error messages during installation

- fixing functional tests

Author: mazhalai

dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php

@@ -27,7 +27,7 @@ class AssertSuccessfulReadinessCheck extends AbstractConstraint
     /**
      * File permission message.
      */
-    const FILE_PERMISSION_REGEXP = 'File permissions does not meet requirements.';
+    const FILE_PERMISSION_REGEXP = '/You meet (\d+) out of \1 writable file permission requirements\./';
 
     /**
      * Assert that PHP Version, PHP Extensions and File Permission are ok.
@@ -47,7 +47,7 @@ public function processAssert(Install $installPage)
             $installPage->getReadinessBlock()->getPhpExtensionsCheck(),
             'PHP extensions missed.'
         );
-        \PHPUnit_Framework_Assert::assertContains(
+        \PHPUnit_Framework_Assert::assertRegExp(
             self::FILE_PERMISSION_REGEXP,
             $installPage->getReadinessBlock()->getFilePermissionCheck(),
             'File permissions does not meet requirements.'

setup/src/Magento/Setup/Controller/Environment.php

@@ -162,18 +162,24 @@ public function filePermissionsAction()
         $responseType = ResponseTypeInterface::RESPONSE_TYPE_SUCCESS;
         $missingWritePermissionPaths = $this->permissions->getMissingWritablePathsForInstallation(true);
 
+        $currentPaths = [];
         $requiredPaths = [];
         if ($missingWritePermissionPaths) {
-            $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
             foreach ($missingWritePermissionPaths as $key => $value) {
-                $requiredPaths[] = ['path' => $key, 'missing' => $value];
+                if (is_array($value)) {
+                    $requiredPaths[] = ['path' => $key, 'missing' => $value];
+                    $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
+                } else {
+                    $requiredPaths[] = ['path' => $key];
+                    $currentPaths[] = $key;
+                }
             }
         }
         $data = [
             'responseType' => $responseType,
             'data' => [
                 'required' => $requiredPaths,
-                'current' => $this->permissions->getInstallationCurrentWritableDirectories(),
+                'current' => $currentPaths,
             ],
         ];