Enable support for laravel 5.5 in the tests

santigarcor · Sep 21, 2017 · d4c0242 · d4c0242
1 parent 307b91d
commit d4c0242
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     },
     "require-dev": {
         "mockery/mockery": "^0.9.2",
-        "phpunit/phpunit": "~4.1",
+        "phpunit/phpunit": ">=4.1",
         "orchestra/testbench": "~3.2"
     },
     "autoload": {

diff --git a/tests/LaratrustRoleTest.php b/tests/LaratrustRoleTest.php
@@ -85,7 +85,11 @@ public function testAttachPermission()
         $this->assertInstanceOf('Laratrust\Tests\Models\Role', $this->role->attachPermission($permC->id));
         $this->assertCount(3, $this->role->permissions()->get()->toArray());
 
-        $this->setExpectedException('InvalidArgumentException');
+        if (method_exists($this, 'setExpectedException')) {
+            $this->setExpectedException('InvalidArgumentException');
+        } else {
+            $this->expectException('InvalidArgumentException');
+        }
         $this->role->attachPermission(true);
     }