diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index a204657557..f7f1f7e39f 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -58,7 +58,7 @@ jobs: php-versions: ['8.3'] databases: ['sqlite'] server-versions: ['master'] - scenarios: ['wopi', 'direct', 'api', 'secure-view', 'admin-settings'] + scenarios: ['wopi', 'direct', 'federation', 'api', 'secure-view', 'admin-settings'] name: integration-${{ matrix.code-image }}-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -126,7 +126,7 @@ jobs: php-versions: ['8.3'] databases: ['mysql'] server-versions: ['master'] - scenarios: ['wopi', 'direct', 'api', 'secure-view', 'admin-settings'] + scenarios: ['wopi', 'direct', 'federation', 'api', 'secure-view', 'admin-settings'] name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -201,7 +201,7 @@ jobs: php-versions: ['8.3'] databases: ['pgsql'] server-versions: ['master'] - scenarios: ['wopi', 'direct', 'api', 'secure-view', 'admin-settings'] + scenarios: ['wopi', 'direct', 'federation', 'api', 'secure-view', 'admin-settings'] name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -278,7 +278,7 @@ jobs: php-versions: ['8.3'] databases: ['oci'] server-versions: ['master'] - scenarios: ['wopi', 'direct', 'api', 'secure-view', 'admin-settings'] + scenarios: ['wopi', 'direct', 'federation', 'api', 'secure-view', 'admin-settings'] name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} diff --git a/cypress/e2e/share-federated.spec.js b/cypress/e2e/share-federated.spec.js index 7846bcb3ff..b9bcd27cfc 100644 --- a/cypress/e2e/share-federated.spec.js +++ b/cypress/e2e/share-federated.spec.js @@ -7,7 +7,7 @@ import { randHash } from '../utils/index.js' const shareOwner = new User(randHash(), randHash()) const shareRecipient = new User(randHash(), randHash()) -describe.skip('Federated sharing of office documents', function() { +describe('Federated sharing of office documents', function() { before(function() { cy.nextcloudEnableApp('testing') diff --git a/tests/features/direct.feature b/tests/features/direct.feature index 46ccd444fe..fff022bcc4 100644 --- a/tests/features/direct.feature +++ b/tests/features/direct.feature @@ -85,7 +85,6 @@ Feature: Direct editing Then Collabora downloads the file and it is equal to "./../emptyTemplates/template.ods" @federation - @known-failure-ci Scenario: Open a federated shared file through direct editing Given on instance "serverA" And as user "user1" @@ -108,7 +107,6 @@ Feature: Direct editing Then Collabora downloads the file and it is equal to "./../emptyTemplates/template.ods" @federation - @known-failure-ci Scenario: Open a file in a federated shared folder through direct editing Given on instance "serverA" And as user "user1"