Update tests and gitlab-ci (server)

server/.gitlab-ci.yml

@@ -15,7 +15,7 @@ install_dependencies:
         - cd server
         - composer install --ignore-platform-reqs
     cache:
-        key: ${CI_COMMIT_REF_SLUG}
+        key: ${CI_COMMIT_REF_SLUG}_server
         paths:
             - server/vendor
         policy: pull-push
@@ -24,7 +24,7 @@ test:
     image: jakzal/phpqa:php8.0
     stage: test
     cache: 
-        key: ${CI_COMMIT_REF_SLUG}
+        key: ${CI_COMMIT_REF_SLUG}_server
         paths:
             - server/vendor
         policy: pull
@@ -59,7 +59,7 @@ dockerize:
     image: docker:stable
     stage: dockerize
     cache: 
-        key: ${CI_COMMIT_REF_SLUG}
+        key: ${CI_COMMIT_REF_SLUG}_server
         paths:
             - server/vendor
         policy: pull

server/tests/Search/Query/ConeSearchTest.php

@@ -34,9 +34,9 @@ final class ConeSearchTest extends TestCase
         $datasetSelected = $this->createMock(Dataset::class);
         $datasetSelected->method('getAttributes')->willReturn(array($id, $ra, $dec));
         $datasetSelected->method('getConfig')->willReturn(array('cone_search' => array(
-            'enabled' => true,
-            'column_ra' => 2,
-            'column_dec' => 3
+            'cone_search_enabled' => true,
+            'cone_search_column_ra' => 2,
+            'cone_search_column_dec' => 3
         )));
 
         $doctrineQueryBuilder = $this->createMock(DoctrineQueryBuilder::class);
@@ -64,9 +64,9 @@ final class ConeSearchTest extends TestCase
         $anisQueryBuilder = $this->createMock(AnisQueryBuilder::class);
         $datasetSelected = $this->createMock(Dataset::class);
         $datasetSelected->method('getConfig')->willReturn(array('cone_search' => array(
-            'enabled' => false,
-            'column_ra' => 2,
-            'column_dec' => 3
+            'cone_search_enabled' => false,
+            'cone_search_column_ra' => 2,
+            'cone_search_column_dec' => 3
         )));
         $queryParams = array('cs' => '102.5:0.0:100');
         (new ConeSearch())($anisQueryBuilder, $datasetSelected, $queryParams);
@@ -83,9 +83,9 @@ final class ConeSearchTest extends TestCase
         $datasetSelected = $this->createMock(Dataset::class);
         $datasetSelected->method('getAttributes')->willReturn(array($id, $ra, $dec));
         $datasetSelected->method('getConfig')->willReturn(array('cone_search' => array(
-            'enabled' => true,
-            'column_ra' => 2,
-            'column_dec' => 3
+            'cone_search_enabled' => true,
+            'cone_search_column_ra' => 2,
+            'cone_search_column_dec' => 3
         )));
 
         $doctrineQueryBuilder = $this->createMock(DoctrineQueryBuilder::class);