Skip to content

Commit 93d3975

Browse files
tattalitattali
committed
Fix redirection tests
1 parent fcb7863 commit 93d3975

File tree

4 files changed

+11
-14
lines changed

4 files changed

+11
-14
lines changed

‎tests/DataCollector/DeviceDataCollectorTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ public function testCollectCurrentViewMobileCanUseTablet(): void
109109
'action' => RequestResponseListener::REDIRECT,
110110
];
111111
$this->request->query = new ParameterBag(['param1' => 'value1']);
112-
$this->request->expects(static::any())->method('getHost')->willReturn('testsite.com');
113112
$this->request->expects(static::any())->method('getSchemeAndHttpHost')->willReturn('http://t.testsite.com');
114113
$this->request->expects(static::any())->method('getBaseUrl')->willReturn('/base-url');
115114
$this->request->expects(static::any())->method('getPathInfo')->willReturn('/path-info');
@@ -157,7 +156,8 @@ public function testCollectCurrentViewMobileCanUseTablet(): void
157156
'http://t.testsite.com/base-url/path-info?%s=%s&param1=value1',
158157
$deviceView->getSwitchParam(),
159158
DeviceView::VIEW_TABLET
160-
), $view['link']
159+
),
160+
$view['link']
161161
);
162162
}
163163
}
@@ -172,7 +172,6 @@ public function testCollectCurrentViewFullCanUseMobile(): void
172172
'action' => RequestResponseListener::REDIRECT,
173173
];
174174
$this->request->query = new ParameterBag(['param1' => 'value1']);
175-
$this->request->expects(static::any())->method('getHost')->willReturn('testsite.com');
176175
$this->request->expects(static::any())->method('getSchemeAndHttpHost')->willReturn('http://t.testsite.com');
177176
$this->request->expects(static::any())->method('getBaseUrl')->willReturn('/base-url');
178177
$this->request->expects(static::any())->method('getPathInfo')->willReturn('/path-info');
@@ -220,7 +219,8 @@ public function testCollectCurrentViewFullCanUseMobile(): void
220219
'http://t.testsite.com/base-url/path-info?%s=%s&param1=value1',
221220
$deviceView->getSwitchParam(),
222221
DeviceView::VIEW_MOBILE
223-
), $view['link']
222+
),
223+
$view['link']
224224
);
225225
}
226226
}
@@ -235,8 +235,7 @@ public function testCollectCurrentViewFullCantUseMobile(): void
235235
'action' => RequestResponseListener::REDIRECT,
236236
];
237237
$this->request->query = new ParameterBag(['param1' => 'value1']);
238-
$this->request->expects(static::any())->method('getHost')->willReturn('testsite.com');
239-
$this->request->expects(static::any())->method('getSchemeAndHttpHost')->willReturn('http://m.testsite.com');
238+
$this->request->expects(static::any())->method('getSchemeAndHttpHost')->willReturn('http://testsite.com');
240239
$this->request->expects(static::any())->method('getBaseUrl')->willReturn('/base-url');
241240
$this->request->expects(static::any())->method('getPathInfo')->willReturn('/path-info');
242241
$test = $this;
@@ -280,10 +279,11 @@ public function testCollectCurrentViewFullCantUseMobile(): void
280279
static::assertFalse($view['enabled']);
281280
static::assertSame(
282281
sprintf(
283-
'http://m.testsite.com/base-url/path-info?%s=%s&param1=value1',
282+
'http://testsite.com/base-url/path-info?%s=%s&param1=value1',
284283
$deviceView->getSwitchParam(),
285284
DeviceView::VIEW_MOBILE
286-
), $view['link']
285+
),
286+
$view['link']
287287
);
288288
}
289289
}

‎tests/EventListener/RequestResponseListenerTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ protected function setUp(): void
6767
$this->router = $this->createMock(RouterInterface::class);
6868

6969
$this->request = $this->getMockBuilder(Request::class)->getMock();
70-
$this->request->expects(static::any())->method('getScheme')->willReturn('http');
71-
$this->request->expects(static::any())->method('getHost')->willReturn('testhost.com');
70+
$this->request->expects(static::any())->method('getSchemeAndHttpHost')->willReturn('http://testhost.com');
7271
$this->request->expects(static::any())->method('get')->willReturn('value');
7372
$this->request->expects(static::any())->method('getUriForPath')->willReturn('/');
7473
$this->request->query = new ParameterBag();

‎tests/Helper/DeviceViewTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ protected function setUp(): void
3939
$this->requestStack = $this->getMockBuilder(RequestStack::class)->disableOriginalConstructor()->getMock();
4040

4141
$this->request = $this->getMockBuilder(Request::class)->getMock();
42-
$this->request->expects(static::any())->method('getScheme')->willReturn('http');
43-
$this->request->expects(static::any())->method('getHost')->willReturn('testhost.com');
42+
$this->request->expects(static::any())->method('getSchemeAndHttpHost')->willReturn('http://testsite.com');
4443
$this->request->expects(static::any())->method('getUriForPath')->willReturn('/');
4544
$this->request->query = new ParameterBag();
4645
$this->request->cookies = new ParameterBag();

‎tests/Twig/Extension/MobileDetectExtensionTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ protected function setUp(): void
5151
$this->requestStack = $this->getMockBuilder(RequestStack::class)->disableOriginalConstructor()->getMock();
5252

5353
$this->request = $this->getMockBuilder(Request::class)->getMock();
54-
$this->request->expects(static::any())->method('getScheme')->willReturn('http');
55-
$this->request->expects(static::any())->method('getHost')->willReturn('testhost.com');
54+
$this->request->expects(static::any())->method('getSchemeAndHttpHost')->willReturn('http://testsite.com');
5655
$this->request->expects(static::any())->method('getUriForPath')->willReturn('/');
5756
$this->request->query = new ParameterBag();
5857
$this->request->cookies = new ParameterBag();

0 commit comments

Comments
 (0)