diff --git a/apps/sensenet/cypress/e2e/breadcrumb/breadcrumb.cy.ts b/apps/sensenet/cypress/e2e/breadcrumb/breadcrumb.cy.ts index ea4cd23ec..82186ff1f 100644 --- a/apps/sensenet/cypress/e2e/breadcrumb/breadcrumb.cy.ts +++ b/apps/sensenet/cypress/e2e/breadcrumb/breadcrumb.cy.ts @@ -7,38 +7,37 @@ describe('breadcrumb', () => { cy.visit( pathWithQueryParams({ path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), - newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT/Document_Library' }, + newParams: { repoUrl: Cypress.env('repoUrl'), path: '' }, }), ) }) it('should contain the expected items', () => { - const expectedItems = ['Content', 'IT Workspace', 'Document library'] - - cy.get('[data-test^="breadcrumb-item-"]').should('have.length', expectedItems.length) - - cy.get('[data-test^="breadcrumb-item-"]').each(($el, index) => { - expect(expectedItems[index]).to.equal($el.text()) - }) + cy.get('[data-test^="breadcrumb-item-"]').should('have.length', 1) }) it('should navigate in the target folder on click', () => { - const documentLibrarySelector = '[data-test="breadcrumb-item-document-library"]' + cy.get('[data-test="menu-item-sample-workspace"]').click() + cy.get("[data-test='breadcrumb-item-sample-workspace']").should('exist') + cy.get('[data-test="menu-item-document-library"]').click({ force: true }) + cy.get('[data-test="breadcrumb-item-document-library"]').as('docLibBreadCrumb').should('exist') + cy.get('[data-test="menu-item-memos"]').click({ force: true }) + cy.get('[data-test="breadcrumb-item-memos"]').should('exist') - cy.get(documentLibrarySelector).should('exist') - cy.get('[data-test="breadcrumb-item-it-workspace"]').click() - cy.get('[data-test="breadcrumb-item-it-workspace"]').should('exist') - cy.get(documentLibrarySelector).should('not.exist') + cy.get('@docLibBreadCrumb').should('not.exist') cy.location().should((loc) => { const query = new URLSearchParams(loc.search) - expect(query.get('path')).to.eq('/IT') + + console.log(query.get('path')) + + expect(query.get('path')).to.eq('/SampleWorkspace/Memos') }) }) it('right click on a breadcrumb item should open its action menu', () => { cy.get('[data-test^="content-context-menu-"]').should('not.exist') - cy.get('[data-test="breadcrumb-item-it-workspace"]').rightclick() + cy.get('[data-test="breadcrumb-item-content"]').rightclick() cy.get('[data-test^="content-context-menu-"]').should('have.length.of.at.least', 1) }) }) diff --git a/apps/sensenet/cypress/e2e/content-crud/calendar-event.cy.ts b/apps/sensenet/cypress/e2e/content-crud/calendar-event.cy.ts index 345619a10..bd6607e1c 100644 --- a/apps/sensenet/cypress/e2e/content-crud/calendar-event.cy.ts +++ b/apps/sensenet/cypress/e2e/content-crud/calendar-event.cy.ts @@ -7,7 +7,7 @@ describe('Calendar event', () => { cy.visit( pathWithQueryParams({ path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), - newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT/Calendar' }, + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Calendar' }, }), ) }) diff --git a/apps/sensenet/cypress/e2e/content-crud/document-library.cy.ts b/apps/sensenet/cypress/e2e/content-crud/document-library.cy.ts index b56f05332..385a14419 100644 --- a/apps/sensenet/cypress/e2e/content-crud/document-library.cy.ts +++ b/apps/sensenet/cypress/e2e/content-crud/document-library.cy.ts @@ -7,7 +7,7 @@ describe('Link', () => { cy.visit( pathWithQueryParams({ path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), - newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT' }, + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace' }, }), ) }) diff --git a/apps/sensenet/cypress/e2e/content-crud/link-list.cy.ts b/apps/sensenet/cypress/e2e/content-crud/link-list.cy.ts index 63c95b433..f37f90955 100644 --- a/apps/sensenet/cypress/e2e/content-crud/link-list.cy.ts +++ b/apps/sensenet/cypress/e2e/content-crud/link-list.cy.ts @@ -7,7 +7,7 @@ describe('Link list', () => { cy.visit( pathWithQueryParams({ path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), - newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT' }, + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace' }, }), ) }) diff --git a/apps/sensenet/cypress/e2e/content-crud/link.cy.ts b/apps/sensenet/cypress/e2e/content-crud/link.cy.ts index b6ee54088..e14f1f2fe 100644 --- a/apps/sensenet/cypress/e2e/content-crud/link.cy.ts +++ b/apps/sensenet/cypress/e2e/content-crud/link.cy.ts @@ -7,7 +7,7 @@ describe('Link', () => { cy.visit( pathWithQueryParams({ path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), - newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT/Links' }, + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Links' }, }), ) }) diff --git a/apps/sensenet/cypress/e2e/content-crud/memo-list.cy.ts b/apps/sensenet/cypress/e2e/content-crud/memo-list.cy.ts index 4b0d76e28..e84270f8a 100644 --- a/apps/sensenet/cypress/e2e/content-crud/memo-list.cy.ts +++ b/apps/sensenet/cypress/e2e/content-crud/memo-list.cy.ts @@ -7,7 +7,7 @@ describe('Memo list', () => { cy.visit( pathWithQueryParams({ path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), - newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT' }, + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace' }, }), ) }) diff --git a/apps/sensenet/cypress/e2e/content-crud/memo.cy.ts b/apps/sensenet/cypress/e2e/content-crud/memo.cy.ts index ee1948a3b..8e97c0f13 100644 --- a/apps/sensenet/cypress/e2e/content-crud/memo.cy.ts +++ b/apps/sensenet/cypress/e2e/content-crud/memo.cy.ts @@ -7,7 +7,7 @@ describe('Memo', () => { cy.visit( pathWithQueryParams({ path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), - newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT/Memos' }, + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Memos' }, }), ) }) diff --git a/apps/sensenet/cypress/e2e/content-crud/task.cy.ts b/apps/sensenet/cypress/e2e/content-crud/task.cy.ts index 8dcaf77f9..0c8a77d23 100644 --- a/apps/sensenet/cypress/e2e/content-crud/task.cy.ts +++ b/apps/sensenet/cypress/e2e/content-crud/task.cy.ts @@ -7,7 +7,7 @@ describe('Task', () => { cy.visit( pathWithQueryParams({ path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), - newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT/Tasks' }, + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Tasks' }, }), ) }) diff --git a/apps/sensenet/cypress/e2e/content-templates/create_delete_file.cy.ts b/apps/sensenet/cypress/e2e/content-templates/create_delete_file.cy.ts index 03091707c..91f658a33 100644 --- a/apps/sensenet/cypress/e2e/content-templates/create_delete_file.cy.ts +++ b/apps/sensenet/cypress/e2e/content-templates/create_delete_file.cy.ts @@ -10,7 +10,7 @@ describe('Create/Delete content', () => { }) it('Creating a new file should work properly', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').click() + cy.get('[data-test="menu-item-sample-workspace"]').click() cy.get('[data-test="menu-item-document-library"]').click({ force: true }) cy.get('[data-test="add-button"]').click() cy.get('[data-test="listitem-file"]') @@ -25,9 +25,9 @@ describe('Create/Delete content', () => { it('File should be edited', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').click() + cy.get('[data-test="menu-item-sample-workspace"]').click() cy.get('[data-test="menu-item-document-library"]').click({ force: true }) - cy.get(`[data-test="table-cell-${fileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick() + cy.get(`[data-test="table-cell-${fileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick({ force: true }) cy.get('[data-test="content-context-menu-edit"]') .click() .then(() => { @@ -44,9 +44,9 @@ describe('Create/Delete content', () => { it('File delete should work properly', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').click() + cy.get('[data-test="menu-item-sample-workspace"]').click({ force: true }) cy.get('[data-test="menu-item-document-library"]').click({ force: true }) - cy.get(`[data-test="table-cell-${newFileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick() + cy.get(`[data-test="table-cell-${newFileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick({ force: true }) cy.get('[data-test="content-context-menu-delete"]') .click() .then(() => { diff --git a/apps/sensenet/cypress/e2e/content-types/content-types.cy.ts b/apps/sensenet/cypress/e2e/content-types/content-types.cy.ts index 5693ec042..feb71eea6 100644 --- a/apps/sensenet/cypress/e2e/content-types/content-types.cy.ts +++ b/apps/sensenet/cypress/e2e/content-types/content-types.cy.ts @@ -37,7 +37,8 @@ describe('Content types', () => { context('create & delete', () => { it('should create a new content type', (done) => { cy.get('[data-test="add-button"]').should('not.be.disabled').click() - cy.get('[data-test="listitem-content-type"]') + cy.get('[data-test="list-items"]') + .eq(0) .click() .then(() => { cy.get('.monaco-editor textarea') @@ -121,7 +122,8 @@ describe('Content types', () => { }) it('it should insert presets', () => { cy.get('[data-test="add-button"]').should('not.be.disabled').click() - cy.get('[data-test="listitem-content-type"]') + cy.get('[data-test="list-items"]') + .eq(0) .click() .then(() => { defaultFieldSettings.forEach((field) => { diff --git a/apps/sensenet/cypress/e2e/content/create_delete_content.cy.ts b/apps/sensenet/cypress/e2e/content/create_delete_content.cy.ts index 8489ea07f..85e954ae5 100644 --- a/apps/sensenet/cypress/e2e/content/create_delete_content.cy.ts +++ b/apps/sensenet/cypress/e2e/content/create_delete_content.cy.ts @@ -9,7 +9,7 @@ describe('Create/Delete content', () => { }) it('Creating a new folder should work properly', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').click() + cy.get('[data-test="menu-item-sample-workspace"]').click() cy.get('[data-test="add-button"]').click() cy.get('[data-test="listitem-folder"]') .click() @@ -27,8 +27,8 @@ describe('Create/Delete content', () => { it('Folder delete should work properly', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').click() - cy.get(`[data-test="table-cell-${folderName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick() + cy.get('[data-test="menu-item-sample-workspace"]').click() + cy.get(`[data-test="table-cell-${folderName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick({ force: true }) cy.get('[data-test="content-context-menu-delete"]') .click() .then(() => { diff --git a/apps/sensenet/cypress/e2e/content/create_delete_file.cy.ts b/apps/sensenet/cypress/e2e/content/create_delete_file.cy.ts index 03091707c..91f658a33 100644 --- a/apps/sensenet/cypress/e2e/content/create_delete_file.cy.ts +++ b/apps/sensenet/cypress/e2e/content/create_delete_file.cy.ts @@ -10,7 +10,7 @@ describe('Create/Delete content', () => { }) it('Creating a new file should work properly', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').click() + cy.get('[data-test="menu-item-sample-workspace"]').click() cy.get('[data-test="menu-item-document-library"]').click({ force: true }) cy.get('[data-test="add-button"]').click() cy.get('[data-test="listitem-file"]') @@ -25,9 +25,9 @@ describe('Create/Delete content', () => { it('File should be edited', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').click() + cy.get('[data-test="menu-item-sample-workspace"]').click() cy.get('[data-test="menu-item-document-library"]').click({ force: true }) - cy.get(`[data-test="table-cell-${fileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick() + cy.get(`[data-test="table-cell-${fileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick({ force: true }) cy.get('[data-test="content-context-menu-edit"]') .click() .then(() => { @@ -44,9 +44,9 @@ describe('Create/Delete content', () => { it('File delete should work properly', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').click() + cy.get('[data-test="menu-item-sample-workspace"]').click({ force: true }) cy.get('[data-test="menu-item-document-library"]').click({ force: true }) - cy.get(`[data-test="table-cell-${newFileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick() + cy.get(`[data-test="table-cell-${newFileName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick({ force: true }) cy.get('[data-test="content-context-menu-delete"]') .click() .then(() => { diff --git a/apps/sensenet/cypress/e2e/content/explorer.cy.ts b/apps/sensenet/cypress/e2e/content/explorer.cy.ts index 6380f9eca..90acd9747 100644 --- a/apps/sensenet/cypress/e2e/content/explorer.cy.ts +++ b/apps/sensenet/cypress/e2e/content/explorer.cy.ts @@ -1,14 +1,14 @@ import { pathWithQueryParams } from '../../../src/services/query-string-builder' const newColumnSettings = { - settings: [ + columns: [ { field: 'DisplayName', title: 'Test Display' }, { field: 'AvailableContentTypeFields', title: 'Test' }, ], } const originalColumnSettings = { - settings: [ + columns: [ { field: 'DisplayName', title: 'Display Name' }, { field: 'AvailableContentTypeFields', title: 'Available Content Type Fields' }, ], diff --git a/apps/sensenet/cypress/e2e/context-menu/context-menu.cy.ts b/apps/sensenet/cypress/e2e/context-menu/context-menu.cy.ts index ce1b87546..1f4bcbcb6 100644 --- a/apps/sensenet/cypress/e2e/context-menu/context-menu.cy.ts +++ b/apps/sensenet/cypress/e2e/context-menu/context-menu.cy.ts @@ -11,7 +11,7 @@ describe('Grid context menu', () => { it('right-click on a content in the grid makes context-menu open', () => { cy.get('[data-test="drawer-menu-item-content"]').click() cy.checkContextMenu({ - selector: '[data-test="table-cell-it-workspace"]', + selector: '[data-test="table-cell-sample-workspace"]', contextMenuItems, clickAction: 'rightclick', }) @@ -20,7 +20,7 @@ describe('Grid context menu', () => { it('click on ... (Actions) in the grid makes context-menu open', () => { cy.get('[data-test="drawer-menu-item-content"]').click() cy.checkContextMenu({ - selector: '[data-test="actions-button-it"]', + selector: '[data-test="actions-button-sampleworkspace"]', contextMenuItems, clickAction: 'click', }) diff --git a/apps/sensenet/cypress/e2e/dashboard/dashboard.cy.ts b/apps/sensenet/cypress/e2e/dashboard/dashboard.cy.ts index 2eb238d40..bb806241c 100644 --- a/apps/sensenet/cypress/e2e/dashboard/dashboard.cy.ts +++ b/apps/sensenet/cypress/e2e/dashboard/dashboard.cy.ts @@ -16,18 +16,14 @@ describe('Dashboard', () => { }) it('Subscription section should have the Business plan text and features list', () => { - cy.get('[data-test="feature-users"]').contains(/25 users/) - cy.get('[data-test="feature-content"]').contains(/25,000 content/) - cy.get('[data-test="feature-storage-space"]').contains(/25 GB storage space/) + cy.get('[data-test="feature-users"]').should('exist') + cy.get('[data-test="feature-content"]').should('exist') + cy.get('[data-test="feature-storage-space"]').should('exist') }) it('Current usage section should have correct usage info.', () => { - cy.get('[data-test="usage-users"]').contains(/(1?[0-9]|2[0-5]) of 25 used/) - cy.get('[data-test="usage-contents"]').contains( - /([0-9]{0,4}|1[0-9],[0-9]{3}|2[0-4],[0-9]{3}|25,000) of 25,000 used/, - ) - cy.get('[data-test="usage-storage-space"]').contains( - /[0-9](.[0-9])?|1[0-9](.[0-9])?|2[0-4](.[0-9])?|25 of 25 GB used/, - ) + cy.get('[data-test="usage-users"]').should('exist') + cy.get('[data-test="usage-contents"]').should('exist') + cy.get('[data-test="usage-storage-space"]').should('exist') }) }) diff --git a/apps/sensenet/cypress/e2e/drawer/custom-menuitem.cy.ts b/apps/sensenet/cypress/e2e/drawer/custom-menuitem.cy.ts index ce590f751..dcd1f4d75 100644 --- a/apps/sensenet/cypress/e2e/drawer/custom-menuitem.cy.ts +++ b/apps/sensenet/cypress/e2e/drawer/custom-menuitem.cy.ts @@ -3,7 +3,7 @@ import { pathWithQueryParams } from '../../../src/services/query-string-builder' describe('Custom menu item', () => { beforeEach(() => { - cy.login() + cy.login('superAdmin') }) it('should create a new custom menu', () => { @@ -18,8 +18,8 @@ describe('Custom menu item', () => { icon: 'AddAlert', title: 'Test', appPath: 'test', - root: '/Root/Content/IT/Calendar', - columns: ['DisplayName'], + root: '/Root/Content/SampleWorkspace/Calendar', + columns: [{ field: 'DisplayName' }], description: 'List of tests', }, }, @@ -67,8 +67,8 @@ describe('Custom menu item', () => { icon: 'AddAlert', title: 'Test', appPath: 'test', - root: '/Root/Content/IT/Calendar', - columns: ['DisplayName', 'CreatedBy'], + root: '/Root/Content/SampleWorkspace/Calendar', + columns: [{ field: 'DisplayName' }, { field: 'CreatedBy' }], description: 'List of tests', }, }, @@ -79,7 +79,7 @@ describe('Custom menu item', () => { cy.intercept({ method: 'GET', - url: 'odata.svc/Root/Content/IT/Calendar?*', + url: 'odata.svc/Root/Content/SampleWorkspace/Calendar?*', }).as('getCalendar') cy.visit( @@ -106,7 +106,7 @@ describe('Custom menu item', () => { cy.wait('@getCalendar').then((_interception) => { settings.default.drawer.items[0].settings.columns.forEach((column) => - cy.get(`[data-test="table-header-${column.replace(/\s+/g, '-').toLowerCase()}"]`).should('exist'), + cy.get(`[data-test="table-header-${column.field?.replace(/\s+/g, '-').toLowerCase()}"]`).should('exist'), ) }) }) diff --git a/apps/sensenet/cypress/e2e/edit-content/edit-content.cy.ts b/apps/sensenet/cypress/e2e/edit-content/edit-content.cy.ts index 5c129d977..a71482ff6 100644 --- a/apps/sensenet/cypress/e2e/edit-content/edit-content.cy.ts +++ b/apps/sensenet/cypress/e2e/edit-content/edit-content.cy.ts @@ -7,17 +7,17 @@ describe('Edit Content', () => { }) it('Test case 1: edit content should work properly.', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]') + cy.get('[data-test="menu-item-sample-workspace"]') .rightclick() .then(() => { cy.get('[data-test="content-context-menu-edit"]').click() cy.get('#DisplayName').type(' Test') cy.contains('Submit').click() - cy.get(`[data-test="table-cell-it-workspace-test"]`).should('have.text', 'IT Workspace Test') + cy.get(`[data-test="table-cell-sample-workspace-test"]`).should('have.text', 'Sample Workspace Test') // breadcrumb test - const expectedBreadcrumbItems = ['Content', '/', 'IT Workspace Test'] + const expectedBreadcrumbItems = ['Content', '/', 'Sample Workspace Test'] cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace-test"]').click() + cy.get('[data-test="menu-item-sample-workspace-test"]').click() cy.get('nav[aria-label="breadcrumb"] li').each(($el) => { expect(expectedBreadcrumbItems).to.include($el.text()) }) @@ -25,17 +25,17 @@ describe('Edit Content', () => { }) it('Test case 2: edit content should work properly.', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace-test"]') - .rightclick() + cy.get('[data-test="menu-item-sample-workspace-test"]') + .rightclick({ force: true }) .then(() => { cy.get('[data-test="content-context-menu-edit"]').click() - cy.get('#DisplayName').type('{selectall}IT Workspace') + cy.get('#DisplayName').type('{selectall}Sample Workspace') cy.contains('Submit') .click() .then(() => { - const expectedBreadcrumbItems = ['Content', '/', 'IT Workspace'] + const expectedBreadcrumbItems = ['Content', '/', 'Sample Workspace'] cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').click() + cy.get('[data-test="menu-item-sample-workspace"]').click() cy.get('nav[aria-label="breadcrumb"] li').each(($el) => { expect(expectedBreadcrumbItems).to.include($el.text()) }) diff --git a/apps/sensenet/cypress/e2e/groups/groups.cy.ts b/apps/sensenet/cypress/e2e/groups/groups.cy.ts index ae366615b..8df009d91 100644 --- a/apps/sensenet/cypress/e2e/groups/groups.cy.ts +++ b/apps/sensenet/cypress/e2e/groups/groups.cy.ts @@ -1,11 +1,16 @@ +import { PATHS, resolvePathParams } from '../../../src/application-paths' import { pathWithQueryParams } from '../../../src/services/query-string-builder' const contextMenuItems = ['browse', 'copyto', 'edit', 'moveto', 'delete'] describe('Groups', () => { before(() => { cy.login() - cy.visit(pathWithQueryParams({ path: '/', newParams: { repoUrl: Cypress.env('repoUrl') } })) - cy.get('[data-test="drawer-menu-item-users-and-groups"]').click() + cy.visit( + pathWithQueryParams({ + path: resolvePathParams({ path: PATHS.usersAndGroups.appPath, params: { browseType: 'explorer' } }), + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/Public' }, + }), + ) cy.get('[data-test="groups"]').click() }) it('Groups list should have the appropriate data', () => { @@ -79,7 +84,13 @@ describe('Groups', () => { it('ensures that we can add a new member to a group', () => { const expectedSuggestions = ['Developers', 'Developer Dog'] - cy.get('[data-test="drawer-menu-item-users-and-groups"]').click() + cy.visit( + pathWithQueryParams({ + path: resolvePathParams({ path: PATHS.usersAndGroups.appPath, params: { browseType: 'explorer' } }), + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/Public' }, + }), + ) + cy.get('[data-test="groups"]').click() cy.get('[data-test="administrators-members"]').click() diff --git a/apps/sensenet/cypress/e2e/organizational-unit.cy.ts b/apps/sensenet/cypress/e2e/organizational-unit.cy.ts index 577115fe6..239c6c7f6 100644 --- a/apps/sensenet/cypress/e2e/organizational-unit.cy.ts +++ b/apps/sensenet/cypress/e2e/organizational-unit.cy.ts @@ -14,6 +14,12 @@ describe('Organizational units', () => { it('ensure that creating a new org unit works as it is expected', () => { cy.get('[data-test="add-button"]').should('not.be.disabled').click() + + cy.get('[data-test="listitem-domain"]').click() + cy.get('[data-test="menu-item-public"]').click() + + cy.get('[data-test="add-button"]').should('not.be.disabled').click() + cy.get('[data-test="listitem-organizational-unit"]') .click() .then(() => { @@ -26,6 +32,8 @@ describe('Organizational units', () => { }) it('ensure that organizational units build a tree', () => { + cy.get('[data-test="menu-item-public"]').click() + cy.get(`[data-test="menu-item-test1"]`).click() cy.get('[data-test="add-button"]').should('not.be.disabled').click() @@ -49,6 +57,7 @@ describe('Organizational units', () => { }) it('ensure that organizational units tree is deletable', () => { + cy.get('[data-test="menu-item-public"]').click() cy.get(`[data-test="menu-item-test1"]`).click().rightclick() cy.get('[data-test="content-context-menu-delete"]').click() diff --git a/apps/sensenet/cypress/e2e/permission-editor/add_new_permission.cy.ts b/apps/sensenet/cypress/e2e/permission-editor/add_new_permission.cy.ts index 34b59055d..2061eeb42 100644 --- a/apps/sensenet/cypress/e2e/permission-editor/add_new_permission.cy.ts +++ b/apps/sensenet/cypress/e2e/permission-editor/add_new_permission.cy.ts @@ -14,11 +14,11 @@ describe('Add new permission entry', () => { cy.get('[data-test="assign-new-permission"]').click() cy.get('[data-test="member-select-dialog"]').should('contain.text', 'New permission entry') - cy.get('[data-test="reference-input"]').type('Developer D') - cy.get('[data-test="suggestion-developer-dog"]').click() + cy.get('[data-test="reference-input"]').type('developers') + cy.get('[data-test="suggestion-developers"]').eq(0).click() cy.get('[data-test="member-select-add"]').click({ force: true }) cy.get('[data-test="set-on-this-developer-dog"]').should('exist') - cy.get('[data-test="permission-dialog-title"]').should('contain.text', 'Developer Dog') + cy.get('[data-test="permission-dialog-title"]').should('contain.text', 'Developer') cy.get('[data-test="permission-editor-cancel"]').click() cy.get('[data-test="set-on-this-developer-dog"]').should('not.exist') cy.get('[data-test="permission-dialog-title"]').should('not.exist') diff --git a/apps/sensenet/cypress/e2e/permission-editor/local-only.cy.ts b/apps/sensenet/cypress/e2e/permission-editor/local-only.cy.ts index 6cec28df5..a866c276f 100644 --- a/apps/sensenet/cypress/e2e/permission-editor/local-only.cy.ts +++ b/apps/sensenet/cypress/e2e/permission-editor/local-only.cy.ts @@ -8,24 +8,24 @@ describe('LocalOnly permission setting', () => { it('creates a new permsission entry', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').rightclick() + cy.get('[data-test="menu-item-sample-workspace"]').rightclick() cy.get('[data-test="content-context-menu-setpermissions"]').click() - cy.get('[data-test="set-on-this-visitors"]').click() - cy.get('[data-test="switcher-see"]').should('be.visible') - cy.get('[data-test="switcher-full-access"]').should('be.visible').click() + cy.get('[data-test="set-on-this-developer-dog"]').click() + cy.get('[data-test="permission-item-see"]').should('be.visible') cy.get('[data-test="switcher-full-access"]').should('be.visible').click() cy.get('[data-test="switcher-local-only"]').should('be.visible').click() - cy.get('[data-test="switcher-see"]').should('be.visible').click() + cy.get('[data-test="permission-item-see"]').should('be.visible').click() cy.get('[data-test="permission-editor-submit"]').click() - cy.get('[data-test="set-on-this-visitors"]').should('exist') - cy.get('[data-test="set-on-this-visitors-local-only"]').should('exist') + cy.get('[data-test="set-on-this-developer-dog"]').should('exist') + cy.get('[data-test="set-on-this-developer-dog-local-only"]').should('exist') }) it('reverting removes the localonly entry from the list', () => { - cy.get('[data-test="set-on-this-visitors-local-only"]').click() - cy.get('[data-test="switcher-see"]').should('be.visible').click() + cy.get('[data-test="set-on-this-developer-dog-local-only"]').click() + cy.get('[data-test="permission-item-see"]').find('[data-test="undefined"]').should('be.visible').click() + cy.get('[data-test="switcher-local-only"]').should('be.visible') cy.get('[data-test="permission-editor-submit"]').click() - cy.get('[data-test="set-on-this-visitors"]').should('exist') - cy.get('[data-test="set-on-this-visitors-local-only"]').should('not.exist') + cy.get('[data-test="set-on-this-developer-dog"]').should('exist') + cy.get('[data-test="set-on-this-developer-dog-local-only"]').should('not.exist') }) }) diff --git a/apps/sensenet/cypress/e2e/permission-editor/main_page_links.cy.ts b/apps/sensenet/cypress/e2e/permission-editor/main_page_links.cy.ts index 3e2ef3fa1..54e3cb6ab 100644 --- a/apps/sensenet/cypress/e2e/permission-editor/main_page_links.cy.ts +++ b/apps/sensenet/cypress/e2e/permission-editor/main_page_links.cy.ts @@ -10,7 +10,7 @@ describe('Permission editor main page links', () => { cy.login() cy.visit(pathWithQueryParams({ path: '/', newParams: { repoUrl: Cypress.env('repoUrl') } })) cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').rightclick() + cy.get('[data-test="menu-item-sample-workspace"]').rightclick() cy.get('[data-test="content-context-menu-setpermissions"]').click() }) diff --git a/apps/sensenet/cypress/e2e/permission-editor/main_page_lists.cy.ts b/apps/sensenet/cypress/e2e/permission-editor/main_page_lists.cy.ts index 1823be07e..60644fe0d 100644 --- a/apps/sensenet/cypress/e2e/permission-editor/main_page_lists.cy.ts +++ b/apps/sensenet/cypress/e2e/permission-editor/main_page_lists.cy.ts @@ -1,7 +1,7 @@ import { pathWithQueryParams } from '../../../src/services/query-string-builder' -const inheritedItems = ['Administrators', 'Developers', 'Editors'] -const setOnThisItems = ['Members', 'Owners', 'Visitors'] +const inheritedItems = ['Developers', 'Editors'] +const setOnThisItems = ['Administrators'] describe('Permission editor main page lists', () => { before(() => { cy.login() @@ -11,10 +11,10 @@ describe('Permission editor main page lists', () => { it('appears from the context-menu', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').rightclick() + cy.get('[data-test="menu-item-sample-workspace"]').rightclick() cy.get('[data-test="content-context-menu-setpermissions"]').click() cy.get('[data-test="permission-view-title-first"]').should('have.text', 'Set permissions for ') - cy.get('[data-test="permission-view-title-second"]').should('have.text', 'IT Workspace') + cy.get('[data-test="permission-view-title-second"]').should('have.text', 'Sample workspace') }) it('Inherited from ancestor list has the expected child items', () => { diff --git a/apps/sensenet/cypress/e2e/permission-editor/public_private_content.cy.ts b/apps/sensenet/cypress/e2e/permission-editor/public_private_content.cy.ts index a342e65ff..0e5b61f6c 100644 --- a/apps/sensenet/cypress/e2e/permission-editor/public_private_content.cy.ts +++ b/apps/sensenet/cypress/e2e/permission-editor/public_private_content.cy.ts @@ -1,14 +1,20 @@ +import { PATHS, resolvePathParams } from '../../../src/application-paths' import { pathWithQueryParams } from '../../../src/services/query-string-builder' describe('Permission editor - public/private content', () => { before(() => { cy.login() - cy.visit(pathWithQueryParams({ path: '/', newParams: { repoUrl: Cypress.env('repoUrl') } })) + cy.visit( + pathWithQueryParams({ + path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Blog' }, + }), + ) }) it('Make content public should work properly', () => { - cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').rightclick() + cy.get('[data-test="menu-item-blog"]').rightclick({ force: true }) + cy.get('[data-test="content-context-menu-setpermissions"]').click() cy.get('[data-test="make-content-public-or-private"]').click() diff --git a/apps/sensenet/cypress/e2e/shared/user.cy.ts b/apps/sensenet/cypress/e2e/shared/user.cy.ts index 7e6564ba4..0f4ea0bdb 100644 --- a/apps/sensenet/cypress/e2e/shared/user.cy.ts +++ b/apps/sensenet/cypress/e2e/shared/user.cy.ts @@ -6,8 +6,6 @@ describe('User handling', () => { it('should login with test user', () => { cy.visit('/') cy.get('input[name="repository"]').type(`${Cypress.env('repoUrl')}{enter}`) - - cy.get('[data-test="demo-button"]').click() }) it('should logout', () => { diff --git a/apps/sensenet/cypress/e2e/task-list/task-list.cy.ts b/apps/sensenet/cypress/e2e/task-list/task-list.cy.ts index b62122906..e5a6a2b92 100644 --- a/apps/sensenet/cypress/e2e/task-list/task-list.cy.ts +++ b/apps/sensenet/cypress/e2e/task-list/task-list.cy.ts @@ -9,7 +9,7 @@ describe('Task-List', () => { }) it('Task should be created', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').click() + cy.get('[data-test="menu-item-sample-workspace"]').click() cy.get('[data-test="add-button"]').click() cy.get('[data-test="listitem-task-list"]') .click() @@ -20,7 +20,7 @@ describe('Task-List', () => { cy.get(`[data-test="table-cell-${taskName.replace(/\s+/g, '-').toLowerCase()}"]`).should('have.text', taskName) cy.get('[data-test="snackbar-close"]').click() - cy.get(`[data-test="table-cell-${taskName.replace(/\s+/g, '-').toLowerCase()}"]`).dblclick() + cy.get(`[data-test="table-cell-${taskName.replace(/\s+/g, '-').toLowerCase()}"]`).dblclick({ force: true }) cy.checkAddItemList(['Task']) }) @@ -30,8 +30,8 @@ describe('Task-List', () => { it('Task should be edited', () => { const newTaskName = `${taskName}-edited` cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').click() - cy.get(`[data-test="table-cell-${taskName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick() + cy.get('[data-test="menu-item-sample-workspace"]').click() + cy.get(`[data-test="table-cell-${taskName.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick({ force: true }) cy.get('[data-test="content-context-menu-edit"]') .click() .then(() => { @@ -49,8 +49,8 @@ describe('Task-List', () => { it('Task should be deleted', () => { const taskToBeDeleted = `${taskName}-edited` cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').click() - cy.get(`[data-test="table-cell-${taskToBeDeleted.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick() + cy.get('[data-test="menu-item-sample-workspace"]').click({ force: true }) + cy.get(`[data-test="table-cell-${taskToBeDeleted.replace(/\s+/g, '-').toLowerCase()}"]`).rightclick({ force: true }) cy.get('[data-test="content-context-menu-delete"]') .click() .then(() => { diff --git a/apps/sensenet/cypress/e2e/trash/trash.cy.ts b/apps/sensenet/cypress/e2e/trash/trash.cy.ts index e59582f00..659209ddc 100644 --- a/apps/sensenet/cypress/e2e/trash/trash.cy.ts +++ b/apps/sensenet/cypress/e2e/trash/trash.cy.ts @@ -14,7 +14,7 @@ describe('Trash', () => { }), ) - cy.get('[data-test="menu-item-it-workspace"]').click() + cy.get('[data-test="menu-item-sample-workspace"]').click() cy.get('[data-test="menu-item-document-library"]').click({ force: true }) cy.get('[data-test="add-button"]').click() cy.get('[data-test="listitem-folder"]') @@ -25,7 +25,7 @@ describe('Trash', () => { cy.contains('Submit').click() cy.get(`[data-test="table-cell-test"]`) - .rightclick() + .rightclick({ force: true }) .then(() => { cy.get('[data-test="content-context-menu-delete"]').click() cy.get('[data-test="button-delete-confirm"]').click() @@ -74,12 +74,12 @@ describe('Trash', () => { cy.visit( pathWithQueryParams({ path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), - newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT/Document_Library' }, + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Document_Library' }, }), ) cy.get(`[data-test="table-cell-test"]`) - .rightclick() + .rightclick({ force: true }) .then(() => { cy.get('[data-test="content-context-menu-delete"]').click() cy.get('[data-test="delete-permanently"] input[type="checkbox"]').check() diff --git a/apps/sensenet/cypress/e2e/tree/tree.cy.ts b/apps/sensenet/cypress/e2e/tree/tree.cy.ts index 6d84ff6a9..818564ef3 100644 --- a/apps/sensenet/cypress/e2e/tree/tree.cy.ts +++ b/apps/sensenet/cypress/e2e/tree/tree.cy.ts @@ -9,7 +9,7 @@ describe('Tree', () => { }) it('Tree item should open with the list of its children.', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]') + cy.get('[data-test="menu-item-sample-workspace"]') .click() .then(() => { items.forEach(($el) => { @@ -19,10 +19,10 @@ describe('Tree', () => { }) it('Click on the Tree item when it is open should close it and make its children invisible.', () => { cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]') + cy.get('[data-test="menu-item-sample-workspace"]') .click() .then(() => { - cy.get('[data-test="menu-item-it-workspace"]') + cy.get('[data-test="menu-item-sample-workspace"]') .click() .then(() => { items.forEach(($el) => { @@ -36,7 +36,7 @@ describe('Tree', () => { const contextMenuItems = ['Details', 'Copy to', 'Edit', 'Move to', 'Versions', 'Share', 'Delete', 'Set permissions'] cy.get('[data-test="drawer-menu-item-content"]').click() cy.checkContextMenu({ - selector: '[data-test="menu-item-it-workspace"]', + selector: '[data-test="menu-item-sample-workspace"]', contextMenuItems, clickAction: 'rightclick', }) diff --git a/apps/sensenet/cypress/e2e/ui/addNewMenu.cy.ts b/apps/sensenet/cypress/e2e/ui/addNewMenu.cy.ts index 9e57db1c0..fc0cf7e2f 100644 --- a/apps/sensenet/cypress/e2e/ui/addNewMenu.cy.ts +++ b/apps/sensenet/cypress/e2e/ui/addNewMenu.cy.ts @@ -17,7 +17,9 @@ describe('AddNew Menu', () => { 'Task list', 'Custom List', 'Workspace', - 'Demo Workspace', + 'Upload', + 'File', + 'Image', ] cy.get('[data-test="drawer-menu-item-content"]').click() diff --git a/apps/sensenet/cypress/e2e/ui/batchOperations.cy.ts b/apps/sensenet/cypress/e2e/ui/batchOperations.cy.ts index 3d6d553b8..63f916ac3 100644 --- a/apps/sensenet/cypress/e2e/ui/batchOperations.cy.ts +++ b/apps/sensenet/cypress/e2e/ui/batchOperations.cy.ts @@ -5,59 +5,83 @@ describe('Batch operations: ', () => { beforeEach(() => { cy.login() cy.visit(pathWithQueryParams({ path: '/', newParams: { repoUrl: Cypress.env('repoUrl') } })) + }) + + it('multiple content copy works as it is intended', () => { cy.visit( pathWithQueryParams({ path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), - newParams: { repoUrl: Cypress.env('repoUrl'), path: '/Marketing/Document_Library' }, + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Document_Library' }, }), ) + + cy.get('[data-test="table-row-selection-control-dinnerscookbook.pdf"]').click({ force: true }) + cy.get('[data-test="table-row-selection-control-hello_world.docx"]') + .find('input[type="checkbox"]') + .check({ force: true }) + cy.get('[data-test="batch-copy"]').click() + cy.get('[data-test="picker-checkbox-item-books"]').click() + cy.get('[data-test="picker-submit"]').click() + cy.get('[data-test="snackbar-message"]').should('contain.text', '2 items has been copied to') + cy.get('[data-test="table-cell-dinnerscookbook.pdf"]').should('exist') + cy.get('[data-test="table-cell-hello_world.docx"]').should('exist') + cy.get('[data-test="menu-item-books"]').click({ force: true }) + cy.get('[data-test="table-cell-dinnerscookbook.pdf"]').should('exist') + cy.get('[data-test="table-cell-hello_world.docx"]').should('exist') }) it('multiple content delete works as it is intended', () => { - cy.get('[data-test="menu-item-chicago"]').click({ force: true }) - cy.get('[data-test="table-row-selection-control-100pages.docx"]').click({ force: true }) - cy.get('[data-test="table-row-selection-control-100pages.pdf"]') + cy.visit( + pathWithQueryParams({ + path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Document_Library/books' }, + }), + ) + + cy.get('[data-test="table-row-selection-control-dinnerscookbook.pdf"]').click({ force: true }) + cy.get('[data-test="table-row-selection-control-hello_world.docx"]') .find('input[type="checkbox"]') .check({ force: true }) cy.get('[data-test="batch-delete"]').click() cy.get('[data-test="delete-permanently"] input[type="checkbox"]').check() cy.get('[data-test="button-delete-confirm"]').click() - cy.get('[data-test="table-cell-100pages.docx"]').should('not.exist') - cy.get('[data-test="table-cell-100pages.pdf"]').should('not.exist') + cy.get('[data-test="table-cell-dinnerscookbook.pdf"]').should('not.exist') + cy.get('[data-test="table-cell-hello_world.docx"]').should('not.exist') }) it('multiple content move works as it is intended', () => { - cy.get('[data-test="menu-item-munich"]').click({ force: true }) - cy.get('[data-test="table-row-selection-control-100pages.docx"]').click({ force: true }) - cy.get('[data-test="table-row-selection-control-100pages.pdf"]') + cy.visit( + pathWithQueryParams({ + path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Document_Library' }, + }), + ) + + cy.get('[data-test="table-row-selection-control-dinnerscookbook.pdf"]').click({ force: true }) + cy.get('[data-test="table-row-selection-control-hello_world.docx"]') .find('input[type="checkbox"]') .check({ force: true }) cy.get('[data-test="batch-move"]').click() - cy.get('[data-test="picker-up"]').dblclick() - cy.get('[data-test="picker-checkbox-item-chicago"]').click() + cy.get('[data-test="picker-checkbox-item-books"]').click() cy.get('[data-test="picker-submit"]').click() - cy.get('[data-test="snackbar-message"]').should('have.text', '2 items has been moved to Chicago') - cy.get('[data-test="table-cell-100pages.docx"]').should('not.exist') - cy.get('[data-test="table-cell-100pages.pdf"]').should('not.exist') - cy.get('[data-test="menu-item-chicago"]').click({ force: true }) - cy.get('[data-test="table-cell-100pages.docx"]').should('exist') - cy.get('[data-test="table-cell-100pages.pdf"]').should('exist') - }) - it('multiple content copy works as it is intended', () => { - cy.get('[data-test="menu-item-chicago"]').click({ force: true }) - cy.get('[data-test="table-row-selection-control-100pages.docx"]').click({ force: true }) - cy.get('[data-test="table-row-selection-control-100pages.pdf"]') + cy.get('[data-test="snackbar-message"]').should('contain.text', '2 items has been moved to') + cy.get('[data-test="table-cell-dinnerscookbook.pdf"]').should('not.exist') + cy.get('[data-test="table-cell-hello_world.docx"]').should('not.exist') + cy.get('[data-test="menu-item-books"]').click({ force: true }) + cy.get('[data-test="table-cell-dinnerscookbook.pdf"]').should('exist') + cy.get('[data-test="table-cell-hello_world.docx"]').should('exist') + + //put it back + + cy.get('[data-test="table-row-selection-control-dinnerscookbook.pdf"]').click({ force: true }) + cy.get('[data-test="table-row-selection-control-hello_world.docx"]') .find('input[type="checkbox"]') .check({ force: true }) - cy.get('[data-test="batch-copy"]').click() + cy.get('[data-test="batch-move"]').click() cy.get('[data-test="picker-up"]').dblclick() - cy.get('[data-test="picker-checkbox-item-munich"]').click() cy.get('[data-test="picker-submit"]').click() - cy.get('[data-test="snackbar-message"]').should('have.text', '2 items has been copied to Munich') - cy.get('[data-test="table-cell-100pages.docx"]').should('exist') - cy.get('[data-test="table-cell-100pages.pdf"]').should('exist') - cy.get('[data-test="menu-item-munich"]').click({ force: true }) - cy.get('[data-test="table-cell-100pages.docx"]').should('exist') - cy.get('[data-test="table-cell-100pages.pdf"]').should('exist') + cy.get('[data-test="snackbar-message"]').should('contain.text', '2 items has been moved to') + cy.get('[data-test="table-cell-dinnerscookbook.pdf"]').should('not.exist') + cy.get('[data-test="table-cell-hello_world.docx"]').should('not.exist') }) }) diff --git a/apps/sensenet/cypress/e2e/upload/upload.cy.ts b/apps/sensenet/cypress/e2e/upload/upload.cy.ts index 2a1a05750..d41e60097 100644 --- a/apps/sensenet/cypress/e2e/upload/upload.cy.ts +++ b/apps/sensenet/cypress/e2e/upload/upload.cy.ts @@ -9,7 +9,7 @@ describe('Upload', () => { it('uploading a file/content should works properly', () => { const fileToBeUploaded = 'data.json' cy.get('[data-test="drawer-menu-item-content"]').click() - cy.get('[data-test="menu-item-it-workspace"]').click() + cy.get('[data-test="menu-item-sample-workspace"]').click() cy.get('[data-test="menu-item-document-library"]').click({ force: true }) cy.get('[data-test="add-button"]') .click() diff --git a/apps/sensenet/cypress/e2e/users/user_enabled_field.cy.ts b/apps/sensenet/cypress/e2e/users/user_enabled_field.cy.ts index a25a3de97..b7c808c5e 100644 --- a/apps/sensenet/cypress/e2e/users/user_enabled_field.cy.ts +++ b/apps/sensenet/cypress/e2e/users/user_enabled_field.cy.ts @@ -1,12 +1,17 @@ +import { PATHS, resolvePathParams } from '../../../src/application-paths' import { pathWithQueryParams } from '../../../src/services/query-string-builder' describe('Users enabled field', () => { before(() => { cy.login() - cy.visit(pathWithQueryParams({ path: '/', newParams: { repoUrl: Cypress.env('repoUrl') } })) + cy.visit( + pathWithQueryParams({ + path: resolvePathParams({ path: PATHS.usersAndGroups.appPath, params: { browseType: 'explorer' } }), + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/Public' }, + }), + ) }) it('Disabled state should work properly', () => { - cy.get('[data-test="drawer-menu-item-users-and-groups"]').click() cy.get('[data-test="switcher-developer-dog"]').click() cy.get('[data-test="table-cell-developer-dog"]').dblclick() cy.get('[data-test="viewtitle"]').should('be.visible') @@ -14,7 +19,6 @@ describe('Users enabled field', () => { cy.get('[data-test="cancel"]').click() }) it('Enabled state should work properly', () => { - cy.get('[data-test="drawer-menu-item-users-and-groups"]').click() cy.get('[data-test="switcher-developer-dog"]').click() cy.get('[data-test="table-cell-developer-dog"]').dblclick() cy.get('[data-test="viewtitle"]').should('be.visible') diff --git a/apps/sensenet/cypress/e2e/versioning/version-history.cy.ts b/apps/sensenet/cypress/e2e/versioning/version-history.cy.ts index 2e77dbbf1..d4ccf5229 100644 --- a/apps/sensenet/cypress/e2e/versioning/version-history.cy.ts +++ b/apps/sensenet/cypress/e2e/versioning/version-history.cy.ts @@ -7,7 +7,7 @@ describe('version history', () => { cy.visit( pathWithQueryParams({ path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), - newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT/Document_Library' }, + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Document_Library' }, }), ) cy.get('[data-test="menu-item-memos"]').click({ force: true }) @@ -18,7 +18,7 @@ describe('version history', () => { cy.visit( pathWithQueryParams({ path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), - newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT/Document_Library' }, + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Document_Library' }, }), ) cy.get('[data-test="menu-item-memos"]').rightclick({ force: true }) @@ -70,7 +70,7 @@ describe('version history', () => { cy.visit( pathWithQueryParams({ path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }), - newParams: { repoUrl: Cypress.env('repoUrl'), path: '/IT/Document_Library' }, + newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Document_Library' }, }), ) cy.get('[data-test="menu-item-memos"]').rightclick({ force: true }) diff --git a/apps/sensenet/package.json b/apps/sensenet/package.json index b5171d4f6..21973eb35 100644 --- a/apps/sensenet/package.json +++ b/apps/sensenet/package.json @@ -1,6 +1,6 @@ { "name": "@app/sensenet", - "version": "1.26.0", + "version": "2.0.0", "main": "dist/index.js", "files": [ "dist", @@ -89,14 +89,14 @@ "@material-ui/lab": "4.0.0-alpha.58", "@material-ui/pickers": "^3.3.10", "@sensenet/authentication-oidc-react": "^2.3.1", - "@sensenet/client-core": "^4.0.2", - "@sensenet/client-utils": "^2.2.0", - "@sensenet/controls-react": "^9.0.0", - "@sensenet/default-content-types": "^5.0.0", + "@sensenet/client-core": "^4.1.0", + "@sensenet/client-utils": "^2.3.0", + "@sensenet/controls-react": "^9.1.0", + "@sensenet/default-content-types": "^5.1.0", "@sensenet/document-viewer-react": "^4.2.3", "@sensenet/editor-react": "^0.3.2", "@sensenet/hooks-react": "^1.6.3", - "@sensenet/list-controls-react": "^2.1.2", + "@sensenet/list-controls-react": "^2.2.0", "@sensenet/pickers-react": "^2.1.4", "@sensenet/query": "^2.1.3", "@sensenet/repository-events": "^2.1.3", diff --git a/apps/sensenet/src/components/dialogs/permission-editor-dialog.tsx b/apps/sensenet/src/components/dialogs/permission-editor-dialog.tsx index 6360a3cdf..a2bcb4c4d 100644 --- a/apps/sensenet/src/components/dialogs/permission-editor-dialog.tsx +++ b/apps/sensenet/src/components/dialogs/permission-editor-dialog.tsx @@ -374,7 +374,7 @@ export function PermissionEditorDialog(props: PermissionEditorDialogProps) { }), )} - + (http://sensenet.com/)", "license": "GPL-2.0", @@ -35,7 +35,7 @@ "dependencies": { "@material-ui/core": "~4.11.4", "@sensenet/authentication-oidc-react": "^2.3.1", - "@sensenet/client-core": "^4.0.2", + "@sensenet/client-core": "^4.1.0", "@sensenet/hooks-react": "^1.6.3" }, "browserslist": { diff --git a/examples/sn-react-usersearch/package.json b/examples/sn-react-usersearch/package.json index 11c35f3ee..77afca99b 100644 --- a/examples/sn-react-usersearch/package.json +++ b/examples/sn-react-usersearch/package.json @@ -39,9 +39,9 @@ "@material-ui/core": "~4.11.4", "@material-ui/icons": "^4.11.3", "@sensenet/authentication-oidc-react": "^2.3.1", - "@sensenet/client-core": "^4.0.2", - "@sensenet/controls-react": "^9.0.0", - "@sensenet/default-content-types": "^5.0.0", + "@sensenet/client-core": "^4.1.0", + "@sensenet/controls-react": "^9.1.0", + "@sensenet/default-content-types": "^5.1.0", "@sensenet/hooks-react": "^1.6.3", "@sensenet/icons-react": "^2.1.1", "@sensenet/query": "^2.1.3", diff --git a/package.json b/package.json index 1eec8a69f..51ccda10f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "2023.01.0", + "version": "2023.06.0", "workspaces": [ "packages/*", "examples/*", diff --git a/packages/gatsby-source-sensenet/package.json b/packages/gatsby-source-sensenet/package.json index 38d31301e..c7564f067 100644 --- a/packages/gatsby-source-sensenet/package.json +++ b/packages/gatsby-source-sensenet/package.json @@ -20,8 +20,8 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.18.9", - "@sensenet/client-core": "^4.0.2", - "@sensenet/default-content-types": "^5.0.0", + "@sensenet/client-core": "^4.1.0", + "@sensenet/default-content-types": "^5.1.0", "gatsby": "^4.19.2", "node-fetch": "^3.2.9", "tslib": "^2.4.0" diff --git a/packages/sn-authentication-jwt/package.json b/packages/sn-authentication-jwt/package.json index 7b15ae7ef..28748b7f1 100644 --- a/packages/sn-authentication-jwt/package.json +++ b/packages/sn-authentication-jwt/package.json @@ -35,9 +35,9 @@ }, "homepage": "https://sensenet.com", "dependencies": { - "@sensenet/client-core": "^4.0.2", - "@sensenet/client-utils": "^2.2.0", - "@sensenet/default-content-types": "^5.0.0", + "@sensenet/client-core": "^4.1.0", + "@sensenet/client-utils": "^2.3.0", + "@sensenet/default-content-types": "^5.1.0", "semaphore-async-await": "^1.5.1", "tslib": "^2.4.0" }, diff --git a/packages/sn-client-auth-google/package.json b/packages/sn-client-auth-google/package.json index 19908f222..54f397904 100644 --- a/packages/sn-client-auth-google/package.json +++ b/packages/sn-client-auth-google/package.json @@ -36,7 +36,7 @@ "homepage": "https://sensenet.com", "dependencies": { "@sensenet/authentication-jwt": "^1.1.4", - "@sensenet/client-utils": "^2.2.0", + "@sensenet/client-utils": "^2.3.0", "tslib": "^2.4.0" }, "devDependencies": { diff --git a/packages/sn-client-core/package.json b/packages/sn-client-core/package.json index a733a94db..8df6b6444 100644 --- a/packages/sn-client-core/package.json +++ b/packages/sn-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@sensenet/client-core", - "version": "4.0.2", + "version": "4.1.0", "description": "Core Client package for sensenet", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -39,8 +39,8 @@ "homepage": "https://sensenet.com", "dependencies": { "@babel/runtime": "^7.18.9", - "@sensenet/client-utils": "^2.2.0", - "@sensenet/default-content-types": "^5.0.0", + "@sensenet/client-utils": "^2.3.0", + "@sensenet/default-content-types": "^5.1.0", "@sensenet/query": "^2.1.3", "semaphore-async-await": "^1.5.1", "tslib": "^2.4.0", diff --git a/packages/sn-client-utils/package.json b/packages/sn-client-utils/package.json index b7be3da67..c52a7391a 100644 --- a/packages/sn-client-utils/package.json +++ b/packages/sn-client-utils/package.json @@ -1,6 +1,6 @@ { "name": "@sensenet/client-utils", - "version": "2.2.0", + "version": "2.3.0", "description": "General sensenet independent client side utilities", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", diff --git a/packages/sn-control-mapper/package.json b/packages/sn-control-mapper/package.json index 4dc35882c..dfe6647a3 100644 --- a/packages/sn-control-mapper/package.json +++ b/packages/sn-control-mapper/package.json @@ -1,6 +1,6 @@ { "name": "@sensenet/control-mapper", - "version": "3.1.4", + "version": "3.2.0", "description": "Control mapping utility for sensenet", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -47,8 +47,8 @@ "homepage": "https://sensenet.com", "dependencies": { "@babel/runtime": "^7.18.9", - "@sensenet/client-core": "^4.0.2", - "@sensenet/default-content-types": "^5.0.0", + "@sensenet/client-core": "^4.1.0", + "@sensenet/default-content-types": "^5.1.0", "tslib": "^2.4.0" }, "devDependencies": { diff --git a/packages/sn-controls-react/package.json b/packages/sn-controls-react/package.json index d10e5de8d..83ce26abd 100644 --- a/packages/sn-controls-react/package.json +++ b/packages/sn-controls-react/package.json @@ -1,6 +1,6 @@ { "name": "@sensenet/controls-react", - "version": "9.0.0", + "version": "9.1.0", "description": "React controls for sensenet", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -52,10 +52,10 @@ "@date-io/core": "^1.3.13", "@date-io/date-fns": "1.3.13", "@material-ui/pickers": "^3.3.10", - "@sensenet/client-core": "^4.0.2", - "@sensenet/client-utils": "^2.2.0", - "@sensenet/control-mapper": "^3.1.4", - "@sensenet/default-content-types": "^5.0.0", + "@sensenet/client-core": "^4.1.0", + "@sensenet/client-utils": "^2.3.0", + "@sensenet/control-mapper": "^3.2.0", + "@sensenet/default-content-types": "^5.1.0", "@sensenet/editor-react": "^0.3.2", "@sensenet/hooks-react": "^1.6.3", "@sensenet/pickers-react": "^2.1.4", diff --git a/packages/sn-default-content-types/package.json b/packages/sn-default-content-types/package.json index a05105713..f77b03b7d 100644 --- a/packages/sn-default-content-types/package.json +++ b/packages/sn-default-content-types/package.json @@ -1,6 +1,6 @@ { "name": "@sensenet/default-content-types", - "version": "5.0.0", + "version": "5.1.0", "description": "Default content type definitions for sensenet", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", diff --git a/packages/sn-document-viewer-react/package.json b/packages/sn-document-viewer-react/package.json index a3c4f7be7..792574f9b 100644 --- a/packages/sn-document-viewer-react/package.json +++ b/packages/sn-document-viewer-react/package.json @@ -44,9 +44,9 @@ "dependencies": { "@babel/runtime": "^7.18.9", "@material-ui/icons": "^4.11.3", - "@sensenet/client-core": "^4.0.2", - "@sensenet/client-utils": "^2.2.0", - "@sensenet/default-content-types": "^5.0.0", + "@sensenet/client-core": "^4.1.0", + "@sensenet/client-utils": "^2.3.0", + "@sensenet/default-content-types": "^5.1.0", "@sensenet/hooks-react": "^1.6.3", "semaphore-async-await": "^1.5.1", "tslib": "^2.4.0", diff --git a/packages/sn-editor-react/package.json b/packages/sn-editor-react/package.json index 78b71a33e..1fd4d1283 100644 --- a/packages/sn-editor-react/package.json +++ b/packages/sn-editor-react/package.json @@ -44,7 +44,7 @@ "dependencies": { "@babel/runtime": "^7.18.9", "@material-ui/icons": "^4.11.3", - "@sensenet/client-utils": "^2.2.0", + "@sensenet/client-utils": "^2.3.0", "@tiptap/core": "^2.0.0-beta.102", "@tiptap/extension-blockquote": "^2.0.0-beta.15", "@tiptap/extension-bold": "^2.0.0-beta.15", diff --git a/packages/sn-hooks-react/package.json b/packages/sn-hooks-react/package.json index 4b410504a..5e94d24a9 100644 --- a/packages/sn-hooks-react/package.json +++ b/packages/sn-hooks-react/package.json @@ -42,9 +42,9 @@ }, "dependencies": { "@babel/runtime": "^7.15.3", - "@sensenet/client-core": "^4.0.2", - "@sensenet/client-utils": "^2.2.0", - "@sensenet/default-content-types": "^5.0.0", + "@sensenet/client-core": "^4.1.0", + "@sensenet/client-utils": "^2.3.0", + "@sensenet/default-content-types": "^5.1.0", "@sensenet/repository-events": "^2.1.3", "semaphore-async-await": "^1.5.1", "tslib": "^2.4.0" diff --git a/packages/sn-list-controls-react/package.json b/packages/sn-list-controls-react/package.json index de6d2f32f..5b7ebb7f9 100644 --- a/packages/sn-list-controls-react/package.json +++ b/packages/sn-list-controls-react/package.json @@ -1,6 +1,6 @@ { "name": "@sensenet/list-controls-react", - "version": "2.1.2", + "version": "2.2.0", "description": "", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -43,7 +43,7 @@ }, "dependencies": { "@babel/runtime": "^7.18.9", - "@sensenet/default-content-types": "^5.0.0", + "@sensenet/default-content-types": "^5.1.0", "@sensenet/icons-react": "^2.1.1", "clsx": "^1.1.1", "date-fns": "^2.23.0", diff --git a/packages/sn-pickers-react/package.json b/packages/sn-pickers-react/package.json index 3e1bd15fd..23591c4ef 100644 --- a/packages/sn-pickers-react/package.json +++ b/packages/sn-pickers-react/package.json @@ -50,9 +50,9 @@ "dependencies": { "@babel/runtime": "^7.18.9", "@material-ui/icons": "^4.11.3", - "@sensenet/client-core": "^4.0.2", - "@sensenet/client-utils": "^2.2.0", - "@sensenet/default-content-types": "^5.0.0", + "@sensenet/client-core": "^4.1.0", + "@sensenet/client-utils": "^2.3.0", + "@sensenet/default-content-types": "^5.1.0", "@sensenet/query": "^2.1.3", "react": "^16.13.0", "tslib": "^2.4.0" diff --git a/packages/sn-redux/package.json b/packages/sn-redux/package.json index 1d3092b94..10c7dae59 100644 --- a/packages/sn-redux/package.json +++ b/packages/sn-redux/package.json @@ -46,9 +46,9 @@ "dependencies": { "@sensenet/authentication-google": "^2.1.3", "@sensenet/authentication-jwt": "^1.1.4", - "@sensenet/client-core": "^4.0.2", - "@sensenet/client-utils": "^2.2.0", - "@sensenet/default-content-types": "^5.0.0", + "@sensenet/client-core": "^4.1.0", + "@sensenet/client-utils": "^2.3.0", + "@sensenet/default-content-types": "^5.1.0", "@sensenet/redux-promise-middleware": "^2.3.1", "redux": "^4.2.0", "redux-logger": "^3.0.6", diff --git a/packages/sn-repository-events/package.json b/packages/sn-repository-events/package.json index 518654271..cfb48953c 100644 --- a/packages/sn-repository-events/package.json +++ b/packages/sn-repository-events/package.json @@ -47,9 +47,9 @@ "homepage": "https://sensenet.com", "dependencies": { "@babel/runtime": "^7.18.9", - "@sensenet/client-core": "^4.0.2", - "@sensenet/client-utils": "^2.2.0", - "@sensenet/default-content-types": "^5.0.0", + "@sensenet/client-core": "^4.1.0", + "@sensenet/client-utils": "^2.3.0", + "@sensenet/default-content-types": "^5.1.0", "tslib": "^2.4.0" }, "devDependencies": { diff --git a/packages/sn-search-react/package.json b/packages/sn-search-react/package.json index f56f55515..c7e8b70b9 100644 --- a/packages/sn-search-react/package.json +++ b/packages/sn-search-react/package.json @@ -45,9 +45,9 @@ }, "dependencies": { "@babel/runtime": "^7.18.9", - "@sensenet/client-core": "^4.0.2", - "@sensenet/client-utils": "^2.2.0", - "@sensenet/default-content-types": "^5.0.0", + "@sensenet/client-core": "^4.1.0", + "@sensenet/client-utils": "^2.3.0", + "@sensenet/default-content-types": "^5.1.0", "@sensenet/icons-react": "^2.1.1", "@sensenet/query": "^2.1.3", "autosuggest-highlight": "^3.3.4",