Merge pull request #104 from lilt/3.x-neo-fallback

Added fallback for block elements without a created structure

CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.5.3 - 2023-05-18
+### Fixed 
+- Added fallback for block elements without a created structure to fix content provider
+
+## 3.5.2 - 2023-05-17
+### Changed 
+- Updated error message for failed jobs after retries
+
+### Fixed
+- Resolved duplication issue with Neo and SuperTable fields
+
 ## 3.5.1 - 2023-04-04
 ### Fixed
 - Query for fetching translations by status and id

composer.json

@@ -2,7 +2,7 @@
   "name": "lilt/craft-lilt-plugin",
   "description": "The Lilt plugin makes it easy for you to send content to Lilt for translation right from within Craft CMS.",
   "type": "craft-plugin",
-  "version": "3.5.1",
+  "version": "3.5.3",
   "keywords": [
     "craft",
     "cms",

e2e/.env.example

@@ -1,5 +1,6 @@
 CYPRESS_APP_URL=
 CYPRESS_API_URL=
+CYPRESS_API_KEY=
 CYPRESS_MOCKSERVER_HOST=
 CYPRESS_MOCKSERVER_PORT=
 CYPRESS_USER_NAME=

e2e/.env.test

@@ -1,5 +1,6 @@
 CYPRESS_APP_URL=http://app:8080
 CYPRESS_API_URL=http://mockserver:1080
+CYPRESS_API_KEY=this_is_apy_key
 CYPRESS_MOCKSERVER_HOST=mockserver
 CYPRESS_MOCKSERVER_PORT=1080
 CYPRESS_MOCKSERVER_ENABLED=true

e2e/.gitignore

@@ -1,7 +1,7 @@
 node_modules
 cypress/videos
 .idea
-cypress.env.json
+*.env.json
 happy-lager-main/
 !happy-lager-override/composer.lock
 *.override.yml

e2e/Makefile

@@ -48,6 +48,9 @@ up: clone down
 	docker-compose exec -T app sh -c 'echo CRAFT_LILT_PLUGIN_QUEUE_DELAY_IN_SECONDS=5 >> .env'
 	docker-compose exec -T app sh -c 'php craft db/restore happylager.sql'
 	docker-compose exec -T app sh -c 'php craft plugin/install craft-lilt-plugin'
+	docker-compose exec -T app sh -c 'php craft plugin/install neo'
+	docker-compose exec -T app sh -c 'php craft plugin/install super-table'
+	docker-compose exec -T app sh -c 'php craft project-config/rebuild'
 	docker-compose exec -T app sh -c 'php craft up'
 	docker-compose exec -T app sh -c 'php craft migrate/up'
 	docker-compose exec -T app sh -c 'php craft queue/run'

e2e/cypress.env.json.dist

@@ -0,0 +1,11 @@
+{
+  "APP_URL": "http://localhost:88",
+  "API_URL": "http://mockserver:1080",
+  "API_KEY": "this_is_apy_key",
+  "MOCKSERVER_HOST": "localhost",
+  "MOCKSERVER_PORT": "1080",
+  "MOCKSERVER_ENABLED": "true",
+  "USER_NAME": "admin",
+  "USER_PASSWORD": "password",
+  "ASSERT_ENTRY_CONTENT": "false"
+}

e2e/cypress/e2e/queues/failed.cy.js

@@ -71,9 +71,7 @@ describe(
             invoke('attr', 'data-status').
             should('equal', 'failed');
 
-        cy.get('.lilt-job-activity-log').invoke('text').should('contain', 'Job failed after 0 attempt(s). Error message: [500] Server error: `POST http://mockserver:1080/jobs` resulted in a `500 Internal Server Error` response')
-        cy.get('.lilt-job-activity-log').invoke('text').should('contain', 'Job failed after 1 attempt(s). Error message: [500] Server error: `POST http://mockserver:1080/jobs` resulted in a `500 Internal Server Error` response')
-        cy.get('.lilt-job-activity-log').invoke('text').should('contain', 'Job failed after 2 attempt(s). Error message: [500] Server error: `POST http://mockserver:1080/jobs` resulted in a `500 Internal Server Error` response')
-        cy.get('.lilt-job-activity-log').invoke('text').should('contain', 'Job failed after 3 attempt(s). Error message: [500] Server error: `POST http://mockserver:1080/jobs` resulted in a `500 Internal Server Error` response')
+        cy.get('.lilt-job-activity-log').invoke('text').should('contain', 'Unexpected error: [500] Server error: `POST http://mockserver:1080/jobs` resulted in a `500 Internal Server Error` response')
+        cy.get('.lilt-job-activity-log').invoke('text').should('contain', 'Job failed after 3 attempt(s)')
       });
     });

e2e/cypress/support/commands.js

@@ -85,6 +85,7 @@ Cypress.Commands.add('openJob', (title) => {
  */
 Cypress.Commands.add('setConfigurationOption', (option, enabled) => {
   const apiUrl = Cypress.env('API_URL');
+  const apiKey = Cypress.env('API_KEY');
   const appUrl = Cypress.env('APP_URL');
 
   const options = {
@@ -140,8 +141,13 @@ Cypress.Commands.add('setConfigurationOption', (option, enabled) => {
 
   cy.visit(`${appUrl}/admin/craft-lilt-plugin/settings`);
 
-  cy.get('#connectorApiUrl').clear().type(apiUrl);
-  cy.get('#connectorApiKey').clear().type('this_is_apy_key');
+  if (apiUrl) {
+    cy.get('#connectorApiUrl').clear().type(apiUrl);
+  }
+
+  if(apiKey) {
+    cy.get('#connectorApiKey').clear().type('this_is_apy_key');
+  }
 
   cy.get('#content .btn.submit').click();
 
@@ -292,15 +298,15 @@ Cypress.Commands.add('resetEntryContent', (entryId, languages) => {
 
     cy.get('.redactor-in').then(els => {
       [...els].forEach(el => {
-        cy.wrap(el).clear();
-        cy.wrap(el).type('This content should be changed');
+        cy.wrap(el).clear({force: true});
+        cy.wrap(el).type('This content should be changed', {force: true});
       });
     });
 
     cy.get('#fields .input input[type="text"]').then(els => {
       [...els].forEach(el => {
-        cy.wrap(el).clear();
-        cy.wrap(el).type('This content should be changed');
+        cy.wrap(el).clear({force: true});
+        cy.wrap(el).type('This content should be changed', {force: true});
       });
     });
 
@@ -556,22 +562,40 @@ Cypress.Commands.add('assertEntryContent',
               capture: 'fullPage',
             });
 
-        for (let expectedValue of expected[language]) {
-          //TODO: check why CraftCMS add or remove extra spaces on html elements
-          cy.get(expectedValue.id, {timeout: 1000}).
-              invoke(expectedValue.functionName).
-              should('not.equal', 'This content should be changed');
-
-          cy.get(expectedValue.id, {timeout: 1000}).
-              invoke(expectedValue.functionName).
-              then(text => {
-                expect(
-                    text.replace(/<[^>]*>/g, ''),
-                ).to.equal(
-                    expectedValue.value.replace(/<[^>]*>/g, ''),
-                );
-              });
-        }
+        let values = [];
+        cy.get('input, textarea').each(($input) => {
+          const value = $input.val(); // Assuming the input uses jQuery syntax
+
+          if (value != '') {
+            values.push(value.replace(/<[^>]*>/g, ''));
+          }
+        }).then(() => {
+          for (let expectedValue of expected[language]) {
+            if (expectedValue.type === 'nested') {
+              expect(values.indexOf(expectedValue.value.replace(/<[^>]*>/g, '')), `Asserting that page has input or textarea with content: "${expectedValue.value}"`).
+                  to.
+                  be.
+                  not.
+                  equal(-1);
+
+              continue;
+            }
+            //TODO: check why CraftCMS add or remove extra spaces on html elements
+            cy.get(expectedValue.id, {timeout: 1000}).
+                invoke(expectedValue.functionName).
+                should('not.equal', 'This content should be changed');
+
+            cy.get(expectedValue.id, {timeout: 1000}).
+                invoke(expectedValue.functionName).
+                then(text => {
+                  expect(
+                      text.replace(/<[^>]*>/g, ''),
+                  ).to.equal(
+                      expectedValue.value.replace(/<[^>]*>/g, ''),
+                  );
+                });
+          }
+        });
       }
     });