FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge pull request #5871 from lucasmichot/4.2-response-keep-status · JavaDevl/framework@1f680f3 · GitHub

/ framework Public
forked from laravel/framework

Commit 1f680f3

Browse files
taylorotwell
committed
Merge pull request laravel#5871 from lucasmichot/4.2-response-keep-status
[4.2] Split Tests For Response And RedirectResponse
2 parents bfb3d0c + 4055394 commit 1f680f3

3 files changed

Lines changed: 152 additions & 120 deletions

File tree

‎tests/Http/HttpJsonResponseTest.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,14 @@ public function testSetAndRetrieveOptions()
1818
$this->assertSame(JSON_PRETTY_PRINT, $response->getJsonOptions());
1919
}
2020

21+
public function testSetAndRetrieveStatusCode()
22+
{
23+
$response = new Illuminate\Http\JsonResponse(['foo' => 'bar'], 404);
24+
$this->assertSame(404, $response->getStatusCode());
25+
26+
$response = new Illuminate\Http\JsonResponse(['foo' => 'bar']);
27+
$response->setStatusCode(404);
28+
$this->assertSame(404, $response->getStatusCode());
29+
}
30+
2131
}

‎tests/Http/HttpRedirectResponseTest.php‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
<?php
2+
3+
use Mockery as m;
4+
use Illuminate\Http\Request;
5+
use Illuminate\Http\RedirectResponse;
6+
7+
class HttpRedirectResponseTest extends PHPUnit_Framework_TestCase {
8+
9+
public function tearDown()
10+
{
11+
m::close();
12+
}
13+
14+
public function testHeaderOnRedirect()
15+
{
16+
$response = new RedirectResponse('foo.bar');
17+
$this->assertNull($response->headers->get('foo'));
18+
$response->header('foo', 'bar');
19+
$this->assertEquals('bar', $response->headers->get('foo'));
20+
$response->header('foo', 'baz', false);
21+
$this->assertEquals('bar', $response->headers->get('foo'));
22+
$response->header('foo', 'baz');
23+
$this->assertEquals('baz', $response->headers->get('foo'));
24+
}
25+
26+
27+
public function testWithOnRedirect()
28+
{
29+
$response = new RedirectResponse('foo.bar');
30+
$response->setRequest(Request::create('/', 'GET', array('name' => 'Taylor', 'age' => 26)));
31+
$response->setSession($session = m::mock('Illuminate\Session\Store'));
32+
$session->shouldReceive('flash')->twice();
33+
$response->with(array('name', 'age'));
34+
}
35+
36+
37+
public function testWithCookieOnRedirect()
38+
{
39+
$response = new RedirectResponse('foo.bar');
40+
$this->assertEquals(0, count($response->headers->getCookies()));
41+
$this->assertEquals($response, $response->withCookie(new \Symfony\Component\HttpFoundation\Cookie('foo', 'bar')));
42+
$cookies = $response->headers->getCookies();
43+
$this->assertEquals(1, count($cookies));
44+
$this->assertEquals('foo', $cookies[0]->getName());
45+
$this->assertEquals('bar', $cookies[0]->getValue());
46+
}
47+
48+
49+
public function testInputOnRedirect()
50+
{
51+
$response = new RedirectResponse('foo.bar');
52+
$response->setRequest(Request::create('/', 'GET', array('name' => 'Taylor', 'age' => 26)));
53+
$response->setSession($session = m::mock('Illuminate\Session\Store'));
54+
$session->shouldReceive('flashInput')->once()->with(array('name' => 'Taylor', 'age' => 26));
55+
$response->withInput();
56+
}
57+
58+
59+
public function testOnlyInputOnRedirect()
60+
{
61+
$response = new RedirectResponse('foo.bar');
62+
$response->setRequest(Request::create('/', 'GET', array('name' => 'Taylor', 'age' => 26)));
63+
$response->setSession($session = m::mock('Illuminate\Session\Store'));
64+
$session->shouldReceive('flashInput')->once()->with(array('name' => 'Taylor'));
65+
$response->onlyInput('name');
66+
}
67+
68+
69+
public function testExceptInputOnRedirect()
70+
{
71+
$response = new RedirectResponse('foo.bar');
72+
$response->setRequest(Request::create('/', 'GET', array('name' => 'Taylor', 'age' => 26)));
73+
$response->setSession($session = m::mock('Illuminate\Session\Store'));
74+
$session->shouldReceive('flashInput')->once()->with(array('name' => 'Taylor'));
75+
$response->exceptInput('age');
76+
}
77+
78+
79+
public function testFlashingErrorsOnRedirect()
80+
{
81+
$response = new RedirectResponse('foo.bar');
82+
$response->setRequest(Request::create('/', 'GET', array('name' => 'Taylor', 'age' => 26)));
83+
$response->setSession($session = m::mock('Illuminate\Session\Store'));
84+
$session->shouldReceive('get')->with('errors', m::type('Illuminate\Support\ViewErrorBag'))->andReturn(new Illuminate\Support\ViewErrorBag);
85+
$session->shouldReceive('flash')->once()->with('errors', m::type('Illuminate\Support\ViewErrorBag'));
86+
$provider = m::mock('Illuminate\Support\Contracts\MessageProviderInterface');
87+
$provider->shouldReceive('getMessageBag')->once()->andReturn(new Illuminate\Support\MessageBag);
88+
$response->withErrors($provider);
89+
}
90+
91+
92+
public function testSettersGettersOnRequest()
93+
{
94+
$response = new RedirectResponse('foo.bar');
95+
$this->assertNull($response->getRequest());
96+
$this->assertNull($response->getSession());
97+
98+
$request = Request::create('/', 'GET');
99+
$session = m::mock('Illuminate\Session\Store');
100+
$response->setRequest($request);
101+
$response->setSession($session);
102+
$this->assertSame($request, $response->getRequest());
103+
$this->assertSame($session, $response->getSession());
104+
}
105+
106+
107+
public function testRedirectWithErrorsArrayConvertsToMessageBag()
108+
{
109+
$response = new RedirectResponse('foo.bar');
110+
$response->setRequest(Request::create('/', 'GET', array('name' => 'Taylor', 'age' => 26)));
111+
$response->setSession($session = m::mock('Illuminate\Session\Store'));
112+
$session->shouldReceive('get')->with('errors', m::type('Illuminate\Support\ViewErrorBag'))->andReturn(new Illuminate\Support\ViewErrorBag);
113+
$session->shouldReceive('flash')->once()->with('errors', m::type('Illuminate\Support\ViewErrorBag'));
114+
$provider = array('foo' => 'bar');
115+
$response->withErrors($provider);
116+
}
117+
118+
119+
public function testMagicCall()
120+
{
121+
$response = new RedirectResponse('foo.bar');
122+
$response->setRequest(Request::create('/', 'GET', array('name' => 'Taylor', 'age' => 26)));
123+
$response->setSession($session = m::mock('Illuminate\Session\Store'));
124+
$session->shouldReceive('flash')->once()->with('foo', 'bar');
125+
$response->withFoo('bar');
126+
}
127+
128+
129+
public function testMagicCallException()
130+
{
131+
$this->setExpectedException('BadMethodCallException');
132+
$response = new RedirectResponse('foo.bar');
133+
$response->doesNotExist('bar');
134+
}
135+
136+
}

‎tests/Http/HttpResponseTest.php‎

Lines changed: 6 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?php
22

33
use Mockery as m;
4-
use Illuminate\Http\Request;
5-
use Illuminate\Http\RedirectResponse;
64
use Illuminate\Support\Contracts\JsonableInterface;
75

86
class HttpResponseTest extends PHPUnit_Framework_TestCase {
@@ -69,126 +67,14 @@ public function testGetOriginalContent()
6967
}
7068

7169

72-
public function testHeaderOnRedirect()
70+
public function testSetAndRetrieveStatusCode()
7371
{
74-
$response = new RedirectResponse('foo.bar');
75-
$this->assertNull($response->headers->get('foo'));
76-
$response->header('foo', 'bar');
77-
$this->assertEquals('bar', $response->headers->get('foo'));
78-
$response->header('foo', 'baz', false);
79-
$this->assertEquals('bar', $response->headers->get('foo'));
80-
$response->header('foo', 'baz');
81-
$this->assertEquals('baz', $response->headers->get('foo'));
82-
}
83-
84-
85-
public function testWithOnRedirect()
86-
{
87-
$response = new RedirectResponse('foo.bar');
88-
$response->setRequest(Request::create('/', 'GET', array('name' => 'Taylor', 'age' => 26)));
89-
$response->setSession($session = m::mock('Illuminate\Session\Store'));
90-
$session->shouldReceive('flash')->twice();
91-
$response->with(array('name', 'age'));
92-
}
93-
94-
95-
public function testWithCookieOnRedirect()
96-
{
97-
$response = new RedirectResponse('foo.bar');
98-
$this->assertEquals(0, count($response->headers->getCookies()));
99-
$this->assertEquals($response, $response->withCookie(new \Symfony\Component\HttpFoundation\Cookie('foo', 'bar')));
100-
$cookies = $response->headers->getCookies();
101-
$this->assertEquals(1, count($cookies));
102-
$this->assertEquals('foo', $cookies[0]->getName());
103-
$this->assertEquals('bar', $cookies[0]->getValue());
104-
}
105-
106-
107-
public function testInputOnRedirect()
108-
{
109-
$response = new RedirectResponse('foo.bar');
110-
$response->setRequest(Request::create('/', 'GET', array('name' => 'Taylor', 'age' => 26)));
111-
$response->setSession($session = m::mock('Illuminate\Session\Store'));
112-
$session->shouldReceive('flashInput')->once()->with(array('name' => 'Taylor', 'age' => 26));
113-
$response->withInput();
114-
}
115-
72+
$response = new Illuminate\Http\Response('foo', 404);
73+
$this->assertSame(404, $response->getStatusCode());
11674

117-
public function testOnlyInputOnRedirect()
118-
{
119-
$response = new RedirectResponse('foo.bar');
120-
$response->setRequest(Request::create('/', 'GET', array('name' => 'Taylor', 'age' => 26)));
121-
$response->setSession($session = m::mock('Illuminate\Session\Store'));
122-
$session->shouldReceive('flashInput')->once()->with(array('name' => 'Taylor'));
123-
$response->onlyInput('name');
124-
}
125-
126-
127-
public function testExceptInputOnRedirect()
128-
{
129-
$response = new RedirectResponse('foo.bar');
130-
$response->setRequest(Request::create('/', 'GET', array('name' => 'Taylor', 'age' => 26)));
131-
$response->setSession($session = m::mock('Illuminate\Session\Store'));
132-
$session->shouldReceive('flashInput')->once()->with(array('name' => 'Taylor'));
133-
$response->exceptInput('age');
134-
}
135-
136-
137-
public function testFlashingErrorsOnRedirect()
138-
{
139-
$response = new RedirectResponse('foo.bar');
140-
$response->setRequest(Request::create('/', 'GET', array('name' => 'Taylor', 'age' => 26)));
141-
$response->setSession($session = m::mock('Illuminate\Session\Store'));
142-
$session->shouldReceive('get')->with('errors', m::type('Illuminate\Support\ViewErrorBag'))->andReturn(new Illuminate\Support\ViewErrorBag);
143-
$session->shouldReceive('flash')->once()->with('errors', m::type('Illuminate\Support\ViewErrorBag'));
144-
$provider = m::mock('Illuminate\Support\Contracts\MessageProviderInterface');
145-
$provider->shouldReceive('getMessageBag')->once()->andReturn(new Illuminate\Support\MessageBag);
146-
$response->withErrors($provider);
147-
}
148-
149-
150-
public function testSettersGettersOnRequest()
151-
{
152-
$response = new RedirectResponse('foo.bar');
153-
$this->assertNull($response->getRequest());
154-
$this->assertNull($response->getSession());
155-
156-
$request = Request::create('/', 'GET');
157-
$session = m::mock('Illuminate\Session\Store');
158-
$response->setRequest($request);
159-
$response->setSession($session);
160-
$this->assertSame($request, $response->getRequest());
161-
$this->assertSame($session, $response->getSession());
162-
}
163-
164-
165-
public function testRedirectWithErrorsArrayConvertsToMessageBag()
166-
{
167-
$response = new RedirectResponse('foo.bar');
168-
$response->setRequest(Request::create('/', 'GET', array('name' => 'Taylor', 'age' => 26)));
169-
$response->setSession($session = m::mock('Illuminate\Session\Store'));
170-
$session->shouldReceive('get')->with('errors', m::type('Illuminate\Support\ViewErrorBag'))->andReturn(new Illuminate\Support\ViewErrorBag);
171-
$session->shouldReceive('flash')->once()->with('errors', m::type('Illuminate\Support\ViewErrorBag'));
172-
$provider = array('foo' => 'bar');
173-
$response->withErrors($provider);
174-
}
175-
176-
177-
public function testMagicCall()
178-
{
179-
$response = new RedirectResponse('foo.bar');
180-
$response->setRequest(Request::create('/', 'GET', array('name' => 'Taylor', 'age' => 26)));
181-
$response->setSession($session = m::mock('Illuminate\Session\Store'));
182-
$session->shouldReceive('flash')->once()->with('foo', 'bar');
183-
$response->withFoo('bar');
184-
}
185-
186-
187-
public function testMagicCallException()
188-
{
189-
$this->setExpectedException('BadMethodCallException');
190-
$response = new RedirectResponse('foo.bar');
191-
$response->doesNotExist('bar');
75+
$response = new Illuminate\Http\Response('foo');
76+
$response->setStatusCode(404);
77+
$this->assertSame(404, $response->getStatusCode());
19278
}
19379

19480
}

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL