From 8563c2b503a13ea541f0734cf9468fc723979b6f Mon Sep 17 00:00:00 2001
From: Dmytro Vilchynskyi <dvilchynskyi@magento.com>
Date: Thu, 8 Dec 2016 17:08:44 +0200
Subject: [PATCH] MAGETWO-60185: Remove distinction in http/https for
requirejs-config.js
- Changes after CR.
---
.../Backend/Test/Constraint/AssertHttpUsedOnFrontend.php | 4 ++++
.../Backend/Test/Constraint/AssertHttpsUsedOnBackend.php | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpUsedOnFrontend.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpUsedOnFrontend.php
index 00eb776be2e..6dae8e5cd7b 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpUsedOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpUsedOnFrontend.php
@@ -68,6 +68,10 @@ class AssertHttpUsedOnFrontend extends AbstractConstraint
*/
protected function assertUsedProtocol($expectedProtocol)
{
+ if (substr($expectedProtocol, -3) !== "://") {
+ $expectedProtocol .= '://';
+ }
+
\PHPUnit_Framework_Assert::assertStringStartsWith(
$expectedProtocol,
$this->browser->getUrl(),
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsUsedOnBackend.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsUsedOnBackend.php
index a45b3268aa5..7609d69c51c 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsUsedOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsUsedOnBackend.php
@@ -62,6 +62,10 @@ class AssertHttpsUsedOnBackend extends AbstractConstraint
*/
protected function assertUsedProtocol($expectedProtocol)
{
+ if (substr($expectedProtocol, -3) !== "://") {
+ $expectedProtocol .= '://';
+ }
+
\PHPUnit_Framework_Assert::assertStringStartsWith(
$expectedProtocol,
$this->browser->getUrl(),
--
GitLab