rearrange graph tests

Author: amrita-shrestha

.drone.star

@@ -94,6 +94,7 @@ config = {
                 "apiDepthInfinity",
                 "apiLocks",
                 "apiActivities",
+                "apiServiceAvailability",
             ],
             "skip": False,
         },
@@ -117,17 +118,17 @@ config = {
                 "NOTIFICATIONS_DEBUG_ADDR": "0.0.0.0:9174",
             },
         },
-        "graph": {
+        "graphBasicAndGroup": {
             "suites": [
                 "apiGraph",
-                "apiServiceAvailability",
+                "apiGraphGroup",
             ],
             "skip": False,
             "withRemotePhp": [True],
         },
-        "graphUserGroup": {
+        "graphUser": {
             "suites": [
-                "apiGraphUserGroup",
+                "apiGraphUser",
             ],
             "skip": False,
             "withRemotePhp": [True],

docs/ocis/development/testing.md

@@ -62,7 +62,7 @@ While running the tests, oCIS server is started with [ociswrapper](https://githu
 
 ```bash
 WITH_WRAPPER=false \
-BEHAT_FEATURE='tests/acceptance/features/apiGraphUserGroup/createUser.feature:26' \
+BEHAT_FEATURE='tests/acceptance/features/apiGraphGroup/createUser.feature:26' \
 make -C tests/acceptance/docker test-ocis-feature-ocis-storage
 ```
 
@@ -119,7 +119,7 @@ The tests for a single feature (a feature file) can also be run against the diff
 For example;
 
 ```bash
-BEHAT_FEATURE='tests/acceptance/features/apiGraphUserGroup/createUser.feature' \
+BEHAT_FEATURE='tests/acceptance/features/apiGraphGroup/createUser.feature' \
 make -C tests/acceptance/docker test-ocis-feature-ocis-storage
 ```
 
@@ -134,19 +134,19 @@ A specific scenario from a feature can be run by adding `:<line-number>` at the
 {{< /hint >}}
 
 ```bash
-BEHAT_FEATURE='tests/acceptance/features/apiGraphUserGroup/createUser.feature:26' \
+BEHAT_FEATURE='tests/acceptance/features/apiGraphGroup/createUser.feature:26' \
 make -C tests/acceptance/docker test-ocis-feature-ocis-storage
 ```
 
 Similarly, with S3 storage;
 
 ```bash
 # run a whole feature
-BEHAT_FEATURE='tests/acceptance/features/apiGraphUserGroup/createUser.feature' \
+BEHAT_FEATURE='tests/acceptance/features/apiGraphGroup/createUser.feature' \
 make -C tests/acceptance/docker test-ocis-feature-s3ng-storage
 
 # run a single scenario
-BEHAT_FEATURE='tests/acceptance/features/apiGraphUserGroup/createUser.feature:26' \
+BEHAT_FEATURE='tests/acceptance/features/apiGraphGroup/createUser.feature:26' \
 make -C tests/acceptance/docker test-ocis-feature-s3ng-storage
 ```
 

tests/acceptance/config/behat.yml

@@ -124,9 +124,28 @@ default:
         - TrashbinContext:
         - SharingNgContext:
 
-    apiGraphUserGroup:
+    apiGraphUser:
       paths:
-        - "%paths.base%/../features/apiGraphUserGroup"
+        - "%paths.base%/../features/apiGraphUser"
+      context: *common_ldap_suite_context
+      contexts:
+        - FeatureContext: *common_feature_context_params
+        - SettingsContext:
+        - GraphContext:
+        - SpacesContext:
+        - CapabilitiesContext:
+        - FilesVersionsContext:
+        - OCSContext:
+        - PublicWebDavContext:
+        - TUSContext:
+        - SpacesTUSContext:
+        - OcisConfigContext:
+        - TrashbinContext:
+        - SharingNgContext:
+
+    apiGraphGroup:
+      paths:
+        - "%paths.base%/../features/apiGraphGroup"
       context: *common_ldap_suite_context
       contexts:
         - FeatureContext: *common_feature_context_params