MAGETWO-33443: Password strength validator on installation wizard works in over-exacting mode

- fixed conditions and message for password strength

Author: Olga Kopylova

setup/module/Magento/Setup/styles/components/tooltips/_password-strength.less

@@ -17,7 +17,7 @@
     &.password-strength-weak {
         .password-strength-item:first-child,
         .password-strength-item:first-child + .password-strength-item {
-            background-color: @color-warning;
+            background-color: @color-failed;
         }
     }
     &.password-strength-fair {

setup/pub/magento/setup/create-admin-account.js

@@ -18,13 +18,13 @@ angular.module('create-admin-account', ['ngStorage'])
                 return;
             }
             var p = $scope.admin.password;
-            if (p.length > 6 && p.match(/[\d]+/) && p.match(/[a-z]+/) && p.match(/[A-Z]+/) && p.match(/[!@#$%^*()_\/\\\-\+=]+/)) {
+            if (p.length >= 6 && p.match(/[\d]+/) && p.match(/[a-z]+/) && p.match(/[A-Z]+/) && p.match(/[!@#$%^*()_\/\\\-\+=]+/)) {
                 $scope.admin.passwordStatus.class = 'strong';
                 $scope.admin.passwordStatus.label = 'Strong';
-            } else if (p.length > 6 && p.match(/[\d]+/) && p.match(/[a-z]+/) && p.match(/[A-Z]+/)) {
+            } else if (p.length >= 6 && p.match(/[\d]+/) && p.match(/[a-z]+/) && p.match(/[A-Z]+/)) {
                 $scope.admin.passwordStatus.class = 'good';
                 $scope.admin.passwordStatus.label = 'Good';
-            } else if (p.length > 6 && p.match(/[\d]+/) && p.match(/[a-zA-Z]+/)) {
+            } else if (p.length >= 6 && p.match(/[\d]+/) && p.match(/[a-zA-Z]+/)) {
                 $scope.admin.passwordStatus.class = 'fair';
                 $scope.admin.passwordStatus.label = 'Fair';
             } else if (p.length >= 6) {

setup/pub/magento/setup/css/setup.css

@@ -16,7 +16,7 @@ $passwordWizard = sprintf(
         </div>
     <p>%s</p>',
     'Password Strength:',
-    'Enter 6 or more characters. For a strong password, use a mix of numbers, symbols, and uppercase and lowercase letters (Ex: BuyIt$54).'
+    'Enter a mix of at least 6 alpha-numeric characters. For a strong password, use numbers, symbols, uppercase and lowercase letters (Ex: BuyIt$54).'
 );
 ?>