yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v10/dev' into v10/feature/variant-permissions

Browse Source
This commit is contained in:
Zeegaan
2022-07-04 14:43:09 +02:00
parent f3591d2e7a af3e9bf892
commit 1993424264
54 changed files with 1565 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/recycleBin.ts Normal file
View File

@@ -0,0 +1,78 @@
/// <reference types="Cypress" />
import {
ContentBuilder,
DocumentTypeBuilder,
} from 'umbraco-cypress-testhelpers';
context('Recycle bin', () => {
beforeEach(() => {
cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));
});
function refreshContentTree() {
// Refresh to update the tree
cy.get('li .umb-tree-root:contains("Content")').should("be.visible").rightclick();
cy.umbracoContextMenuAction("action-refreshNode").click();
// We have to wait in case the execution is slow, otherwise we'll try and click the item before it appears in the UI
cy.get('.umb-tree-item__inner').should('exist', { timeout: 10000 });
}
it('Can delete content from recycle bin', () => {
const contentToDeleteName = "DeleteMe";
const contentToNotDeleteName = "DontDelete";
const testType = "TestType";
cy.umbracoEnsureDocumentTypeNameNotExists(testType);
cy.deleteAllContent();
const docType = new DocumentTypeBuilder()
.withName(testType)
.build();
cy.saveDocumentType(docType).then((savedDocType) => {
const contentToDelete = new ContentBuilder()
.withContentTypeAlias(savedDocType.alias)
.withAction("saveNew")
.addVariant()
.withName(contentToDeleteName)
.withSave(true)
.done()
.build();
const contentToNotDelete = new ContentBuilder()
.withContentTypeAlias(savedDocType.alias)
.withAction("saveNew")
.addVariant()
.withName(contentToNotDeleteName)
.withSave(true)
.done()
.build();
// Put it in the recycle bin
cy.saveContent(contentToDelete).then(savedToDelete => {
cy.deleteContentById(savedToDelete.id);
});
cy.saveContent(contentToNotDelete).then(savedNotToDelete => {
cy.deleteContentById(savedNotToDelete.id)
});
});
refreshContentTree();
cy.umbracoTreeItem('content', ["Recycle Bin"]).click();
cy.get('.umb-content-grid__content').contains(contentToDeleteName).closest('div').click();
cy.umbracoButtonByLabelKey('actions_delete').click();
cy.umbracoButtonByLabelKey('contentTypeEditor_yesDelete').click();
cy.umbracoSuccessNotification().should('be.visible');
cy.get('.umb-content-grid__content').contains(contentToDeleteName).should('not.exist');
cy.umbracoTreeItem('content', ["Recycle Bin", contentToDeleteName]).should('not.exist');
cy.get('.umb-content-grid__content').contains(contentToNotDeleteName).should('be.visible');
cy.umbracoTreeItem('content', ["Recycle Bin", contentToNotDeleteName]).should('be.visible');
cy.deleteAllContent();
cy.umbracoEnsureDocumentTypeNameNotExists(testType);
});
});

2
tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker
View File

@@ -24,7 +24,7 @@ COPY --from=build dist .
ENV ASPNETCORE_URLS="http://0.0.0.0:5000"
ENV Umbraco__CMS__Global__InstallMissingDatabase="true"
ENV ConnectionStrings__umbracoDbDSN_ProviderName="Microsoft.Data.SQLite"
ENV ConnectionStrings__umbracoDbDSN_ProviderName="Microsoft.Data.Sqlite"
ENV ConnectionStrings__umbracoDbDSN="Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True"
ENV Umbraco__CMS__Unattended__InstallUnattended="true"
ENV Umbraco__CMS__Unattended__UnattendedUserName="Cypress Test"