Skip to content

Commit 73d04da

Browse files
committed
move bootstrap to tests folder
1 parent ca2e542 commit 73d04da

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

phpunit.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit backupGlobals="false"
33
backupStaticAttributes="false"
4-
bootstrap="bootstrap/autoload.php"
4+
bootstrap="tests/bootstrap/autoload.php"
55
colors="true"
66
convertErrorsToExceptions="true"
77
convertNoticesToExceptions="true"

tests/Datatables.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public function createApplication()
1616

1717
$testEnvironment = 'testing';
1818

19-
return require __DIR__.'/../bootstrap/start.php';
19+
return require __DIR__.'/bootstrap/start.php';
2020
}
2121

2222
public function setUp()
@@ -48,7 +48,7 @@ public function test_datatables_make_function()
4848
{
4949
$demo = DB::table('demos')->select('id','name');
5050
$output = Datatables::of($demo)->make();
51-
$this->assertTrue( $output instanceof Illuminate\Http\JsonResponse ? true : false );
51+
$this->assertInstanceOf('Illuminate\Http\JsonResponse', $output);
5252
}
5353

5454

bootstrap/autoload.php renamed to tests/bootstrap/autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
|
1515
*/
1616

17-
require __DIR__.'/../vendor/autoload.php';
17+
require __DIR__.'/../../vendor/autoload.php';
1818

1919
/*
2020
|--------------------------------------------------------------------------

bootstrap/paths.php renamed to tests/bootstrap/paths.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
|
1414
*/
1515

16-
'app' => __DIR__.'/../vendor/laravel/laravel/app',
16+
'app' => __DIR__.'/../../vendor/laravel/laravel/app',
1717

1818
/*
1919
|--------------------------------------------------------------------------
@@ -26,7 +26,7 @@
2626
|
2727
*/
2828

29-
'public' => __DIR__.'/../vendor/laravel/laravel/public',
29+
'public' => __DIR__.'/../../vendor/laravel/laravel/public',
3030

3131
/*
3232
|--------------------------------------------------------------------------
@@ -39,7 +39,7 @@
3939
|
4040
*/
4141

42-
'base' => __DIR__.'/..',
42+
'base' => __DIR__.'/../..',
4343

4444
/*
4545
|--------------------------------------------------------------------------
@@ -52,6 +52,6 @@
5252
|
5353
*/
5454

55-
'storage' => __DIR__.'/../vendor/laravel/laravel/app/storage',
55+
'storage' => __DIR__.'/../../vendor/laravel/laravel/app/storage',
5656

5757
);
File renamed without changes.

0 commit comments

Comments
 (0)