rearrange graph tests

Author: amrita-shrestha

Diff for: .drone.star

@@ -97,9 +97,10 @@ config = {
             ],
             "skip": False,
         },
-        "settings": {
+        "settingsAndNotification": {
             "suites": [
                 "apiSettings",
+                "apiNotification",
             ],
             "skip": False,
             "withRemotePhp": [True],
@@ -117,17 +118,18 @@ config = {
                 "NOTIFICATIONS_DEBUG_ADDR": "0.0.0.0:9174",
             },
         },
-        "graph": {
+        "graphBasicAndGroup": {
             "suites": [
-                "apiGraph",
                 "apiServiceAvailability",
+                "apiGraph",
+                "apiGraphGroup",
             ],
             "skip": False,
             "withRemotePhp": [True],
         },
-        "graphUserGroup": {
+        "graphUser": {
             "suites": [
-                "apiGraphUserGroup",
+                "apiGraphUser",
             ],
             "skip": False,
             "withRemotePhp": [True],
@@ -194,26 +196,6 @@ config = {
             ],
             "accounts_hash_difficulty": "default",
         },
-        "notification": {
-            "suites": [
-                "apiNotification",
-            ],
-            "skip": False,
-            "withRemotePhp": [True],
-            "emailNeeded": True,
-            "extraEnvironment": {
-                "EMAIL_HOST": EMAIL_SMTP_HOST,
-                "EMAIL_PORT": EMAIL_PORT,
-            },
-            "extraServerEnvironment": {
-                "OCIS_ADD_RUN_SERVICES": "notifications",
-                "NOTIFICATIONS_SMTP_HOST": EMAIL_SMTP_HOST,
-                "NOTIFICATIONS_SMTP_PORT": EMAIL_SMTP_PORT,
-                "NOTIFICATIONS_SMTP_INSECURE": "true",
-                "NOTIFICATIONS_SMTP_SENDER": EMAIL_SMTP_SENDER,
-                "NOTIFICATIONS_DEBUG_ADDR": "0.0.0.0:9174",
-            },
-        },
         "antivirus": {
             "suites": [
                 "apiAntivirus",

Diff for: 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/apiGraphUser/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/apiGraphUser/createUser.feature' \
 make -C tests/acceptance/docker test-ocis-feature-ocis-storage
 ```
 
@@ -130,23 +130,23 @@ make -C tests/acceptance/docker test-ocis-feature-ocis-storage
 And to run a single scenario in a feature, you can do:
 
 {{< hint info >}}
-A specific scenario from a feature can be run by adding `:<line-number>` at the end of the feature file path. For example, to run the scenario at line 26 of the feature file `apiGraphUserGroup/createUser.feature`, simply add the line number like this: `apiGraphUserGroup/createUser.feature:26`. Note that the line numbers mentioned in the examples might not always point to a scenario, so always check the line numbers before running the test.
+A specific scenario from a feature can be run by adding `:<line-number>` at the end of the feature file path. For example, to run the scenario at line 26 of the feature file `apiGraphUser/createUser.feature`, simply add the line number like this: `apiGraphUser/createUser.feature:26`. Note that the line numbers mentioned in the examples might not always point to a scenario, so always check the line numbers before running the test.
 {{< /hint >}}
 
 ```bash
-BEHAT_FEATURE='tests/acceptance/features/apiGraphUserGroup/createUser.feature:26' \
+BEHAT_FEATURE='tests/acceptance/features/apiGraphUser/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/apiGraphUser/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/apiGraphUser/createUser.feature:26' \
 make -C tests/acceptance/docker test-ocis-feature-s3ng-storage
 ```
 
@@ -227,16 +227,16 @@ Useful environment variables:
 `BEHAT_FEATURE`: to run a single feature
 
 {{< hint info >}}
-A specific scenario from a feature can be run by adding `:<line-number>` at the end of the feature file path. For example, to run the scenario at line 26 of the feature file `apiGraphUserGroup/createUser.feature`, simply add the line number like this: `apiGraphUserGroup/createUser.feature:26`. Note that the line numbers mentioned in the examples might not always point to a scenario, so always check the line numbers before running the test.
+A specific scenario from a feature can be run by adding `:<line-number>` at the end of the feature file path. For example, to run the scenario at line 26 of the feature file `apiGraphUser/createUser.feature`, simply add the line number like this: `apiGraphUser/createUser.feature:26`. Note that the line numbers mentioned in the examples might not always point to a scenario, so always check the line numbers before running the test.
 {{< /hint >}}
 
 > Example:
 >
-> BEHAT_FEATURE=tests/acceptance/features/apiGraphUserGroup/createUser.feature
+> BEHAT_FEATURE=tests/acceptance/features/apiGraphUser/createUser.feature
 >
 > Or
 >
-> BEHAT_FEATURE=tests/acceptance/features/apiGraphUserGroup/createUser.feature:13
+> BEHAT_FEATURE=tests/acceptance/features/apiGraphUser/createUser.feature:13
 
 `BEHAT_SUITE`: to run a single suite
 

Diff for: 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