Skip to content

Commit

Permalink
Merge branch 'master' into newrazzle
Browse files Browse the repository at this point in the history
* master:
  Back to development
  Release 5.10.0
  Prepare for release
  Block EditForm to allow editing blocks in sidebar, with schema  (#1480)
  Comment hyperlinks (#1484)
  Fix changelog
  adding cypress test for the comment (#1487)
  Make available some internal artifacts (Router, Redux Store and Sett… (#1473)
  Refactoring createContent command (#1486)
  Back to development
  Release 5.9.1
  Prepare for release
  Fix for the long lasted issue when creating links in newly created te… (#1489)
  add command to set registry settings (#1481)
  fix error in comment form (#1476)
  • Loading branch information
sneridagh committed May 16, 2020
2 parents 720d062 + 73e4b0d commit 353ce18
Show file tree
Hide file tree
Showing 42 changed files with 839 additions and 120 deletions.
26 changes: 25 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Change Log

## 5.9.1 (unreleased)
## 5.10.1 (unreleased)

### Breaking

Expand All @@ -26,6 +26,30 @@
- Update prettier @sneridagh
- Update eslint plugins @sneridagh
- Update `cypress-axe`, `detectbrowser`, `lint-staged` and `release-it` @sneridagh
## 5.10.0 (2020-05-16)

### Feature

- Refactor createContent command to accept a single json object @iFlameing
- enable hyperlinks in comments when intelligent text is enabled for comments @jackahl
- Added InlineForm, a generic form implementation that can be used to edit, among others, block data. @tiberiuichim

### Internal

- Make available some internal artifacts (Router, Redux Store and Settings) to the Cypress acceptance tests, add docs @sneridagh
- Added a cypress test for the comment @iFlameing
- Add a cypress function to set registry entries @jackahl

## 5.9.1 (2020-05-15)

### Bugfix

- Fix Bug in Form Component, that lead to site crash when transmitting a comment @jackahl #1475
- Fix for the long lasted issue when creating links in newly created text blocks not showing as links until you save @avoinea

### Internal

- add a cypress function to set registry entries @jackahl

## 5.9.0 (2020-05-12)

Expand Down
6 changes: 5 additions & 1 deletion cypress/integration/blocks-image.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ if (Cypress.env('API') !== 'guillotina') {
// given a logged in editor and a page in edit mode
cy.visit('/');
cy.autologin();
cy.createContent('Document', 'my-page', 'My Page');
cy.createContent({
contentType: 'Document',
contentId: 'my-page',
contentTitle: 'My Page',
});
cy.visit('/my-page/edit');
cy.waitForResourceToLoad('@navigation');
cy.waitForResourceToLoad('@breadcrumbs');
Expand Down
6 changes: 5 additions & 1 deletion cypress/integration/blocks-indexing.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ if (Cypress.env('API') !== 'guillotina') {
describe('Block Indexing Tests', () => {
beforeEach(() => {
cy.autologin();
cy.createContent('Document', 'my-page', 'My Page');
cy.createContent({
contentType: 'Document',
contentId: 'my-page',
contentTitle: 'My Page',
});
cy.visit('/my-page/edit');
cy.waitForResourceToLoad('@navigation');
cy.waitForResourceToLoad('@breadcrumbs');
Expand Down
128 changes: 91 additions & 37 deletions cypress/integration/blocks-listing.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ if (Cypress.env('API') !== 'guillotina') {
cy.wait(2000);
// given a logged in editor and a page in edit mode
cy.autologin();
cy.createContent('Document', 'my-page', 'My Page');
cy.createContent({
contentType: 'Document',
contentId: 'my-page',
contentTitle: 'My Page',
});
cy.visit('/my-page/edit');
cy.waitForResourceToLoad('@navigation');
cy.waitForResourceToLoad('@breadcrumbs');
Expand All @@ -21,10 +25,24 @@ if (Cypress.env('API') !== 'guillotina') {
cy.waitForResourceToLoad('@actions');
cy.waitForResourceToLoad('@types');
cy.waitForResourceToLoad('my-page?fullobjects');

cy.createContent('Document', 'my-page-test', 'My Page Test', 'my-page');
cy.createContent('News Item', 'my-news', 'My News', 'my-page');
cy.createContent('Folder', 'my-folder', 'My Folder', 'my-page');
cy.createContent({
contentType: 'Document',
contentId: 'my-page-test',
contentTitle: 'My Page Test',
path: 'my-page',
});
cy.createContent({
contentType: 'News Item',
contentId: 'my-news',
contentTitle: 'My News',
path: 'my-page',
});
cy.createContent({
contentType: 'Folder',
contentId: 'my-folder',
contentTitle: 'My Folder',
path: 'my-page',
});

cy.visit('/my-page/edit');
cy.waitForResourceToLoad('@navigation');
Expand Down Expand Up @@ -75,13 +93,23 @@ if (Cypress.env('API') !== 'guillotina') {
cy.waitForResourceToLoad('my-page?fullobjects');

// given a page with two pages
cy.createContent('Document', 'page-one', 'Page One', 'my-page');
cy.createContent({
contentType: 'Document',
contentId: 'page-one',
contentTitle: 'Page One',
path: 'my-page',
});
cy.setWorkflow({
path: 'my-page/page-one',
review_state: 'publish',
effective: '2018-01-01T08:00:00',
});
cy.createContent('Document', 'page-two', 'Page Two', 'my-page');
cy.createContent({
contentType: 'Document',
contentId: 'page-two',
contentTitle: 'Page Two',
path: 'my-page',
});
cy.setWorkflow({
path: 'my-page/page-two',
review_state: 'publish',
Expand Down Expand Up @@ -139,10 +167,24 @@ if (Cypress.env('API') !== 'guillotina') {
cy.waitForResourceToLoad('@actions');
cy.waitForResourceToLoad('@types');
cy.waitForResourceToLoad('my-page?fullobjects');

cy.createContent('Document', 'my-page-test', 'My Page Test', 'my-page');
cy.createContent('News Item', 'my-news', 'My News', 'my-page');
cy.createContent('Folder', 'my-folder', 'My Folder', 'my-page');
cy.createContent({
contentType: 'Document',
contentId: 'my-page-test',
contentTitle: 'My Page Test',
path: 'my-page',
});
cy.createContent({
contentType: 'News Item',
contentId: 'my-news',
contentTitle: 'My News',
path: 'my-page',
});
cy.createContent({
contentType: 'Folder',
contentId: 'my-folder',
contentTitle: 'My Folder',
path: 'my-page',
});

cy.visit('/my-page/edit');
cy.waitForResourceToLoad('@navigation');
Expand Down Expand Up @@ -222,20 +264,26 @@ if (Cypress.env('API') !== 'guillotina') {
cy.waitForResourceToLoad('@types');
cy.waitForResourceToLoad('my-page?fullobjects');

cy.createContent(
'Document',
'document-outside-folder',
'Document outside Folder',
'my-page',
);
cy.createContent('Document', 'my-folder', 'My Folder', 'my-page');
cy.createContent({
contentType: 'Document',
contentId: 'document-outside-folder',
contentTitle: 'Document outside Folder',
path: 'my-page',
});

cy.createContent(
'Document',
'document-within-folder',
'Document within Folder',
'my-page/my-folder',
);
cy.createContent({
contentType: 'Document',
contentId: 'my-folder',
contentTitle: 'My Folder',
path: 'my-page',
});

cy.createContent({
contentType: 'Document',
contentId: 'document-within-folder',
contentTitle: 'Document within Folder',
path: 'my-page/my-folder',
});

cy.visit('/my-page/my-folder/edit');
cy.waitForResourceToLoad('@navigation');
Expand Down Expand Up @@ -314,20 +362,26 @@ if (Cypress.env('API') !== 'guillotina') {
cy.waitForResourceToLoad('@types');
cy.waitForResourceToLoad('my-page?fullobjects');

cy.createContent(
'Document',
'document-outside-folder',
'Document outside Folder',
'my-page',
);
cy.createContent('Document', 'my-folder', 'My Folder', 'my-page');
cy.createContent({
contentType: 'Document',
contentId: 'document-outside-folder',
contentTitle: 'Document outside Folder',
path: 'my-page',
});

cy.createContent(
'Document',
'document-within-folder',
'Document within Folder',
'my-page/my-folder',
);
cy.createContent({
contentType: 'Document',
contentId: 'my-folder',
contentTitle: 'My Folder',
path: 'my-page',
});

cy.createContent({
contentType: 'Document',
contentId: 'document-within-folder',
contentTitle: 'Document within Folder',
path: 'my-page/my-folder',
});

cy.visit('/my-page/my-folder/edit');
cy.waitForResourceToLoad('@navigation');
Expand Down
6 changes: 5 additions & 1 deletion cypress/integration/blocks-text.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ if (Cypress.env('API') !== 'guillotina') {
// given a logged in editor and a page in edit mode
cy.visit('/');
cy.autologin();
cy.createContent('Document', 'my-page', 'My Page');
cy.createContent({
contentType: 'Document',
contentId: 'my-page',
contentTitle: 'My Page',
});
cy.visit('/my-page/edit');
cy.waitForResourceToLoad('@navigation');
cy.waitForResourceToLoad('@breadcrumbs');
Expand Down
6 changes: 5 additions & 1 deletion cypress/integration/blocks-video.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ if (Cypress.env('API') !== 'guillotina') {
beforeEach(() => {
// given a logged in editor and a page in edit mode
cy.autologin();
cy.createContent('Document', 'my-page', 'My Page');
cy.createContent({
contentType: 'Document',
contentId: 'my-page',
contentTitle: 'My Page',
});
cy.visit('/my-page/edit');
cy.waitForResourceToLoad('@navigation');
cy.waitForResourceToLoad('@breadcrumbs');
Expand Down
Loading

0 comments on commit 353ce18

Please sign in to comment.