From: Lucas Di Pentima Date: Thu, 15 Oct 2020 16:45:09 +0000 (-0300) Subject: 16719: Adds integration test for old collection version display. X-Git-Tag: 2.1.1~7^2~11 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/8516425bd1c541476dc2d5cb00a762691cd753e1?ds=sidebyside 16719: Adds integration test for old collection version display. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- diff --git a/cypress/integration/collection-panel.spec.js b/cypress/integration/collection-panel.spec.js index c14101d8..414d7e3e 100644 --- a/cypress/integration/collection-panel.spec.js +++ b/cypress/integration/collection-panel.spec.js @@ -54,7 +54,8 @@ describe('Collection panel tests', function() { // Check that name & uuid are correct. cy.get('[data-cy=collection-info-panel]') .should('contain', this.testCollection.name) - .and('contain', this.testCollection.uuid); + .and('contain', this.testCollection.uuid) + .and('not.contain', 'This is an old version'); // Check for the read-only icon cy.get('[data-cy=read-only-icon]').should(`${isWritable ? 'not.' : ''}exist`); // Check that both read and write operations are available on @@ -117,4 +118,54 @@ describe('Collection panel tests', function() { }) }) }) + + it('can correctly display old versions', function() { + const colName = `Versioned Collection ${Math.floor(Math.random() * Math.floor(999999))}`; + let colUuid = ''; + let oldVersionUuid = ''; + // Make sure no other collections with this name exist + cy.doRequest('GET', '/arvados/v1/collections', null, { + filters: `[["name", "=", "${colName}"]]`, + include_old_versions: true + }) + .its('body.items').as('collections') + .then(function() { + expect(this.collections).to.be.empty; + }); + // Creates the collection using the admin token so we can set up + // a bogus manifest text without block signatures. + cy.createCollection(adminUser.token, { + name: colName, + owner_uuid: activeUser.user.uuid, + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"}) + .as('originalVersion').then(function() { + // Change the file name to create a new version. + cy.updateCollection(adminUser.token, this.originalVersion.uuid, { + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo\n" + }) + colUuid = this.originalVersion.uuid; + }); + // Confirm that there are 2 versions of the collection + cy.doRequest('GET', '/arvados/v1/collections', null, { + filters: `[["name", "=", "${colName}"]]`, + include_old_versions: true + }) + .its('body.items').as('collections') + .then(function() { + expect(this.collections).to.have.lengthOf(2); + this.collections.map(function(aCollection) { + expect(aCollection.current_version_uuid).to.equal(colUuid); + if (aCollection.uuid !== aCollection.current_version_uuid) { + oldVersionUuid = aCollection.uuid; + } + }); + // Check the old version displays as what it is. + cy.loginAs(activeUser) + cy.visit(`/collections/${oldVersionUuid}`); + cy.get('[data-cy=collection-info-panel]').should('contain', 'This is an old version'); + cy.get('[data-cy=read-only-icon]').should('exist'); + cy.get('[data-cy=collection-info-panel]').should('contain', colName); + cy.get('[data-cy=collection-files-panel]').should('contain', 'bar'); + }); + }); }) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index fd513998..228e1cab 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -125,6 +125,14 @@ Cypress.Commands.add( } ) +Cypress.Commands.add( + "updateCollection", (token, uuid, data) => { + return cy.updateResource(token, 'collections', uuid, { + collection: JSON.stringify(data) + }) + } +) + Cypress.Commands.add( "createResource", (token, suffix, data) => { return cy.doRequest('POST', '/arvados/v1/'+suffix, data, null, token, true) @@ -145,6 +153,16 @@ Cypress.Commands.add( } ) +Cypress.Commands.add( + "updateResource", (token, suffix, uuid, data) => { + return cy.doRequest('PUT', '/arvados/v1/'+suffix+'/'+uuid, data, null, token, true) + .its('body').as('resource') + .then(function() { + return this.resource; + }) + } +) + Cypress.Commands.add( "loginAs", (user) => { cy.visit(`/token/?api_token=${user.token}`); diff --git a/tools/arvados_config.yml b/tools/arvados_config.yml index 8882eac2..b533156d 100644 --- a/tools/arvados_config.yml +++ b/tools/arvados_config.yml @@ -7,6 +7,8 @@ Clusters: TLS: Insecure: true Collections: + CollectionVersioning: true + PreserveVersionIfIdle: 0s BlobSigningKey: zfhgfenhffzltr9dixws36j1yhksjoll2grmku38mi7yxd66h5j4q9w4jzanezacp8s6q0ro3hxakfye02152hncy6zml2ed0uc TrustAllContent: true ForwardSlashNameSubstitution: /