Fix for tests

app/Http/Requests/EntityRequest.php

@@ -9,7 +9,7 @@ class EntityRequest extends Request {
     protected $entityType;
     private $entity;
 
-    public function entity() 
+    public function entity()
     {
         if ($this->entity) {
             return $this->entity;
@@ -20,24 +20,24 @@ class EntityRequest extends Request {
         foreach (['_id', 's'] as $suffix) {
             $field = $this->entityType . $suffix;
             if ($this->$field) {
-                $publicId= $this->$field; 
-            } 
+                $publicId= $this->$field;
+            }
         }
         if ( ! $publicId) {
             $publicId = Input::get('public_id') ?: Input::get('id');
         }
         if ( ! $publicId) {
             return null;
-        } 
-        
+        }
+
         $class = Utils::getEntityClass($this->entityType);
-        
-        if (method_exists($class, 'withTrashed')) {
+
+        if (method_exists($class, 'trashed')) {
             $this->entity = $class::scope($publicId)->withTrashed()->firstOrFail();
         } else {
             $this->entity = $class::scope($publicId)->firstOrFail();
         }
-        
+
         return $this->entity;
     }
 

app/Models/EntityModel.php

@@ -33,7 +33,7 @@ class EntityModel extends Eloquent
         $entity->setRelation('user', $user);
         $entity->setRelation('account', $account);
 
-        if (method_exists($className, 'withTrashed')){
+        if (method_exists($className, 'trashed')){
             $lastEntity = $className::withTrashed()
                         ->scope(false, $entity->account_id);
         } else {