diff --git a/.gitignore b/.gitignore index 1a3db7964..8d469628a 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,7 @@ npm-debug.log* /platforms /plugins /www -/www0 +/serve /mobilefirst # Custom diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js index 740ce872b..75d3794bf 100644 --- a/jest-puppeteer.config.js +++ b/jest-puppeteer.config.js @@ -15,6 +15,12 @@ module.exports = { dumpio: true, headless: openChrome != 'true', product: 'chrome', + args: [`--window-size=1200,1080`], + defaultViewport: { + width:1200, + height:1080 + } }, browserContext: 'default', + } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index ed0927f7e..d0bdfefbf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11937,6 +11937,11 @@ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz", "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=" }, + "faker": { + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz", + "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==" + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", diff --git a/package.json b/package.json index a2eee7177..e7caaeb9f 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "date-fns": "^2.17.0", "depd": "^2.0.0", "dotenv": "^10.0.0", + "faker": "^5.5.3", "global": "^4.4.0", "http-server": "^0.12.3", "ibm-mfp-web-push": "^8.0.2020052213", diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index 7346232a2..4f8e5f17f 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -3,7 +3,7 @@ - + diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts index 0b0c38c99..c36b45ae2 100644 --- a/src/app/services/toast.service.ts +++ b/src/app/services/toast.service.ts @@ -33,7 +33,7 @@ export class ToastService { notification.innerHTML = `
-

+

{{ message }}

@@ -65,7 +65,7 @@ export class ToastService { notification.innerHTML = `
-

+

{{ message }}

diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 46f4c6aed..866d0fb8a 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -139,8 +139,6 @@ export class NewEventPage implements OnInit { this.getRecurrenceTypes(); if(!this.restoreTemporaryData()){ // clear - - this.eventBody = { BodyType : "1", Text : ""}; this.postEvent.Body = this.eventBody; diff --git a/test/Agenda.spec.ts b/test/Agenda.spec.ts index 18f0d9f42..2849d9a90 100644 --- a/test/Agenda.spec.ts +++ b/test/Agenda.spec.ts @@ -1,6 +1,8 @@ import { environment } from '../src/environments/environment' import { loginTest } from './login.spec' +import * as faker from 'faker'; +faker.locale = "pt_PT"; describe('Puppeteer tests', () => { @@ -44,7 +46,56 @@ describe('Puppeteer tests', () => { await page.click('ion-content ion-row .cy-add-event') // wait for component await page.waitForSelector('app-new-event') + + + // subject + await page.type('app-new-event .ion-item-container input', faker.commerce.productDescription() ) + // Location + await page.type('app-new-event .container-div:nth-child(2) input', faker.address.state()+" "+faker.address.city() ) + // Select Calendar + await page.click('app-new-event .container-div:nth-child(3) .mat-form-field-flex') + await page.waitForSelector('.cdk-overlay-connected-position-bounding-box') + await page.click('.cdk-overlay-connected-position-bounding-box mat-option') + // select event type + await page.click('app-new-event .container-div:nth-child(4) .mat-form-field-flex') + await page.waitForSelector('.cdk-overlay-connected-position-bounding-box') + await page.click('.cdk-overlay-connected-position-bounding-box mat-option') + + // select start day + await page.click('app-new-event .container-div:nth-child(5) button') + await page.waitForSelector('.cdk-overlay-connected-position-bounding-box') + await page.click('.mat-calendar-next-button') + + let selectedFDay = Math.floor(Math.random()*(25-1+1)+1); + let days = await page.$$(` .mat-calendar-body-cell `) + await days[selectedFDay].click() + await page.click('.cdk-overlay-connected-position-bounding-box .actions button') + + // select end day + await page.click('app-new-event .container-div:nth-child(6) button') + await page.waitForSelector('.cdk-overlay-connected-position-bounding-box') + await page.click('.mat-calendar-next-button') + days = await page.$$(` .mat-calendar-body-cell `) + await days[selectedFDay+1].click() + await page.click('.cdk-overlay-connected-position-bounding-box .actions button') + + // await page.click('app-new-event .container-div:nth-child(7) .mat-form-field-flex') + // await page.waitForSelector('.cdk-overlay-connected-position-bounding-box') + // await page.click('.cdk-overlay-connected-position-bounding-box mat-option') + + await page.click('app-new-event .container-div:nth-child(8) .add-people') + await page.waitForSelector('app-attendee-modal .ng-star-inserted:nth-child(2)') + await page.click('app-attendee-modal .ng-star-inserted:nth-child(2)') + // save + await page.click('app-attendee-modal ion-footer ion-buttons:nth-child(2)') + // save + let buttons = await page.$$('app-new-event ion-footer ion-buttons') + buttons[1].click() + + await page.waitForSelector('.notification .success') + + expect(3 + 2).toBe(5); },30000);