make graph api default in test

owncloud · Jan 29, 2024 · afada02 · afada02
1 parent da898f0
commit afada02
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 308 deletions.
diff --git a/.drone.star b/.drone.star
@@ -822,7 +822,6 @@ def localApiTestPipeline(ctx):
 
 def localApiTests(suite, storage, extra_environment = {}):
     environment = {
-        "TEST_WITH_GRAPH_API": "true",
         "PATH_TO_OCIS": dirs["base"],
         "TEST_SERVER_URL": "https://ocis-server:9200",
         "OCIS_REVA_DATA_ROOT": "%s" % (dirs["ocisRevaDataRoot"] if storage == "owncloud" else ""),
@@ -1006,7 +1005,6 @@ def coreApiTests(ctx, part_number = 1, number_of_parts = 1, storage = "ocis", ac
                          "name": "oC10ApiTests-%s-storage-%s" % (storage, part_number),
                          "image": OC_CI_PHP % DEFAULT_PHP_VERSION,
                          "environment": {
-                             "TEST_WITH_GRAPH_API": "true",
                              "PATH_TO_OCIS": "%s" % dirs["base"],
                              "TEST_SERVER_URL": "https://ocis-server:9200",
                              "OCIS_REVA_DATA_ROOT": "%s" % (dirs["ocisRevaDataRoot"] if storage == "owncloud" else ""),

diff --git a/docs/ocis/development/testing.md b/docs/ocis/development/testing.md
@@ -223,15 +223,13 @@ ocis/bin/ocis server
 ```bash
 make test-acceptance-api \
 TEST_SERVER_URL=https://localhost:9200 \
-TEST_WITH_GRAPH_API=true \
 ```
 
 #### Run Tests Transferred From ownCloud Core (prefix `coreApi`)
 
 ```bash
 make test-acceptance-from-core-api \
 TEST_SERVER_URL=https://localhost:9200 \
-TEST_WITH_GRAPH_API=true \
 ```
 
 Useful environment variables:
@@ -289,7 +287,6 @@ If you want to work on a specific issue
    ```bash
    make test-acceptance-from-core-api \
    TEST_SERVER_URL=https://localhost:9200 \
-   TEST_WITH_GRAPH_API=true \
    STORAGE_DRIVER=OCIS \
    BEHAT_FEATURE='tests/acceptance/features/coreApiVersions/fileVersions.feature:147'
    ```
@@ -326,7 +323,6 @@ PROXY_ENABLE_BASIC_AUTH=true \
 
 ```bash
 OCIS_WRAPPER_URL=http://localhost:5200 \
-TEST_WITH_GRAPH_API=true \
 TEST_SERVER_URL="https://localhost:9200" \
 BEHAT_FEATURE=tests/acceptance/features/apiAsyncUpload/delayPostprocessing.feature \
 make test-acceptance-api
@@ -374,7 +370,6 @@ ocis/bin/ocis server
 Run the acceptance test with the following command:
 
 ```bash
-TEST_WITH_GRAPH_API=true \
 TEST_SERVER_URL="https://localhost:9200" \
 EMAIL_HOST="localhost" \
 EMAIL_PORT=9000 \
@@ -417,7 +412,6 @@ ocis/bin/ocis server
 Run the acceptance test with the following command:
 
 ```bash
-TEST_WITH_GRAPH_API=true \
 TEST_SERVER_URL="https://localhost:9200" \
 BEHAT_FEATURE="tests/acceptance/features/apiSearch/contentSearch.feature" \
 make test-acceptance-api
@@ -539,7 +533,6 @@ For antivirus running with docker, use `ANTIVIRUS_CLAMAV_SOCKET= "tcp://host.doc
 Run the acceptance test with the following command:
 
 ```bash
-TEST_WITH_GRAPH_API=true \
 TEST_SERVER_URL="https://localhost:9200" \
 BEHAT_FEATURE="tests/acceptance/features/apiAntivirus/antivirus.feature" \
 make test-acceptance-api

diff --git a/tests/TestHelpers/OcisHelper.php b/tests/TestHelpers/OcisHelper.php
@@ -47,13 +47,6 @@ public static function isTestingParallelDeployment(): bool {
 		return (\getenv("TEST_PARALLEL_DEPLOYMENT") === "true");
 	}
 
-	/**
-	 * @return bool
-	 */
-	public static function isTestingWithGraphApi(): bool {
-		return \getenv('TEST_WITH_GRAPH_API') === 'true';
-	}
-
 	/**
 	 * @return bool|string false if no command given or the command as string
 	 */

diff --git a/tests/acceptance/docker/src/acceptance.yml b/tests/acceptance/docker/src/acceptance.yml
@@ -6,7 +6,6 @@ services:
     environment:
       OCIS_ROOT: /drone/src
       TEST_SERVER_URL: https://ocis-server:9200
-      TEST_WITH_GRAPH_API: "true"
       OCIS_WRAPPER_URL: http://ocis-server:5200
       STORAGE_DRIVER: $STORAGE_DRIVER
       TEST_SOURCE: $TEST_SOURCE

diff --git a/tests/acceptance/features/bootstrap/FeatureContext.php b/tests/acceptance/features/bootstrap/FeatureContext.php
@@ -3244,11 +3244,9 @@ public function before(BeforeScenarioScope $scope): void {
 			$this->connectToLdap($suiteParameters);
 		}
 
-		if (OcisHelper::isTestingWithGraphApi()) {
-			$this->graphContext = new GraphContext();
-			$this->graphContext->before($scope);
-			$environment->registerContext($this->graphContext);
-		}
+		$this->graphContext = new GraphContext();
+		$this->graphContext->before($scope);
+		$environment->registerContext($this->graphContext);
 	}
 
 	/**