Merge branch 'main' into image-conversions

Author: yanthomasdev

cypress/e2e/common/editorial_workflow_migrations.js

@@ -163,10 +163,7 @@ Cypress.Commands.add('tabkey', { prevSubject: true }, (subject, { shift, times }
 });
 
 Cypress.Commands.add('selection', { prevSubject: true }, (subject, fn) => {
-  cy.wrap(subject)
-    .trigger('mousedown')
-    .then(fn)
-    .trigger('mouseup');
+  cy.wrap(subject).trigger('mousedown').then(fn).trigger('mouseup');
 
   cy.document().trigger('selectionchange');
   return cy.wrap(subject);
@@ -227,7 +224,7 @@ Cypress.Commands.add('login', () => {
 
 Cypress.Commands.add('loginAndNewPost', () => {
   cy.login();
-  cy.contains('a', 'New Post').click();
+  cy.contains('a', '＋ Post').click();
 });
 
 Cypress.Commands.add('drag', { prevSubject: true }, subject => {
@@ -259,9 +256,7 @@ Cypress.Commands.add('clickToolbarButton', (title, { times } = {}) => {
 
 Cypress.Commands.add('insertEditorComponent', title => {
   cy.get('button[title="Add Component"]').click();
-  cy.contains('div', title)
-    .click()
-    .focused();
+  cy.contains('div', title).click().focused();
 });
 
 [
@@ -282,9 +277,7 @@ Cypress.Commands.add('insertEditorComponent', title => {
 
 Cypress.Commands.add('clickModeToggle', () => {
   cy.get('.cms-editor-visual').within(() => {
-    cy.get('button[role="switch"]')
-      .click()
-      .focused();
+    cy.get('button[role="switch"]').click().focused();
   });
 });
 
@@ -316,10 +309,7 @@ Cypress.Commands.add('confirmMarkdownEditorContent', expectedDomString => {
 });
 
 Cypress.Commands.add('clearMarkdownEditorContent', () => {
-  return cy
-    .getMarkdownEditor()
-    .selectAll()
-    .backspace({ times: 2 });
+  return cy.getMarkdownEditor().selectAll().backspace({ times: 2 });
 });
 
 Cypress.Commands.add('confirmRawEditorContent', expectedDomString => {

cypress/support/commands.js

@@ -9,7 +9,12 @@ const {
 } = require('./constants');
 
 function login(user) {
-  console.log('[login] START user=', user ? 'yes' : 'no', 'netlifySiteURL=', user?.netlifySiteURL || 'none');
+  console.log(
+    '[login] START user=',
+    user ? 'yes' : 'no',
+    'netlifySiteURL=',
+    user?.netlifySiteURL || 'none',
+  );
   cy.viewport(1200, 1200);
   if (user) {
     console.log('[login] About to cy.visit("/")');
@@ -40,7 +45,7 @@ function login(user) {
     cy.contains('button', 'Login').click();
   }
   console.log('[login] Waiting for New Post link');
-  cy.contains('a', 'New Post', { timeout: 60000 }).then(() => {
+  cy.contains('a', '＋ Post', { timeout: 60000 }).then(() => {
     console.log('[login] New Post link found - COMPLETE');
   });
 }
@@ -126,20 +131,12 @@ function assertUnpublishedChangesInEditor() {
 
 function goToEntry(entry) {
   goToCollections();
-  cy.get('a h2')
-    .first()
-    .contains(entry.title)
-    .click();
+  cy.get('a h2').first().contains(entry.title).click();
 }
 
 function updateWorkflowStatus({ title }, fromColumnHeading, toColumnHeading) {
-  cy.contains('h2', fromColumnHeading)
-    .parent()
-    .contains('a', title)
-    .drag();
-  cy.contains('h2', toColumnHeading)
-    .parent()
-    .drop();
+  cy.contains('h2', fromColumnHeading).parent().contains('a', title).drag();
+  cy.contains('h2', toColumnHeading).parent().drop();
   assertNotification(notifications.updated);
 }
 
@@ -192,9 +189,7 @@ function assertPublishedEntry(entry) {
       });
     });
   } else {
-    cy.get('a h2')
-      .first()
-      .contains(entry.title);
+    cy.get('a h2').first().contains(entry.title);
   }
 }
 
@@ -226,9 +221,7 @@ function assertEntryDeleted(entry) {
 }
 
 function assertWorkflowStatus({ title }, status) {
-  cy.contains('h2', status)
-    .parent()
-    .contains('a', title);
+  cy.contains('h2', status).parent().contains('a', title);
 }
 
 function updateWorkflowStatusInEditor(newStatus) {
@@ -284,12 +277,8 @@ function populateEntry(entry, onDone = flushClockAndSave) {
       cy.get('@bodyEditor').clear({ force: true });
       cy.get('@bodyEditor').type(value, { force: true });
     } else {
-      cy.get(`[id^="${key}-field"]`)
-        .first()
-        .clear({ force: true });
-      cy.get(`[id^="${key}-field"]`)
-        .first()
-        .type(value, { force: true });
+      cy.get(`[id^="${key}-field"]`).first().clear({ force: true });
+      cy.get(`[id^="${key}-field"]`).first().type(value, { force: true });
     }
   }
 
@@ -298,7 +287,7 @@ function populateEntry(entry, onDone = flushClockAndSave) {
 
 function newPost() {
   // click even if covered by toast
-  cy.contains('a', 'New Post').click({ force: true });
+  cy.contains('a', '＋ Post').click({ force: true });
 }
 
 function createPost(entry) {
@@ -425,9 +414,7 @@ function duplicatePostAndPublish(entry1) {
 
 function updateExistingPostAndExit(fromEntry, toEntry) {
   goToWorkflow();
-  cy.contains('h2', fromEntry.title)
-    .parent()
-    .click({ force: true });
+  cy.contains('h2', fromEntry.title).parent().click({ force: true });
   populateEntry(toEntry);
   exitEditor();
   goToWorkflow();
@@ -436,9 +423,7 @@ function updateExistingPostAndExit(fromEntry, toEntry) {
 
 function unpublishEntry(entry) {
   goToCollections();
-  cy.contains('h2', entry.title)
-    .parent()
-    .click({ force: true });
+  cy.contains('h2', entry.title).parent().click({ force: true });
   selectDropdownItem('Published', 'Unpublish');
   assertNotification(notifications.unpublished);
   goToWorkflow();
@@ -500,9 +485,7 @@ function validateListFields({ name, description }) {
   cy.contains('button', 'Save').click();
   assertNotification(notifications.error.missingField);
   assertFieldErrorStatus('Authors', colorError);
-  cy.get('div[class*=SortableListItem]')
-    .eq(2)
-    .as('listControl');
+  cy.get('div[class*=SortableListItem]').eq(2).as('listControl');
   assertFieldErrorStatus('Name', colorError, { scope: cy.get('@listControl') });
   assertColorOn('background-color', colorError, {
     type: 'label',
@@ -511,12 +494,8 @@ function validateListFields({ name, description }) {
     isMarkdown: true,
   });
   assertListControlErrorStatus([colorError, colorError], '@listControl');
-  cy.get('input')
-    .eq(2)
-    .type(name);
-  cy.getMarkdownEditor()
-    .eq(2)
-    .type(description);
+  cy.get('input').eq(2).type(name);
+  cy.getMarkdownEditor().eq(2).type(description);
   flushClockAndSave();
   assertNotification(notifications.saved);
   assertFieldErrorStatus('Authors', colorNormal);
@@ -529,16 +508,8 @@ function validateNestedListFields() {
   // add first city list item
   cy.contains('button', 'hotel locations').click();
   cy.contains('button', 'cities').click();
-  cy.contains('label', 'City')
-    .parents()
-    .next()
-    .first()
-    .type('Washington DC');
-  cy.contains('label', 'Number of Hotels in City')
-    .parents()
-    .next()
-    .first()
-    .type('5');
+  cy.contains('label', 'City').parents().next().first().type('Washington DC');
+  cy.contains('label', 'Number of Hotels in City').parents().next().first().type('5');
   cy.contains('button', 'city locations').click();
 
   // add second city list item
@@ -556,9 +527,7 @@ function validateNestedListFields() {
     .next()
     .first()
     .type('Boston');
-  cy.get('@secondCitiesListControl')
-    .contains('button', 'city locations')
-    .click();
+  cy.get('@secondCitiesListControl').contains('button', 'city locations').click();
 
   cy.contains('button', 'Save').click();
   assertNotification(notifications.error.missingField);
@@ -612,11 +581,7 @@ function validateNestedListFields() {
   assertListControlErrorStatus([colorError, colorError], '@firstCityLocationsListControl');
   assertListControlErrorStatus([colorError, colorError], '@secondCityLocationsListControl');
 
-  cy.contains('label', 'Hotel Name')
-    .parents()
-    .next()
-    .first()
-    .type('The Ritz Carlton');
+  cy.contains('label', 'Hotel Name').parents().next().first().type('The Ritz Carlton');
   cy.contains('button', 'Save').click();
   assertNotification(notifications.error.missingField);
   assertListControlErrorStatus([colorNormal, textColorNormal], '@firstCitiesListControl');
@@ -634,11 +599,7 @@ function validateNestedListFields() {
     .next()
     .first()
     .type('Grand Hyatt');
-  cy.contains('label', 'Country')
-    .parents()
-    .next()
-    .first()
-    .type('United States');
+  cy.contains('label', 'Country').parents().next().first().type('United States');
   flushClockAndSave();
   assertNotification(notifications.saved);
 }
@@ -664,9 +625,7 @@ function validateNestedListFieldsAndExit(setting) {
 }
 
 function assertFieldValidationError({ message, fieldLabel }) {
-  cy.contains('label', fieldLabel)
-    .siblings('ul[class*=ControlErrorsList]')
-    .contains(message);
+  cy.contains('label', fieldLabel).siblings('ul[class*=ControlErrorsList]').contains(message);
   assertFieldErrorStatus(fieldLabel, colorError);
 }
 
@@ -689,21 +648,14 @@ function assertListControlErrorStatus(colors = ['', ''], alias) {
   cy.get(alias).within(() => {
     // assert list item border has correct color
     assertColorOn('border-right-color', colors[0], {
-      el: cy
-        .root()
-        .children()
-        .eq(2),
+      el: cy.root().children().eq(2),
     });
     // collapse list item
-    cy.get('button[class*=TopBarButton-button]')
-      .first()
-      .click();
+    cy.get('button[class*=TopBarButton-button]').first().click();
     // assert list item label text has correct color
     assertColorOn('color', colors[1], { el: cy.get('div[class*=NestedObjectLabel]').first() });
     // uncollapse list item
-    cy.get('button[class*=TopBarButton-button]')
-      .first()
-      .click();
+    cy.get('button[class*=TopBarButton-button]').first().click();
   });
 }