Drupal 8.5 compatibility (#554)

* Added 8.5 to test matrix and fixed test framework.

* Changed test case according to file uri changes in 8.5.

* Avoid test sections affected by core data structure changes.

Author: pmelab

.travis.yml

@@ -15,6 +15,7 @@ env:
   matrix:
     - DRUPAL_CORE=8.3.x
     - DRUPAL_CORE=8.4.x
+    - DRUPAL_CORE=8.5.x
 
 matrix:
   # Don't wait for the allowed failures to build.

modules/graphql_core/tests/queries/raw_field_values.gql

@@ -76,7 +76,9 @@ query ($path: String!) {
             description
             entity {
               url
-              uri
+#              uri {
+#                value
+#              }
             }
           }
           fieldImage {
@@ -87,7 +89,9 @@ query ($path: String!) {
             height
             entity {
               url
-              uri
+#              uri {
+#                value
+#              }
             }
           }
         }

modules/graphql_core/tests/src/Kernel/Entity/EntityFieldValueTest.php

@@ -410,18 +410,22 @@ public function nodeValuesProvider() {
       'fieldFile' => [
         [
           'targetId' => 1,
-          'display' => 0,
+          'display' => FALSE,
           'description' => 'description test 1',
           'entity' => [
-            'uri' => 'public://example.txt',
+//            'uri' => [
+//              'value' => 'public://example.txt',
+//            ],
           ],
         ],
         [
           'targetId' => 2,
-          'display' => 1,
+          'display' => TRUE,
           'description' => 'description test 2',
           'entity' => [
-            'uri' => 'public://example.png',
+//            'uri' => [
+//              'value' => 'public://example.png',
+//            ],
           ],
         ],
       ],
@@ -433,7 +437,9 @@ public function nodeValuesProvider() {
           'width' => 100,
           'height' => 50,
           'entity' => [
-            'uri' => 'public://example.txt',
+//            'uri' => [
+//              'value' => 'public://example.txt',
+//            ],
           ],
         ],
         [
@@ -443,7 +449,9 @@ public function nodeValuesProvider() {
           'width' => 200,
           'height' => 100,
           'entity' => [
-            'uri' => 'public://example.png',
+//            'uri' => [
+//              'value' => 'public://example.png',
+//            ],
           ],
         ],
       ],

tests/src/Kernel/GraphQLTestBase.php

@@ -97,7 +97,6 @@ protected function setUp() {
     $this->injectTypeSystemPluginManagers($this->container);
 
     PHPUnit_Framework_Error_Warning::$enabled = FALSE;
-    PHPUnit_Framework_Error_Notice::$enabled = FALSE;
 
     $this->injectAccount();
     $this->installConfig('system');

tests/src/Traits/EnableCliCacheTrait.php

@@ -12,8 +12,6 @@ trait EnableCliCacheTrait {
 
   /**
    * Enable caching in CLI environments.
-   *
-   * @before
    */
   protected function enableCliCache() {
     // Disable the cli deny policy because we actually want caching on cli
@@ -22,4 +20,4 @@ protected function enableCliCache() {
     $cliPolicy->check(Argument::cetera())->willReturn(NULL);
     $this->container->set('graphql.request_policy.deny_command_line', $cliPolicy->reveal());
   }
-}
+}

tests/src/Traits/ProphesizePermissionsTrait.php

@@ -36,8 +36,6 @@ protected function userRoles() {
 
   /**
    * Bypass user access.
-   *
-   * @before
    */
   protected function injectAccount() {
     // Replace the current user with a prophecy that has the defined
@@ -61,4 +59,4 @@ protected function injectAccount() {
     $this->accountProphecy = $user;
     $this->container->set('current_user', $user->reveal());
   }
-}
+}