fixes ModelTransformerTest

fixes GraphQL tests

adds backward compatibilities

try fixing travis error

Author: Cyril Mizzi

tests/GraphQLTest.php

@@ -69,7 +69,6 @@ public function testQuery() {
 		$graphql->registerType('post', Entity\Post::class);
 
 		$params   = ['query' => 'query { user(id: 1) { name, posts { title } }}'];
-		$content  = $response->getData(true);
 		$user     = Entity\User::with('posts')->find(1);
 		$posts    = [];
 
@@ -79,13 +78,12 @@ public function testQuery() {
 
 		$this->call('GET', '/graphql', $params);
 		$this->seeJsonEquals([
-		$this->assertSame([
-			'user' => [
-				'name'  => $user->name,
-				'posts' => $posts
+				'user' => [
+					'name' => $user->name,
+					'posts' => $posts
+				]
 			]
-		], $content['data']);
-		]);
+		], $response);
 	}
 
 	/**
@@ -102,17 +100,33 @@ public function testMutation() {
 
 		$params = ['query' => 'mutation { updateName : user(id: 1, name : "Test") { id, name } }'];
 		$this->json('POST', '/graphql', $params);
-		$content  = $response->getData(true);
 		$entity = Entity\User::find(1);
 
 		$this->seeJsonEquals([
-		$this->assertArrayNotHasKey('errors', $content);
-		$this->assertSame([
-			'updateName' => [
-				'id'   => (string) $entity->getKey(),
-				'name' => $entity->name
+			'data' => [
+				'updateName' => [
+					'id'   => (string) $entity->getKey(),
+					'name' => $entity->name
+				]
 			]
-		], $content['data']);
-		]);
+		], $response);
+	}
+
+	/**
+	 * Backward compatibility between 5.3 and 5.4
+	 *
+	 * @param  array $data
+	 * @param  mixed $response
+	 *
+	 * @return void
+	 */
+	public function assertJsonEquals(array $data, $response) {
+		if (method_exists($response, 'assertJson')) {
+			$response->assertJson($data);
+		}
+
+		if (method_exists($response, 'seeJsonEquals')) {
+			$response->seeJsonEquals($data);
+		}
 	}
 }

tests/Transformer/ModelTransformerTest.php

@@ -5,13 +5,16 @@
 use StudioNet\GraphQL\Tests\TestCase;
 use StudioNet\GraphQL\Transformer\Type\ModelTransformer;
 use StudioNet\GraphQL\Type\EloquentObjectType;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 /**
  * ModelTransformerTest
  *
  * @see TestCase
  */
 class ModelTransformerTest extends TestCase {
+	use DatabaseTransactions;
+
 	/**
 	 * testSupports
 	 *
@@ -85,6 +88,7 @@ public function testResolve() {
 		$resolver    = $transformer->transform($user)->getFields()['posts']->config['resolve'];
 		$response    = call_user_func_array($resolver, [$entity, ['take' => 1, 'skip' => 1]]);
 
-		$this->assertSame($entity->posts->get(1)->toArray(), $response[0]->toArray());
+		$this->assertSame(1, count($response));
+		$this->assertSame($entity->posts->get(1)->toArray(), current($response)->toArray());
 	}
 }