Merge pull request #113 from owncloud/fix-enable-sync-stable-branch

updating test step for enabling share sync in stable branch
owncloud · Jun 20, 2024 · 517e20b · 517e20b
2 parents 582ce68 + 625f925
commit 517e20b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/.drone.star b/.drone.star
@@ -171,7 +171,7 @@ def behatTest():
             "depends_on": [],
             "steps": generateSSLCert() + apacheService() + waitForService("apache", 443) + runOcis(branch) +
                      waitForService("ocis", 9200) + waitForService("postgresql", 5432) +
-                     waitForService("selenium", 4444) + setupMoodle() + runBehatUITest(branch),
+                     waitForService("selenium", 4444) + setupMoodle() + runBehatUITest(),
             "volumes": [
                 {
                     "name": "www-moodle",
@@ -374,11 +374,7 @@ def seleniumService():
         },
     ]
 
-def runBehatUITest(branch):
-    if branch == "master":
-        tags = "@ocis"
-    else:
-        tags = "@ocis &&~@skipOnStable"
+def runBehatUITest():
     return [
         {
             "name": "behat-UI-test",
@@ -387,7 +383,7 @@ def runBehatUITest(branch):
             "commands": [
                 "update-ca-certificates",
                 "cd /var/www/html/moodle",
-                'vendor/bin/behat --config /var/www/behatdata/behatrun/behat/behat.yml --tags="%s"' % tags,
+                'vendor/bin/behat --config /var/www/behatdata/behatrun/behat/behat.yml --tags="@ocis"',
             ],
             "volumes": [
                 {

diff --git a/tests/behat/graph_helper.php b/tests/behat/graph_helper.php
@@ -296,6 +296,7 @@ public function disable_share_sync(string $user): array {
     public function enable_share_sync(string $user, string $share, string $offeredby, string $space): array {
         $itemid = $this->get_resource_id($offeredby, $share, $space);
         $body = [
+            "name" => $share,
             "remoteItem" => [
                 "id" => $itemid,
             ],

diff --git a/tests/behat/uploadFileToMoodle.feature b/tests/behat/uploadFileToMoodle.feature
@@ -104,7 +104,6 @@ Feature: upload the resource in oCIS to moodle
     And I should see "Shares"
     And I should see "ProjectMoodle"
 
-  @skipOnStable @ocis-issue-8961
   Scenario: enable/disable sync of shared resource shared from Personal Space
     Given user "Brian" has been created with default attributes
     And user "Brian" has uploaded a file inside space "Personal" with content "some content" to "/testfile.txt"