'table%&?*2',
'bar' // make sure we can go back to the original name as a last step
];
+ cy.intercept({method: 'PUT', url: '**/arvados/v1/collections/*'}).as('renameRequest');
eachPair(names, (from, to) => {
cy.waitForDom().get('[data-cy=collection-files-panel]')
.contains(`${from}`).rightclick();
.type(to, { parseSpecialCharSequences: false });
});
cy.get('[data-cy=form-submit-btn]').click();
+ cy.wait('@renameRequest');
cy.get('[data-cy=collection-files-panel]')
.should('not.contain', `${from}`)
.and('contain', `${to}`);
});
cy.get('[data-cy=form-submit-btn]').click();
- cy.get('[data-cy=collection-files-panel]')
+ // need to wait for dialog to dismiss
+ cy.get('[data-cy=form-dialog]').should('not.exist');
+
+ cy.waitForDom().get('[data-cy=collection-files-panel]')
.contains('Home')
.click();
.contains('Remove')
.click();
cy.get('[data-cy=confirmation-dialog-ok-btn]').click();
+ cy.get('[data-cy=form-dialog]').should('not.exist');
});
});
});
cy.get('[data-cy=form-dialog]')
.should('contain', 'Move to')
.within(() => {
+ // must use .then to avoid selecting instead of expanding https://github.com/cypress-io/cypress/issues/5529
cy.get('[data-cy=projects-tree-home-tree-picker]')
.find('i')
- .click();
+ .then(el => el.click());
cy.get('[data-cy=projects-tree-home-tree-picker]')
.contains(projName)
.click();
it('automatically updates the collection UI contents without using the Refresh button', function () {
const collName = `Test Collection ${Math.floor(Math.random() * 999999)}`;
- const fileName = 'foobar'
cy.createCollection(adminUser.token, {
name: collName,
cy.getAll('@testCollection').then(function ([testCollection]) {
cy.loginAs(activeUser);
+
+ const files = [
+ "foobar",
+ "anotherFile",
+ "",
+ "finalName",
+ ];
+
cy.goToPath(`/collections/${testCollection.uuid}`);
cy.get('[data-cy=collection-files-panel]').should('contain', 'This collection is empty');
- cy.get('[data-cy=collection-files-panel]').should('not.contain', fileName);
+ cy.get('[data-cy=collection-files-panel]').should('not.contain', files[0]);
cy.get('[data-cy=collection-info-panel]').should('contain', collName);
- cy.updateCollection(adminUser.token, testCollection.uuid, {
- name: `${collName + ' updated'}`,
- manifest_text: `. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:${fileName}\n`,
- }).as('updatedCollection');
- cy.getAll('@updatedCollection').then(function ([updatedCollection]) {
- expect(updatedCollection.name).to.equal(`${collName + ' updated'}`);
- cy.get('[data-cy=collection-info-panel]').should('contain', updatedCollection.name);
- cy.get('[data-cy=collection-files-panel]').should('contain', fileName);
+ files.map((fileName, i, files) => {
+ cy.updateCollection(adminUser.token, testCollection.uuid, {
+ name: `${collName + ' updated'}`,
+ manifest_text: fileName ? `. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:${fileName}\n` : "",
+ }).as('updatedCollection');
+ cy.getAll('@updatedCollection').then(function ([updatedCollection]) {
+ expect(updatedCollection.name).to.equal(`${collName + ' updated'}`);
+ cy.get('[data-cy=collection-info-panel]').should('contain', updatedCollection.name);
+ fileName
+ ? cy.get('[data-cy=collection-files-panel]').should('contain', fileName)
+ : cy.get('[data-cy=collection-files-panel]').should('not.contain', files[i-1]);;
+ });
});
+
});
- })
+ });
it('makes a copy of an existing collection', function() {
const collName = `Test Collection ${Math.floor(Math.random() * 999999)}`;
cy.get('[data-cy=collection-version-browser-select-1]')
.should('contain', '1')
.and('contain', '6 B')
- .and('contain', adminUser.user.uuid);
+ .and('contain', adminUser.user.full_name);
// Version 2: 3 bytes in size (one file removed)
cy.get('[data-cy=collection-version-browser-select-2]')
.should('contain', '2')
.should('contain', '3').and('contain', '3 B');
// Check context menus on version browser
+ cy.waitForDom();
cy.get('[data-cy=collection-version-browser-select-3]').rightclick()
cy.get('[data-cy=context-menu]')
.should('contain', 'Add to favorites')
});
});
- it('creates collection from selected files of another collection', () => {
+ it('copies selected files into new collection', () => {
cy.createCollection(adminUser.token, {
name: `Test Collection ${Math.floor(Math.random() * 999999)}`,
owner_uuid: activeUser.user.uuid,
});
cy.get('[data-cy=collection-files-panel-options-btn]').click();
- cy.get('[data-cy=context-menu]').contains('Create a new collection with selected').click();
+ cy.get('[data-cy=context-menu]').contains('Copy selected into new collection').click();
cy.get('[data-cy=form-dialog]').contains('Projects').click();
cy.waitForDom().get('.layout-pane-primary', { timeout: 12000 }).contains('Projects').click();
- cy.get('main').contains(`Files extracted from: ${this.collection.name}`).should('exist');
+ cy.waitForDom().get('main').contains(`Files extracted from: ${this.collection.name}`).click();
+ cy.get('[data-cy=collection-files-panel]')
+ .and('contain', 'bar');
+ });
+ });
+
+ it('copies selected files into existing collection', () => {
+ cy.createCollection(adminUser.token, {
+ name: `Test Collection ${Math.floor(Math.random() * 999999)}`,
+ owner_uuid: activeUser.user.uuid,
+ preserve_version: true,
+ manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo 0:3:bar\n"
+ }).as('sourceCollection')
+
+ cy.createCollection(adminUser.token, {
+ name: `Destination Collection ${Math.floor(Math.random() * 999999)}`,
+ owner_uuid: activeUser.user.uuid,
+ preserve_version: true,
+ manifest_text: ""
+ }).as('destinationCollection');
+
+ cy.getAll('@sourceCollection', '@destinationCollection').then(function ([sourceCollection, destinationCollection]) {
+ // Visit collection, check basic information
+ cy.loginAs(activeUser)
+ cy.goToPath(`/collections/${sourceCollection.uuid}`);
+
+ cy.get('[data-cy=collection-files-panel]').within(() => {
+ cy.get('input[type=checkbox]').first().click();
+ });
+
+ cy.get('[data-cy=collection-files-panel-options-btn]').click();
+ cy.get('[data-cy=context-menu]').contains('Copy selected into existing collection').click();
+
+ cy.get('[data-cy=form-dialog]').contains(destinationCollection.name).click();
+
+ cy.get('[data-cy=form-submit-btn]').click();
+ cy.wait(2000);
+
+ cy.goToPath(`/collections/${destinationCollection.uuid}`);
+
+ cy.get('main').contains(destinationCollection.name).should('exist');
+ cy.get('[data-cy=collection-files-panel]')
+ .and('contain', 'bar');
+ });
+ });
+
+ it('copies selected files into separate collections', () => {
+ cy.createCollection(adminUser.token, {
+ name: `Test Collection ${Math.floor(Math.random() * 999999)}`,
+ owner_uuid: activeUser.user.uuid,
+ preserve_version: true,
+ manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo 0:3:bar\n"
+ }).as('sourceCollection')
+
+ cy.getAll('@sourceCollection').then(function ([sourceCollection]) {
+ // Visit collection, check basic information
+ cy.loginAs(activeUser)
+ cy.goToPath(`/collections/${sourceCollection.uuid}`);
+
+ // Select both files
+ cy.waitForDom().get('[data-cy=collection-files-panel]').within(() => {
+ cy.get('input[type=checkbox]').first().click();
+ cy.get('input[type=checkbox]').last().click();
+ });
+
+ // Copy to separate collections
+ cy.get('[data-cy=collection-files-panel-options-btn]').click();
+ cy.get('[data-cy=context-menu]').contains('Copy selected into separate collections').click();
+ cy.get('[data-cy=form-dialog]').contains('Projects').click();
+ cy.get('[data-cy=form-submit-btn]').click();
+
+ // Verify created collections
+ cy.waitForDom().get('.layout-pane-primary', { timeout: 12000 }).contains('Projects').click();
+ cy.get('main').contains(`File copied from collection ${sourceCollection.name}/foo`).click();
+ cy.get('[data-cy=collection-files-panel]')
+ .and('contain', 'foo');
+ cy.get('.layout-pane-primary').contains('Projects').click();
+ cy.get('main').contains(`File copied from collection ${sourceCollection.name}/bar`).click();
+ cy.get('[data-cy=collection-files-panel]')
+ .and('contain', 'bar');
+
+ // Verify separate collection menu items not present when single file selected
+ // Wait for dom for collection to re-render
+ cy.waitForDom().get('[data-cy=collection-files-panel]').within(() => {
+ cy.get('input[type=checkbox]').first().click();
+ });
+ cy.get('[data-cy=collection-files-panel-options-btn]').click();
+ cy.get('[data-cy=context-menu]').should('not.contain', 'Copy selected into separate collections');
+ cy.get('[data-cy=context-menu]').should('not.contain', 'Move selected into separate collections');
+ });
+ });
+
+ it('moves selected files into new collection', () => {
+ cy.createCollection(adminUser.token, {
+ name: `Test Collection ${Math.floor(Math.random() * 999999)}`,
+ owner_uuid: activeUser.user.uuid,
+ preserve_version: true,
+ manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo 0:3:bar\n"
+ })
+ .as('collection').then(function () {
+ // Visit collection, check basic information
+ cy.loginAs(activeUser)
+ cy.goToPath(`/collections/${this.collection.uuid}`);
+
+ cy.get('[data-cy=collection-files-panel]').within(() => {
+ cy.get('input[type=checkbox]').first().click();
+ });
+
+ cy.get('[data-cy=collection-files-panel-options-btn]').click();
+ cy.get('[data-cy=context-menu]').contains('Move selected into new collection').click();
+
+ cy.get('[data-cy=form-dialog]').contains('Projects').click();
+
+ cy.get('[data-cy=form-submit-btn]').click();
+
+ cy.waitForDom().get('.layout-pane-primary', { timeout: 12000 }).contains('Projects').click();
+
+ cy.get('main').contains(`Files moved from: ${this.collection.name}`).click();
+ cy.get('[data-cy=collection-files-panel]')
+ .and('contain', 'bar');
+ });
+ });
+
+ it('moves selected files into existing collection', () => {
+ cy.createCollection(adminUser.token, {
+ name: `Test Collection ${Math.floor(Math.random() * 999999)}`,
+ owner_uuid: activeUser.user.uuid,
+ preserve_version: true,
+ manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo 0:3:bar\n"
+ }).as('sourceCollection')
+
+ cy.createCollection(adminUser.token, {
+ name: `Destination Collection ${Math.floor(Math.random() * 999999)}`,
+ owner_uuid: activeUser.user.uuid,
+ preserve_version: true,
+ manifest_text: ""
+ }).as('destinationCollection');
+
+ cy.getAll('@sourceCollection', '@destinationCollection').then(function ([sourceCollection, destinationCollection]) {
+ // Visit collection, check basic information
+ cy.loginAs(activeUser)
+ cy.goToPath(`/collections/${sourceCollection.uuid}`);
+
+ cy.get('[data-cy=collection-files-panel]').within(() => {
+ cy.get('input[type=checkbox]').first().click();
+ });
+
+ cy.get('[data-cy=collection-files-panel-options-btn]').click();
+ cy.get('[data-cy=context-menu]').contains('Move selected into existing collection').click();
+
+ cy.get('[data-cy=form-dialog]').contains(destinationCollection.name).click();
+
+ cy.get('[data-cy=form-submit-btn]').click();
+ cy.wait(2000);
+
+ cy.goToPath(`/collections/${destinationCollection.uuid}`);
+
+ cy.get('main').contains(destinationCollection.name).should('exist');
+ cy.get('[data-cy=collection-files-panel]')
+ .and('contain', 'bar');
+ });
+ });
+
+ it('moves selected files into separate collections', () => {
+ cy.createCollection(adminUser.token, {
+ name: `Test Collection ${Math.floor(Math.random() * 999999)}`,
+ owner_uuid: activeUser.user.uuid,
+ preserve_version: true,
+ manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo 0:3:bar\n"
+ }).as('sourceCollection')
+
+ cy.getAll('@sourceCollection').then(function ([sourceCollection]) {
+ // Visit collection, check basic information
+ cy.loginAs(activeUser)
+ cy.goToPath(`/collections/${sourceCollection.uuid}`);
+
+ // Select both files
+ cy.get('[data-cy=collection-files-panel]').within(() => {
+ cy.get('input[type=checkbox]').first().click();
+ cy.get('input[type=checkbox]').last().click();
+ });
+
+ // Copy to separate collections
+ cy.get('[data-cy=collection-files-panel-options-btn]').click();
+ cy.get('[data-cy=context-menu]').contains('Move selected into separate collections').click();
+ cy.get('[data-cy=form-dialog]').contains('Projects').click();
+ cy.get('[data-cy=form-submit-btn]').click();
+
+ // Verify created collections
+ cy.waitForDom().get('.layout-pane-primary', { timeout: 12000 }).contains('Projects').click();
+ cy.get('main').contains(`File moved from collection ${sourceCollection.name}/foo`).click();
+ cy.get('[data-cy=collection-files-panel]')
+ .and('contain', 'foo');
+ cy.get('.layout-pane-primary').contains('Projects').click();
+ cy.get('main').contains(`File moved from collection ${sourceCollection.name}/bar`).click();
+ cy.get('[data-cy=collection-files-panel]')
+ .and('contain', 'bar');
});
});
// Confirm proper vocabulary labels are displayed on the UI.
cy.get('[data-cy=form-dialog]').should('contain', 'Color: Magenta');
+ // Value field should not complain about being required just after
+ // adding a new property. See #19732
+ cy.get('[data-cy=form-dialog]').should('not.contain', 'This field is required');
+
cy.get('[data-cy=form-submit-btn]').click();
// Confirm that the user was taken to the newly created collection
cy.get('[data-cy=form-dialog]').should('not.exist');
cy.fixture('files/5mb.bin', 'base64').then(content => {
cy.get('[data-cy=drag-and-drop]').upload(content, '5mb_b.bin');
cy.get('[data-cy=form-submit-btn]').click();
- cy.get('[data-cy=form-submit-btn]').should('not.exist');
- cy.get('[data-cy=collection-files-right-panel]')
+ cy.waitForDom().get('[data-cy=form-submit-btn]').should('not.exist');
+ // subdir gets unselected, I think this is a bug but
+ // for the time being let's just make sure the test works.
+ cy.get('[data-cy=collection-files-panel]').contains('subdir').click();
+ cy.waitForDom().get('[data-cy=collection-files-right-panel]')
.contains('5mb_b.bin').should('exist');
});
});
projects / arvados-workbench2.git / blobdiff