Merge branch 'pr-develop' of https://github.com/magento-frontend/magento2ce into pr-develop

Author: Karpenko, Oleksandr

dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpUsedOnFrontend.php

@@ -68,6 +68,10 @@ public function processAssert(BrowserInterface $browser, Customer $customer)
      */
     protected function assertUsedProtocol($expectedProtocol)
     {
+        if (substr($expectedProtocol, -3) !== "://") {
+            $expectedProtocol .= '://';
+        }
+
         \PHPUnit_Framework_Assert::assertStringStartsWith(
             $expectedProtocol,
             $this->browser->getUrl(),

dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsUsedOnBackend.php

@@ -62,6 +62,10 @@ public function processAssert(BrowserInterface $browser, Dashboard $adminDashboa
      */
     protected function assertUsedProtocol($expectedProtocol)
     {
+        if (substr($expectedProtocol, -3) !== "://") {
+            $expectedProtocol .= '://';
+        }
+
         \PHPUnit_Framework_Assert::assertStringStartsWith(
             $expectedProtocol,
             $this->browser->getUrl(),