Adjust acceptance selectors

.drone.star

@@ -216,21 +216,6 @@ config = {
             "screenShots": True,
             "retry": False,
         },
-        "webUINotification": {
-            "type": NOTIFICATIONS,
-            "suites": {
-                "oC10Notification": [
-                    "webUINotifications",
-                    "webUISharingNotifications",
-                    "webUISharingNotificationsToRoot",
-                ],
-            },
-            "extraEnvironment": {
-                "EXPECTED_FAILURES_FILE": "%s/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md" % dir["web"],
-            },
-            "screenShots": True,
-            "notificationsAppNeeded": True,
-        },
         "webUIFederation": {
             "type": FEDERATED,
             "suites": {
@@ -245,22 +230,6 @@ config = {
             "federatedServerNeeded": True,
             "federatedServerVersion": OC10_VERSION,
         },
-        "webUI-XGA-Notifications": {
-            "type": NOTIFICATIONS,
-            "suites": {
-                "oC10XGAPortraitNotifications": [
-                    "webUINotifications",
-                    "webUISharingNotifications",
-                    "webUISharingNotificationsToRoot",
-                ],
-            },
-            "extraEnvironment": {
-                "EXPECTED_FAILURES_FILE": "%s/tests/acceptance/expected-failures-XGA-with-oc10-server-oauth2-login.md" % dir["web"],
-                "SCREEN_RESOLUTION": "768x1024",
-            },
-            "notificationsAppNeeded": True,
-            "filterTags": "@smokeTest and not @skipOnXGAPortraitResolution and not @skip and not @skipOnOC10 and not @notToImplementOnOC10",
-        },
         "webUI-XGA": {
             "type": FULL,
             "suites": {
@@ -337,22 +306,6 @@ config = {
             },
             "filterTags": "@smokeTest and not @skipOnXGAPortraitResolution and not @skip and not @skipOnOC10 and not @notToImplementOnOC10",
         },
-        "webUI-Notifications-iPhone": {
-            "type": NOTIFICATIONS,
-            "suites": {
-                "oC10iPhoneNotifications": [
-                    "webUINotifications",
-                    "webUISharingNotifications",
-                    "webUISharingNotificationsToRoot",
-                ],
-            },
-            "extraEnvironment": {
-                "EXPECTED_FAILURES_FILE": "%s/tests/acceptance/expected-failures-Iphone-oc10-server-oauth2-login.md" % dir["web"],
-                "SCREEN_RESOLUTION": "375x812",
-            },
-            "notificationsAppNeeded": True,
-            "filterTags": "@smokeTest and not @skipOnIphoneResolution and not @skip and not @skipOnOC10 and not @notToImplementOnOC10",
-        },
         "webUI-iPhone": {
             "type": FULL,
             "suites": {
@@ -436,7 +389,6 @@ config = {
             ],
             "suites": {
                 "oCISBasic": [
-                    "webUINotifications",
                     "webUIPrivateLinks",
                     "webUIPreview",
                     "webUIAccount",
@@ -446,7 +398,6 @@ config = {
                 "oCISSharingBasic": [
                     "webUISharingAcceptShares",
                     "webUIRestrictSharing",
-                    "webUISharingNotifications",
                 ],
                 "webUIFavorites": "oCISFavorites",
                 "oCISFiles1": [
@@ -537,25 +488,6 @@ config = {
             "filterTags": "not @skip and not @skipOnOCIS and not @notToImplementOnOCIS",
             "screenShots": True,
         },
-        "webUI-notifications-oc10-integration": {
-            "type": NOTIFICATIONS,
-            "suites": {
-                "oC10IntegrationNotifications": [
-                    "webUINotifications",
-                    "webUISharingNotifications",
-                    "webUISharingNotificationsToRoot",
-                ],
-            },
-            "extraEnvironment": {
-                "WEB_UI_CONFIG": "%s" % dir["oc10IntegrationAppOauthConfig"],
-                "SERVER_HOST": "http://owncloud/index.php/apps/web/index.html",
-                "EXPECTED_FAILURES_FILE": "%s/tests/acceptance/expected-failures-with-oc10-server-oauth2-login-and-web-integration-app.md" % dir["web"],
-            },
-            "filterTags": "not @skip and not @skipOnOC10 and not @notToImplementOnOC10 and not @openIdLogin and @smokeTest",
-            "oc10IntegrationAppIncluded": True,
-            "notificationsAppNeeded": True,
-            "screenShots": True,
-        },
         "webUI-oc10-integration": {
             "type": FULL,
             "suites": {
@@ -663,15 +595,6 @@ rootSharingTestSuites = [
     "webUISharingPermissionToRoot",
 ]
 
-notificationsTestSuites = [
-    "webUINotifications",
-    "webUISharingNotifications",
-]
-
-notificationsRootTestSuites = [
-    "webUISharingNotificationsToRoot",
-]
-
 basicTestSuites = [
     "webUIAccount",
     "webUICreateFilesFolders",
@@ -776,15 +699,11 @@ def checkTestSuites():
             expected += basicTestSuites
             if ("runningOnOCIS" not in test or test["runningOnOCIS"] != True):
                 expected += rootSharingTestSuites
-        elif (test["type"] == NOTIFICATIONS):
-            expected += notificationsTestSuites
-            if ("runningOnOCIS" not in test or test["runningOnOCIS"] != True):
-                expected += notificationsRootTestSuites
         elif (test["type"] == FEDERATED):
             expected += federatedTestSuites + federatedRootTestSuites
 
         if ("runningOnOCIS" in test and test["runningOnOCIS"] == True):
-            expected += notificationsTestSuites + ocisSpecificTestSuites
+            expected += ocisSpecificTestSuites
 
         if (sorted(suites) != sorted(expected)):
             print("Error: Suites dont match " + testGroupName)

tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md

@@ -52,13 +52,6 @@ Other free text and markdown formatting can be used elsewhere in the document if
 - [webUISharingInternalGroups/shareWithGroups.feature:222](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L222)
 - [webUISharingExpirationDate/shareWithExpirationDate.feature:21](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExpirationDate/shareWithExpirationDate.feature#L21)
 
-### [Notifications endpoint](https://github.com/owncloud/ocis/issues/14)
--   [webUISharingNotifications/shareWithGroups.feature:24](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotifications/shareWithGroups.feature#L24)
--   [webUISharingNotifications/shareWithUsers.feature:21](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotifications/shareWithUsers.feature#L21)
--   [webUISharingNotifications/shareWithUsers.feature:32](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotifications/shareWithUsers.feature#L32)
--   [webUISharingNotifications/shareWithUsers.feature:40](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotifications/shareWithUsers.feature#L40)
--   [webUISharingNotifications/shareWithUsers.feature:53](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotifications/shareWithUsers.feature#L53)
-
 ### [Listing shares via ocs API does not show path for parent folders](https://github.com/owncloud/ocis/issues/1231)
 -   [webUISharingPublicManagement/shareByPublicLink.feature:127](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature#L127)