From 60e8d71ac59d98e05932ab2cf4f9de5bc2ca1af4 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Mon, 7 Jun 2021 12:42:07 -0300 Subject: [PATCH 1/3] Revert "Use fixed chromedriver version. (#15227)" This reverts commit e4c6b5c2001a3717e254cef496ddb01e1654130a. --- generators/client/templates/angular/package.json.ejs | 2 +- generators/client/templates/vue/package.json.ejs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/client/templates/angular/package.json.ejs b/generators/client/templates/angular/package.json.ejs index 5eec0436c96..b8e5d4f026c 100644 --- a/generators/client/templates/angular/package.json.ejs +++ b/generators/client/templates/angular/package.json.ejs @@ -162,7 +162,7 @@ <%_ } _%> <%_ if (protractorTests) { _%> "postinstall": "<%= clientPackageManager %> run e2e:update-webdriver", - "e2e:update-webdriver": "webdriver-manager update --versions.chrome=90.0.4430.24 --gecko false", + "e2e:update-webdriver": "webdriver-manager update --gecko false", <%_ } _%> "jest": "jest --coverage --logHeapUsage --maxWorkers=2 --config jest.conf.js", "start": "ng serve --hmr", diff --git a/generators/client/templates/vue/package.json.ejs b/generators/client/templates/vue/package.json.ejs index 4ccfcac1907..7e57a0656ec 100644 --- a/generators/client/templates/vue/package.json.ejs +++ b/generators/client/templates/vue/package.json.ejs @@ -181,7 +181,7 @@ <%_ } _%> <%_ if (protractorTests) { _%> "postinstall": "<%= clientPackageManager %> run e2e:update-webdriver", - "e2e:update-webdriver": "webdriver-manager update --versions.chrome=90.0.4430.24 --gecko false", + "e2e:update-webdriver": "webdriver-manager update --gecko false", <%_ } _%> "jest": "jest --coverage --logHeapUsage --maxWorkers=2 --no-cache --config <%= CLIENT_TEST_SRC_DIR %>jest.conf.js", "jest:update": "<%= clientPackageManager %> run jest -- --updateSnapshot", From 215813e8a6b2523c88954d122a91a0669369756e Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 7 Jun 2021 18:13:32 -0300 Subject: [PATCH 2/3] protractor: fix react pattern --- .../react/src/main/webapp/app/entities/react_validators.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/entity-client/templates/react/src/main/webapp/app/entities/react_validators.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/react_validators.ejs index 7e5114379d4..185b81f43fa 100644 --- a/generators/entity-client/templates/react/src/main/webapp/app/entities/react_validators.ejs +++ b/generators/entity-client/templates/react/src/main/webapp/app/entities/react_validators.ejs @@ -38,7 +38,7 @@ if (field.fieldValidate === true) { validators.push('max: { value: ' + field.fieldValidateRulesMax + ', message: translate(\'entity.validation.max\', { max: ' + field.fieldValidateRulesMax + ' }) }'); } if (field.fieldValidationPattern) { - validators.push('pattern: { value: /' + field.fieldValidateRulesPatternReact.replace(/\\/g, '\\\\') + '/, message: translate(\'entity.validation.pattern\', { pattern: \'' + field.fieldValidateRulesPatternReact.replace(/\\/g, '\\\\') + '\' }) }'); + validators.push('pattern: { value: /' + field.fieldValidateRulesPatternReact + '/, message: translate(\'entity.validation.pattern\', { pattern: \'' + field.fieldValidateRulesPatternReact.replace(/\\/g, '\\\\') + '\' }) }'); } if (field.fieldTypeNumeric) { validators.push('validate: v => isNumber(v) || translate(\'entity.validation.number\')'); From 8d4ec157a4c71f2422a826813e2df1514cbe87fb Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Mon, 7 Jun 2021 12:47:38 -0300 Subject: [PATCH 3/3] protractor: drop input value test from angular and vue tests. --- .../e2e/entities/entity.spec.ts.ejs | 39 ++----------------- .../e2e/entities/entity.spec.ts.ejs | 35 +---------------- 2 files changed, 5 insertions(+), 69 deletions(-) diff --git a/generators/entity-client/templates/angular/src/test/javascript/e2e/entities/entity.spec.ts.ejs b/generators/entity-client/templates/angular/src/test/javascript/e2e/entities/entity.spec.ts.ejs index e365f40e82d..a03caa1cba9 100644 --- a/generators/entity-client/templates/angular/src/test/javascript/e2e/entities/entity.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/test/javascript/e2e/entities/entity.spec.ts.ejs @@ -132,7 +132,9 @@ describe('<%= entityClass %> e2e test', () => { <%= entityInstance %>UpdatePage.set<%= fieldNameCapitalized %>Input('64c99148-3908-465d-8c4a-e510e3ade974'), <%_ } else if (field.fieldTypeString && fieldValidateSampleString) { _%> <%= entityInstance %>UpdatePage.set<%= fieldNameCapitalized %>Input('<%= fieldValidateSampleString %>'), - <%_ } else if (!field.fieldTypeBoolean) { _%> + <%_ } else if (field.fieldTypeBoolean) { _%> + <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input().click(), + <%_ } else { _%> <%= entityInstance %>UpdatePage.set<%= fieldNameCapitalized %>Input('<%= fieldName %>'), <%_ } _%> <%_ }); _%> @@ -148,41 +150,6 @@ describe('<%= entityClass %> e2e test', () => { <%_ }); _%> ]); - <%_ fields.filter(field => !field.id).forEach((field) => { - const fieldName = field.fieldName; - const fieldNameCapitalized = field.fieldNameCapitalized; - const fieldValidateSampleString = field.fieldValidateSampleString; - _%> - <%_ if (field.fieldTypeNumeric) { _%> - expect(await <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input()).to.eq('5', 'Expected <%= fieldName %> value to be equals to 5'); - <%_ } else if (field.fieldTypeLocalDate) { _%> - expect(await <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input()).to.eq('2000-12-31', 'Expected <%= fieldName %> value to be equals to 2000-12-31'); - <%_ } else if (field.fieldTypeTimed) { _%> - expect(await <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input()).to.contain('2001-01-01T02:30', 'Expected <%= fieldName %> value to be equals to 2000-12-31'); - <%_ } else if (field.fieldTypeDuration) { _%> - expect(await <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input()).to.contain('12', 'Expected <%= fieldName %> value to be equals to 12'); - <%_ } else if (field.fieldTypeString && fieldValidateSampleString) { _%> - expect(await <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input()).to.eq('<%= fieldValidateSampleString %>', 'Expected <%= fieldNameCapitalized %> value to be equals to <%= fieldValidateSampleString %>'); - <%_ } else if (field.fieldTypeBoolean) { _%> - const selected<%= fieldNameCapitalized %> = <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input(); - if (await selected<%= fieldNameCapitalized %>.isSelected()) { - await <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input().click(); - expect(await <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input().isSelected(), 'Expected <%= fieldName %> not to be selected').to.be.false; - } else { - await <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input().click(); - expect(await <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input().isSelected(), 'Expected <%= fieldName %> to be selected').to.be.true; - } - <%_ } else if (field.fieldTypeBinary && field.blobContentTypeText) { _%> - expect(await <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input()).to.eq('<%= fieldName %>', 'Expected <%= fieldNameCapitalized %> value to be equals to <%= fieldName %>'); - <%_ } else if (field.fieldTypeBinary) { _%> - expect(await <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input()).to.endsWith(fileNameToUpload, 'Expected <%= fieldNameCapitalized %> value to be end with ' + fileNameToUpload); - <%_ } else if (field.fieldTypeUUID) { _%> - expect(await <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input()).to.eq('64c99148-3908-465d-8c4a-e510e3ade974', 'Expected <%= fieldNameCapitalized %> value to be equals to 64c99148-3908-465d-8c4a-e510e3ade974'); - <%_ } else if (!field.fieldIsEnum) { _%> - expect(await <%= entityInstance %>UpdatePage.get<%= fieldNameCapitalized %>Input()).to.eq('<%= fieldName %>', 'Expected <%= fieldNameCapitalized %> value to be equals to <%= fieldName %>'); - <%_ } _%> - <%_ }); _%> - await <%= entityInstance %>UpdatePage.save(); expect(await <%= entityInstance %>UpdatePage.getSaveButton().isPresent(), 'Expected save button disappear').to.be.false; diff --git a/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity.spec.ts.ejs b/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity.spec.ts.ejs index b3075ba2dd4..7b4f1703ff7 100644 --- a/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity.spec.ts.ejs +++ b/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity.spec.ts.ejs @@ -128,36 +128,23 @@ describe('<%= entityClass %> e2e test', () => { <%_ if (field.fieldTypeNumeric) { _%> await updatePage.<%= fieldName %>Input.sendKeys('5'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.eq('5'); <%_ } else if (field.fieldTypeLocalDate) { _%> await updatePage.<%= fieldName %>Input.sendKeys('2001-01-01'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.eq('2001-01-01'); <%_ } else if (field.fieldTypeTimed) { _%> await updatePage.<%= fieldName %>Input.sendKeys('01/01/2001' + protractor.Key.TAB + '02:30AM'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.contain('2001-01-01T02:30'); <%_ } else if (field.fieldTypeDuration) { _%> await updatePage.<%= fieldName %>Input.sendKeys('PT12S'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.contain('PT12S'); <%_ } else if (field.fieldTypeBoolean) { _%> - const selected<%= fieldNameCapitalized %> = await updatePage.<%= fieldName %>Input.isSelected(); - if (selected<%= fieldNameCapitalized %>) { - await updatePage.<%= fieldName %>Input.click(); - expect(await updatePage.<%= fieldName %>Input.isSelected()).to.be.false; - } else { - await updatePage.<%= fieldName %>Input.click(); - expect(await updatePage.<%= fieldName %>Input.isSelected()).to.be.true; - } + await updatePage.<%= fieldName %>Input.click(); <%_ } else if (field.fieldTypeBinary && field.blobContentTypeText) { _%> await waitUntilDisplayed(updatePage.<%= fieldName %>Input); await updatePage.<%= fieldName %>Input.sendKeys('<%= fieldName %>'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.match(/<%= fieldName %>/); - <%_ } else if (field.fieldTypeBinary) { _%> await waitUntilDisplayed(updatePage.<%= fieldName %>Input); await updatePage.<%= fieldName %>Input.sendKeys(absolutePath); @@ -167,15 +154,12 @@ describe('<%= entityClass %> e2e test', () => { <%_ } else if (field.fieldTypeUUID){ _%> await updatePage.<%= fieldName %>Input.sendKeys('64c99148-3908-465d-8c4a-e510e3ade974'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.match(/64c99148-3908-465d-8c4a-e510e3ade974/); <%_ } else if (field.fieldTypeString && fieldValidateSampleString) { _%> await updatePage.<%= fieldName %>Input.sendKeys('<%= fieldValidateSampleString %>'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.eq('<%= fieldValidateSampleString %>'); <%_ } else { _%> await updatePage.<%= fieldName %>Input.sendKeys('<%= fieldName %>'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.match(/<%= fieldName %>/); <%_ } _%> <%_ }); _%> @@ -263,52 +247,37 @@ describe('<%= entityClass %> e2e test', () => { <%_ if (field.fieldTypeNumeric) { _%> await clear(updatePage.<%= fieldName %>Input); await updatePage.<%= fieldName %>Input.sendKeys('6'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.eq('6'); <%_ } else if (field.fieldTypeLocalDate) { _%> await updatePage.<%= fieldName %>Input.clear(); await updatePage.<%= fieldName %>Input.sendKeys('2019-01-01'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.eq('2019-01-01'); <%_ } else if (field.fieldTypeTimed) { _%> await updatePage.<%= fieldName %>Input.clear(); await updatePage.<%= fieldName %>Input.sendKeys('01/01/2019' + protractor.Key.TAB + '02:30AM'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.contain('2019-01-01T02:30'); <%_ } else if (field.fieldTypeDuration) { _%> await clear(updatePage.<%= fieldName %>Input); await updatePage.<%= fieldName %>Input.sendKeys('PT14S'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.contain('PT14S'); <%_ } else if (field.fieldTypeBoolean) { _%> - const selected<%= fieldNameCapitalized %> = await updatePage.<%= fieldName %>Input.isSelected(); - if (selected<%= fieldNameCapitalized %>) { - await updatePage.<%= fieldName %>Input.click(); - expect(await updatePage.<%= fieldName %>Input.isSelected()).to.be.false; - } else { - await updatePage.<%= fieldName %>Input.click(); - expect(await updatePage.<%= fieldName %>Input.isSelected()).to.be.true; - } + await updatePage.<%= fieldName %>Input.click(); <%_ } else if (field.fieldTypeBinary && field.blobContentTypeText) { _%> await updatePage.<%= fieldName %>Input.clear(); await updatePage.<%= fieldName %>Input.sendKeys('updated<%= fieldName %>'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.match(/updated<%= fieldName %>/); <%_ } else if (field.fieldTypeUUID) { _%> await updatePage.<%= fieldName %>Input.clear(); await updatePage.<%= fieldName %>Input.sendKeys('64c99148-3908-465d-8c4a-e510e3ade978'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.match(/64c99148-3908-465d-8c4a-e510e3ade978/); <%_ } else if (field.fieldTypeString && fieldValidateModifiedString) { _%> await updatePage.<%= fieldName %>Input.clear(); await updatePage.<%= fieldName %>Input.sendKeys('<%= fieldValidateModifiedString %>'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.eq('<%= fieldValidateModifiedString %>'); <%_ } else if (!fieldIsEnum && !field.fieldTypeBinary) { _%> await updatePage.<%= fieldName %>Input.clear(); await updatePage.<%= fieldName %>Input.sendKeys('modified'); - expect(await updatePage.<%= fieldName %>Input.getAttribute('value')).to.match(/modified/); <%_ } _%> <%_ }); _%>