Merge pull request #3457 from owncloud/revert-3443-skip-tests-fail

[Tests-only] Reenable upload related tests

.drone.star

@@ -1162,6 +1162,8 @@ def revaService():
 			'REVA_STORAGE_LOCAL_ROOT': '/srv/app/tmp/reva/root',
 			'REVA_STORAGE_OWNCLOUD_DATADIR': '/srv/app/tmp/reva/data',
 			'REVA_STORAGE_OC_DATA_TEMP_FOLDER': '/srv/app/tmp/',
+			'REVA_STORAGE_OC_DATA_URL': 'reva:9164',
+			'REVA_STORAGE_OC_DATA_SERVER_URL': 'http://reva:9164/data',
 			'REVA_OIDC_ISSUER': 'https://konnectd:9130',
 			'REVA_USERS_DRIVER': 'ldap',
 			'REVA_LDAP_HOSTNAME': 'ldap',

.gitignore

@@ -31,3 +31,4 @@ dist
 .envrc
 
 tests/reports
+tests/acceptance/filesForUpload

tests/acceptance/features/webUIUpload/upload.feature

@@ -1,4 +1,3 @@
-@skipOnOCIS @ocis-reva-issue-188
 Feature: File Upload
 
   As a user

tests/acceptance/features/webUIUpload/uploadEdgecases.feature

@@ -1,4 +1,3 @@
-@skipOnOCIS @ocis-reva-issue-188
 Feature: File Upload
 
   As a QA engineer
@@ -118,7 +117,7 @@ Feature: File Upload
     Then file "0" should be listed on the webUI
     And as "user1" the content of "simple-folder/0" should be the same as the local "0"
 
-  @issue-3015 @skipOnOCIS
+  @issue-3015 @skipOnOCIS @issue-ocis-reva-200
   Scenario: Upload a file with the same name as already existing folder
     Given the user has created folder "new-lorem.txt"
     And the user has reloaded the current page of the webUI
@@ -134,7 +133,7 @@ Feature: File Upload
     #   """
 
   # When this issue is fixed merge with the scenario above
-  @issue-3015 @skipOnOC10
+  @issue-3015 @skipOnOC10 @skipOnOCIS @issue-ocis-reva-200
   Scenario: Upload a file with the same name as already existing folder
     Given the user has created folder "new-lorem.txt"
     And the user has reloaded the current page of the webUI