Merge pull request #136 from neoxia/master-fix-breaking-tests

Fix broken tests and a bug about relations

src/Jenssegers/Eloquent/Model.php

@@ -191,9 +191,7 @@ abstract class Model extends \Illuminate\Database\Eloquent\Model {
         // title of this relation since that is a great convention to apply.
         if (is_null($relation))
         {
-            $caller = $this->getBelongsToManyCaller();
-
-            $name = $caller['function'];
+            $relation = $this->getBelongsToManyCaller();
         }
 
         // First, we'll need to determine the foreign key and "other key" for the

tests/RelationsTest.php

@@ -68,7 +68,7 @@ class RelationsTest extends PHPUnit_Framework_TestCase {
         Item::create(array('type' => 'sword', 'user_id' => $user->_id));
         Item::create(array('type' => 'bag', 'user_id' => null));
 
-        $items = Item::with('user')->get();
+        $items = Item::with('user')->orderBy('user_id', 'desc')->get();
 
         $user = $items[0]->getRelation('user');
         $this->assertInstanceOf('User', $user);