Merge pull request #39744 from owncloud/spaces-on-apiWebdavEtagPropag…

…ation2 [tests-only][full-ci]Update `apiWebdavEtagPropagation2` suite for spaces webdav
owncloud · Feb 2, 2022 · 1303a29 · 1303a29
2 parents 87a93ca + f562658
commit 1303a29
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 5 deletions.
diff --git a/tests/acceptance/features/apiWebdavEtagPropagation2/copyFileFolder.feature b/tests/acceptance/features/apiWebdavEtagPropagation2/copyFileFolder.feature
@@ -24,6 +24,11 @@ Feature: propagation of etags when copying files or folders
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcis-OC-Storage @issue-product-280
   Scenario Outline: copying a file inside a folder changes its etag
     Given using <dav_version> DAV path
@@ -45,6 +50,11 @@ Feature: propagation of etags when copying files or folders
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcis-OC-Storage @issue-product-280
   Scenario Outline: copying a file from one folder to an other changes the etags of destination
     Given using <dav_version> DAV path
@@ -67,6 +77,11 @@ Feature: propagation of etags when copying files or folders
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcis-OC-Storage @issue-product-280
   Scenario Outline: copying a file into a subfolder changes the etags of all parents
     Given using <dav_version> DAV path
@@ -93,6 +108,11 @@ Feature: propagation of etags when copying files or folders
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcis-OC-Storage @issue-product-280
   Scenario Outline: copying a file inside a publicly shared folder by public changes etag for the sharer
     Given using <dav_version> DAV path
@@ -119,6 +139,11 @@ Feature: propagation of etags when copying files or folders
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcV10.6 @skipOnOcV10.7 @skipOnOcV10.8.0
   Scenario Outline: as share receiver copying a file inside a folder changes its etag for all collaborators
     Given user "Brian" has been created with default attributes and without skeleton files
@@ -157,6 +182,11 @@ Feature: propagation of etags when copying files or folders
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcis-OC-Storage @issue-product-280 @skipOnOcV10.6 @skipOnOcV10.7 @skipOnOcV10.8.0
   Scenario Outline: as sharer copying a file inside a folder changes its etag for all collaborators
     Given user "Brian" has been created with default attributes and without skeleton files
@@ -194,3 +224,8 @@ Feature: propagation of etags when copying files or folders
       | dav_version |
       | old         |
       | new         |
+
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
diff --git a/tests/acceptance/features/apiWebdavEtagPropagation2/createFolder.feature b/tests/acceptance/features/apiWebdavEtagPropagation2/createFolder.feature
@@ -22,6 +22,11 @@ Feature: propagation of etags when creating folders
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
 
   Scenario Outline: creating an invalid folder inside a folder should not change any etags
     Given using <dav_version> DAV path
@@ -41,6 +46,11 @@ Feature: propagation of etags when creating folders
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcis-OC-Storage @issue-product-280 @skipOnOcV10.6 @skipOnOcV10.7 @skipOnOcV10.8.0
   Scenario Outline: as share receiver creating a folder inside a folder received as a share changes its etag for all collaborators
     Given user "Brian" has been created with default attributes and without skeleton files
@@ -66,6 +76,11 @@ Feature: propagation of etags when creating folders
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcis-OC-Storage @issue-product-280 @skipOnOcV10.6 @skipOnOcV10.7 @skipOnOcV10.8.0
   Scenario Outline: as sharer creating a folder inside a folder received as a share changes its etag for all collaborators
     Given user "Brian" has been created with default attributes and without skeleton files
@@ -91,9 +106,15 @@ Feature: propagation of etags when creating folders
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcis-OC-Storage @issue-product-280
-  Scenario: creating a folder in a publicly shared folder changes its etag for the sharer
-    Given user "Alice" has created folder "/folder"
+  Scenario Outline: creating a folder in a publicly shared folder changes its etag for the sharer
+    Given using <dav_version> DAV path
+    And user "Alice" has created folder "/folder"
     And user "Alice" has created a public link share with settings
       | path        | folder |
       | permissions | create |
@@ -104,3 +125,12 @@ Feature: propagation of etags when creating folders
       | user  | path    |
       | Alice | /       |
       | Alice | /folder |
+    Examples:
+      | dav_version |
+      | old         |
+      | new         |
+
+  @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
diff --git a/tests/acceptance/features/apiWebdavEtagPropagation2/upload.feature b/tests/acceptance/features/apiWebdavEtagPropagation2/upload.feature
@@ -23,6 +23,11 @@ Feature: propagation of etags when uploading data
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
 
   Scenario Outline: overwriting a file inside a folder changes its etag
     Given using <dav_version> DAV path
@@ -42,6 +47,11 @@ Feature: propagation of etags when uploading data
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcis-OC-Storage @issue-product-280 @skipOnOcV10.6 @skipOnOcV10.7 @skipOnOcV10.8.0
   Scenario Outline: as share receiver uploading a file inside a received shared folder should update etags for all collaborators
     Given user "Brian" has been created with default attributes and without skeleton files
@@ -66,6 +76,11 @@ Feature: propagation of etags when uploading data
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcis-OC-Storage @issue-product-280 @skipOnOcV10.6 @skipOnOcV10.7 @skipOnOcV10.8.0
   Scenario Outline: as sharer uploading a file inside a shared folder should update etags for all collaborators
     Given user "Brian" has been created with default attributes and without skeleton files
@@ -90,6 +105,11 @@ Feature: propagation of etags when uploading data
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcV10.6 @skipOnOcV10.7 @skipOnOcV10.8.0
   Scenario Outline: as share receiver overwriting a file inside a received shared folder should update etags for all collaborators
     Given user "Brian" has been created with default attributes and without skeleton files
@@ -115,6 +135,11 @@ Feature: propagation of etags when uploading data
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcV10.6 @skipOnOcV10.7 @skipOnOcV10.8.0
   Scenario Outline: as sharer overwriting a file inside a shared folder should update etags for all collaborators
     Given user "Brian" has been created with default attributes and without skeleton files
@@ -140,9 +165,15 @@ Feature: propagation of etags when uploading data
       | old         |
       | new         |
 
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
+
   @skipOnOcis-OC-Storage @issue-product-280
-  Scenario: uploading a file into a publicly shared folder changes its etag for the sharer
-    Given user "Alice" has created a public link share with settings
+  Scenario Outline: uploading a file into a publicly shared folder changes its etag for the sharer
+    Given using <dav_version> DAV path
+    And user "Alice" has created a public link share with settings
       | path        | upload |
       | permissions | create |
     And user "Alice" has stored etag of element "/"
@@ -152,3 +183,12 @@ Feature: propagation of etags when uploading data
       | user  | path    |
       | Alice | /       |
       | Alice | /upload |
+    Examples:
+      | dav_version |
+      | old         |
+      | new         |
+
+    @skipOnOcV10 @personalSpace
+    Examples:
+      | dav_version |
+      | spaces      |
diff --git a/tests/acceptance/features/bootstrap/WebDavPropertiesContext.php b/tests/acceptance/features/bootstrap/WebDavPropertiesContext.php
@@ -1034,7 +1034,7 @@ public function userStoresEtagOfElementOnPath(string $user, string $path, string
 		if ($storePath == "") {
 			$storePath = $path;
 		}
-		if ($this->storedETAG[$user][$storePath] === null) {
+		if ($this->storedETAG[$user][$storePath] === null || $this->storedETAG[$user][$path] === "") {
 			throw new Exception("Expected stored etag to be some string but found null!");
 		}
 	}