Skip to content

Commit f735461

Browse files
author
Oleksii Korshenko
committed
MAGETWO-70591: magento/magento2:#6175 Fixed Unable to generate unsecure URL if current URL is secure #10188
- fixed ingration test
1 parent c3307a8 commit f735461

File tree

1 file changed

+6
-6
lines changed
  • dev/tests/integration/testsuite/Magento/Framework

1 file changed

+6
-6
lines changed

dev/tests/integration/testsuite/Magento/Framework/UrlTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,22 +99,22 @@ public function testGetUnsecureUrlInSecureArea()
9999

100100
$model = Bootstrap::getObjectManager()->create(\Magento\Framework\Url::class, ['request' => $request]);
101101

102-
$secureUrl = $model->getUrl('some/index/controller');
103-
$this->assertStringStartsWith(
102+
$secureUrl = $model->getUrl('some/index/controller', ['_nosid' => 1]);
103+
$this->assertEquals(
104104
'https://sample.com/index.php/some/index/controller/',
105105
$secureUrl,
106106
'Default URL in secure area is incorrect'
107107
);
108108

109-
$secureUrl = $model->getUrl('some/index/controller', ['_secure' => true]);
110-
$this->assertStringStartsWith(
109+
$secureUrl = $model->getUrl('some/index/controller', ['_secure' => true, '_nosid' => 1]);
110+
$this->assertEquals(
111111
'https://sample.com/index.php/some/index/controller/',
112112
$secureUrl,
113113
'Secure URL in secure area is incorrect'
114114
);
115115

116-
$unsecureUrl = $model->getUrl('some/index/controller', ['_secure' => false]);
117-
$this->assertStringStartsWith(
116+
$unsecureUrl = $model->getUrl('some/index/controller', ['_secure' => false, '_nosid' => 1]);
117+
$this->assertEquals(
118118
'http://sample.com/index.php/some/index/controller/',
119119
$unsecureUrl,
120120
'Unsecure URL in secure area is incorrect'

0 commit comments

Comments
 (0)