From 387443bdebe2fb106e844a38823ba3f538b9bd70 Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Thu, 14 Jul 2022 17:26:21 -0400 Subject: [PATCH] 16073: Change cypress tests to use TrustAllContent: true Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- cypress/integration/collection.spec.js | 6 +++--- tools/arvados_config.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js index 28454a9093..74506aea21 100644 --- a/cypress/integration/collection.spec.js +++ b/cypress/integration/collection.spec.js @@ -208,7 +208,7 @@ describe('Collection panel tests', function () { // a bogus manifest text without block signatures. cy.doRequest('GET', '/arvados/v1/config', null, null) .its('body').should((clusterConfig) => { - expect(clusterConfig.Collections, "clusterConfig").to.have.property("TrustAllContent", false); + expect(clusterConfig.Collections, "clusterConfig").to.have.property("TrustAllContent", true); expect(clusterConfig.Services, "clusterConfig").to.have.property("WebDAV").have.property("ExternalURL"); expect(clusterConfig.Services, "clusterConfig").to.have.property("WebDAVDownload").have.property("ExternalURL"); const inlineUrl = clusterConfig.Services.WebDAV.ExternalURL !== "" @@ -264,7 +264,7 @@ describe('Collection panel tests', function () { .contains(fileName).rightclick(); cy.get('[data-cy=context-menu]') .should('contain', 'Download') - .and('not.contain', 'Open in new tab') + .and('contain', 'Open in new tab') .and('contain', 'Copy to clipboard') .and(`${isWritable ? '' : 'not.'}contain`, 'Rename') .and(`${isWritable ? '' : 'not.'}contain`, 'Remove'); @@ -273,7 +273,7 @@ describe('Collection panel tests', function () { .contains(subDirName).rightclick(); cy.get('[data-cy=context-menu]') .should('not.contain', 'Download') - .and('not.contain', 'Open in new tab') + .and('contain', 'Open in new tab') .and('contain', 'Copy to clipboard') .and(`${isWritable ? '' : 'not.'}contain`, 'Rename') .and(`${isWritable ? '' : 'not.'}contain`, 'Remove'); diff --git a/tools/arvados_config.yml b/tools/arvados_config.yml index 3b2ecd8d8f..e745379702 100644 --- a/tools/arvados_config.yml +++ b/tools/arvados_config.yml @@ -12,7 +12,7 @@ Clusters: CollectionVersioning: true PreserveVersionIfIdle: -1s BlobSigningKey: zfhgfenhffzltr9dixws36j1yhksjoll2grmku38mi7yxd66h5j4q9w4jzanezacp8s6q0ro3hxakfye02152hncy6zml2ed0uc - TrustAllContent: false + TrustAllContent: true ForwardSlashNameSubstitution: / ManagedProperties: original_owner_uuid: {Function: original_owner, Protected: true} -- 2.30.2