Merge remote-tracking branch 'mainline/develop' into bugs-pr

dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php

@@ -30,6 +30,13 @@ class SelectVersion extends Form
      */
     protected $firstField = '#selectVersion';
 
+    /**
+     * Show all versions checkbox
+     *
+     * @var string
+     */
+    private $showAllVersions = '#showUnstable';
+
     /**
      * Click on 'Next' button.
      *
@@ -50,9 +57,24 @@ class SelectVersion extends Form
     public function fill(FixtureInterface $fixture, SimpleElement $element = null)
     {
         $this->waitForElementVisible($this->firstField);
+        $this->chooseShowAllVersions();
+
         return parent::fill($fixture, $element);
     }
 
+    /**
+     * Show all versions include unstable
+     *
+     * @return void
+     */
+    private function chooseShowAllVersions()
+    {
+        $element = $this->_rootElement->find($this->showAllVersions, Locator::SELECTOR_CSS);
+        if ($element->isVisible()) {
+            $element->click();
+        }
+    }
+
     /**
      * Choose 'yes' for upgrade option called 'Other components'
      *

dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessMessage.php

@@ -23,7 +23,7 @@ class AssertSuccessMessage extends AbstractConstraint
      */
     public function processAssert(SetupWizard $setupWizard, $package)
     {
-        $message = "You upgraded:";
+        $message = "You upgraded";
         \PHPUnit_Framework_Assert::assertContains(
             $message,
             $setupWizard->getSuccessMessage()->getUpdaterStatus(),

dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/setup.xml

@@ -11,5 +11,8 @@
         <allow>
             <module value="Magento_Setup"/>
         </allow>
+        <deny>
+            <class value="Magento\Setup\Test\TestCase\UpgradeSystemTest"/>
+        </deny>
     </rule>
 </config>

dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/upgrade.xml

+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
+    <rule scope="testsuite">
+        <allow>
+            <class value="Magento\Setup\Test\TestCase\UpgradeSystemTest"/>
+        </allow>
+    </rule>
+</config>
\ No newline at end of file

setup/pub/magento/setup/updater-success.js

@@ -8,8 +8,16 @@ angular.module('updater-success', ['ngStorage'])
     .controller('updaterSuccessController', ['$scope', '$state', '$localStorage', '$window', 'navigationService', function ($scope, $state, $localStorage, $window, navigationService) {
         if ($localStorage.successPageAction) {
             $scope.successPageAction = $localStorage.successPageAction;
-            $scope.successPageActionMessage = $scope.successPageAction +
-                ($scope.endsWith($scope.successPageAction, 'e')  ? 'd' : 'ed');
+            switch (true) {
+                case $scope.endsWith($scope.successPageAction, 'd'):
+                    $scope.successPageActionMessage = $scope.successPageAction;
+                    break;
+                case $scope.endsWith($scope.successPageAction, 'e'):
+                    $scope.successPageActionMessage = $scope.successPageAction + 'd';
+                    break;
+                default:
+                    $scope.successPageActionMessage = $scope.successPageAction + 'ed';
+            }
         }
         if ($localStorage.packages) {
             $scope.packages = $localStorage.packages;