Skip to content

Commit 57f02d7

Browse files
authored
Merge pull request #44 from rodrigopedra/patch-1
Use Response factory to build view
2 parents 366e78b + 7f29f20 commit 57f02d7

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

src/Response.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
use Illuminate\Support\Arr;
77
use Illuminate\Http\JsonResponse;
88
use Illuminate\Support\Facades\App;
9-
use Illuminate\Support\Facades\View;
109
use Illuminate\Contracts\Support\Arrayable;
1110
use Illuminate\Contracts\Support\Responsable;
11+
use Illuminate\Support\Facades\Response as ResponseFactory;
1212

1313
class Response implements Responsable
1414
{
@@ -76,6 +76,6 @@ public function toResponse($request)
7676
]);
7777
}
7878

79-
return View::make($this->rootView, $this->viewData + ['page' => $page]);
79+
return ResponseFactory::view($this->rootView, $this->viewData + ['page' => $page]);
8080
}
8181
}

tests/ControllerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ public function test_controller_returns_an_inertia_response()
2020
'url' => '',
2121
'version' => null,
2222
],
23-
], $response->toResponse(new Request())->getData());
23+
], $response->toResponse(new Request())->getOriginalContent()->getData());
2424
}
2525
}

tests/ResponseTest.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Illuminate\View\View;
77
use Illuminate\Http\Request;
88
use Illuminate\Http\JsonResponse;
9+
use Illuminate\Http\Response as BaseResponse;
910

1011
class ResponseTest extends TestCase
1112
{
@@ -21,14 +22,17 @@ public function test_server_response()
2122
);
2223

2324
$response = $response->toResponse($request);
24-
$page = $response->getData()['page'];
25+
$view = $response->getOriginalContent();
26+
$page = $view->getData()['page'];
27+
28+
$this->assertInstanceOf(BaseResponse::class, $response);
29+
$this->assertInstanceOf(View::class, $view);
2530

26-
$this->assertInstanceOf(View::class, $response);
2731
$this->assertSame('User/Edit', $page['component']);
2832
$this->assertSame('Jonathan', $page['props']['user']['name']);
2933
$this->assertSame('/user/123', $page['url']);
3034
$this->assertSame('123', $page['version']);
31-
$this->assertSame('<div id="app" data-page="{&quot;component&quot;:&quot;User\/Edit&quot;,&quot;props&quot;:{&quot;user&quot;:{&quot;name&quot;:&quot;Jonathan&quot;}},&quot;url&quot;:&quot;\/user\/123&quot;,&quot;version&quot;:&quot;123&quot;}"></div>'."\n", $response->render());
35+
$this->assertSame('<div id="app" data-page="{&quot;component&quot;:&quot;User\/Edit&quot;,&quot;props&quot;:{&quot;user&quot;:{&quot;name&quot;:&quot;Jonathan&quot;}},&quot;url&quot;:&quot;\/user\/123&quot;,&quot;version&quot;:&quot;123&quot;}"></div>'."\n", $view->render());
3236
}
3337

3438
public function test_xhr_response()

0 commit comments

Comments
 (0)