Merge pull request #31724 from owncloud/unskip-issue-29599-2

Unskip tests for issue 29599
owncloud · Nov 2, 2018 · 0aacf9e · 0aacf9e
2 parents dbd9e26 + c2e32ca
commit 0aacf9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/tests/acceptance/features/apiWebdavOperations/uploadFileUsingNewChunking.feature b/tests/acceptance/features/apiWebdavOperations/uploadFileUsingNewChunking.feature
@@ -120,7 +120,6 @@ Feature: upload file using new chunking
       | TIÄFÜ     |
 
 	#this test should be integrated into the previous Scenario after fixing the issue
-  @skip @issue-29599
   Scenario: Upload a file called "0" using new chunking
     When user "user0" creates a new chunking upload with id "chunking-42" using the WebDAV API
     And user "user0" uploads new chunk file "1" with "AAAAA" to id "chunking-42" using the WebDAV API

diff --git a/tests/acceptance/features/webUIUpload/uploadEdgecases.feature b/tests/acceptance/features/webUIUpload/uploadEdgecases.feature
@@ -91,12 +91,10 @@ Feature: File Upload
       | "&#"      |
       | "TIÄFÜ"   |
 
-	#this test should be intergrated into the previous scenario after fixing the issue
-	#uploading into "simple-folder" because there is a folder called "0" in the root
-  @skip @issue-29599
+  # upload into "simple-folder" because there is already a folder called "0" in the root
   Scenario: Upload a file called "0" using chunking
     Given a file with the size of "30000000" bytes and the name "0" has been created locally
     When the user opens the folder "simple-folder" using the webUI
     And the user uploads the file "0" using the webUI
     Then the file "0" should be listed on the webUI
-    And the content of "0" should be the same as the local "0"
+    And the content of "0" should be the same as the local "0"