diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js index 283de1c85..b0cf046b1 100644 --- a/jest-puppeteer.config.js +++ b/jest-puppeteer.config.js @@ -10,7 +10,7 @@ module.exports = { server: { command: `http-server -a 127.0.0.1 --port ${port} ./www`, port: port, - launchTimeout: 8000 + launchTimeout: 10000 }, launch: { dumpio: true, diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 0af96090a..da629f705 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -188,9 +188,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { let containerHeight = windowHeight - e.srcElement.clientHeight; if (scroll > this.currentPosition) { - //alert('BOTTOM'); } else { - //alert('UP'); this.scrollingOnce = false; } if ((containerHeight - 100) > scroll) { diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index e0508fa75..6c5565ef6 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -362,9 +362,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { let containerHeight = windowHeight - e.srcElement.clientHeight; if (scroll > this.currentPosition) { - //alert('BOTTOM'); } else { - //alert('UP'); this.scrollingOnce = false; } if ((containerHeight - 100) > scroll) { @@ -647,7 +645,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { async takePicture() { - // alert("!"); const roomId = this.roomId @@ -656,7 +653,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { const lastphoto: any = await this.fileService.loadFiles(); const { capturedImage, capturedImageTitle } = await this.fileService.loadFileData(lastphoto); - // alert('!!'); + const base64 = await fetch(capturedImage); const blob = await base64.blob(); const formData = new FormData(); diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 0226a201e..06920d731 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -398,7 +398,7 @@ export class DespachoPage implements OnInit { } tstemethod(value: string) { - alert(value) + } async openAddNoteModal(actionName: string) { diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 545734816..e2af61474 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -358,7 +358,6 @@ export class PedidoPage implements OnInit { this.goBack() } - // alert(JSON.stringify(res)+' nada') })) } diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index b1184a9a1..aaa96fa2a 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -4,7 +4,6 @@ import { HttpClient, HttpHeaders, HttpEventType } from '@angular/common/http'; import { LoginUserRespose, UserForm, UserSession } from '../models/user.model'; import { environment } from 'src/environments/environment'; import { BehaviorSubject } from 'rxjs'; -import { AuthConnstants } from '../config/auth-constants'; import { AlertController } from '@ionic/angular'; import { SessionStore } from '../store/session.service'; import { AESEncrypt } from '../services/aesencrypt.service'; @@ -141,7 +140,6 @@ export class AuthService { const formData = message.temporaryData try { - // alert('upload try') let guid: any = await this.AttachmentsService.uploadFile(formData).toPromise() message.file.guid = guid.path @@ -217,7 +215,6 @@ export class AuthService { SessionStore.setInativity(false) SessionStore.setUrlBeforeInactivity(this.router.url); setTimeout(() => { - // alert('logout') this.router.navigateByUrl('/', { replaceUrl: true }); }, 100) diff --git a/src/app/services/inativity.service.ts b/src/app/services/inativity.service.ts index 9dcf0bd69..70d173509 100644 --- a/src/app/services/inativity.service.ts +++ b/src/app/services/inativity.service.ts @@ -23,7 +23,6 @@ export class InativityService { function userIsNotActive() { // your function for too long inactivity goes here SessionStore.setInativity(false) - // alert('go out') try { window['inactivity/function']() } catch (error) {} diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 804a7e9fc..031820182 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -211,9 +211,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe let containerHeight = windowHeight - e.srcElement.clientHeight; if (scroll > this.currentPosition) { - //alert('BOTTOM'); } else { - //alert('UP'); this.scrollingOnce = false; } if ((containerHeight - 100) > scroll) { diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 0cc310ac2..089665e26 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -242,9 +242,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy let containerHeight = windowHeight - e.srcElement.clientHeight; if (scroll > this.currentPosition) { - //alert('BOTTOM'); } else { - //alert('UP'); this.scrollingOnce = false; } if ((containerHeight - 100) > scroll) { diff --git a/version/git-version.ts b/version/git-version.ts index 7002b784f..fe049321e 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "60c9246d3", - "SHA": "60c9246d3dd34f07439a95c552a4202dfc17a260", + "shortSHA": "fa0b087fd", + "SHA": "fa0b087fde9deed47a6ed8f6a41c4b32d3ba07bd", "branch": "no_bug_movemente", - "lastCommitAuthor": "'Eudes InĂ¡cio'", - "lastCommitTime": "'Fri Feb 17 16:54:30 2023 +0100'", - "lastCommitMessage": "Pull made", - "lastCommitNumber": "4812", - "change": "diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js\nindex 283de1c85..b0cf046b1 100644\n--- a/jest-puppeteer.config.js\n+++ b/jest-puppeteer.config.js\n@@ -10,7 +10,7 @@ module.exports = {\n server: {\n command: `http-server -a 127.0.0.1 --port ${port} ./www`,\n port: port,\n- launchTimeout: 8000\n+ launchTimeout: 10000\n },\n launch: {\n dumpio: true,\ndiff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts\nindex 0af96090a..da629f705 100644\n--- a/src/app/pages/chat/group-messages/group-messages.page.ts\n+++ b/src/app/pages/chat/group-messages/group-messages.page.ts\n@@ -188,9 +188,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {\n let containerHeight = windowHeight - e.srcElement.clientHeight;\n \n if (scroll > this.currentPosition) {\n- //alert('BOTTOM');\n } else {\n- //alert('UP');\n this.scrollingOnce = false;\n }\n if ((containerHeight - 100) > scroll) {\ndiff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts\nindex e0508fa75..6c5565ef6 100644\n--- a/src/app/pages/chat/messages/messages.page.ts\n+++ b/src/app/pages/chat/messages/messages.page.ts\n@@ -362,9 +362,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {\n let containerHeight = windowHeight - e.srcElement.clientHeight;\n \n if (scroll > this.currentPosition) {\n- //alert('BOTTOM');\n } else {\n- //alert('UP');\n this.scrollingOnce = false;\n }\n if ((containerHeight - 100) > scroll) {\n@@ -647,7 +645,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {\n \n \n async takePicture() {\n- // alert(\"!\");\n \n const roomId = this.roomId\n \n@@ -656,7 +653,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {\n const lastphoto: any = await this.fileService.loadFiles();\n const { capturedImage, capturedImageTitle } = await this.fileService.loadFileData(lastphoto);\n \n- // alert('!!');\n+\n const base64 = await fetch(capturedImage);\n const blob = await base64.blob();\n const formData = new FormData();\ndiff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\nindex 0226a201e..06920d731 100644\n--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n@@ -398,7 +398,7 @@ export class DespachoPage implements OnInit {\n }\n \n tstemethod(value: string) {\n- alert(value)\n+\n }\n \n async openAddNoteModal(actionName: string) {\ndiff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\nindex 545734816..e2af61474 100644\n--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n@@ -358,7 +358,6 @@ export class PedidoPage implements OnInit {\n this.goBack()\n }\n \n- // alert(JSON.stringify(res)+' nada')\n \n }))\n }\ndiff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts\nindex b1184a9a1..aaa96fa2a 100644\n--- a/src/app/services/auth.service.ts\n+++ b/src/app/services/auth.service.ts\n@@ -4,7 +4,6 @@ import { HttpClient, HttpHeaders, HttpEventType } from '@angular/common/http';\n import { LoginUserRespose, UserForm, UserSession } from '../models/user.model';\n import { environment } from 'src/environments/environment';\n import { BehaviorSubject } from 'rxjs';\n-import { AuthConnstants } from '../config/auth-constants';\n import { AlertController } from '@ionic/angular';\n import { SessionStore } from '../store/session.service';\n import { AESEncrypt } from '../services/aesencrypt.service';\n@@ -141,7 +140,6 @@ export class AuthService {\n const formData = message.temporaryData\n \n try {\n- // alert('upload try')\n let guid: any = await this.AttachmentsService.uploadFile(formData).toPromise()\n message.file.guid = guid.path\n \n@@ -217,7 +215,6 @@ export class AuthService {\n SessionStore.setInativity(false)\n SessionStore.setUrlBeforeInactivity(this.router.url);\n setTimeout(() => {\n- // alert('logout')\n this.router.navigateByUrl('/', { replaceUrl: true });\n }, 100)\n \ndiff --git a/src/app/services/inativity.service.ts b/src/app/services/inativity.service.ts\nindex 9dcf0bd69..70d173509 100644\n--- a/src/app/services/inativity.service.ts\n+++ b/src/app/services/inativity.service.ts\n@@ -23,7 +23,6 @@ export class InativityService {\n function userIsNotActive() {\n // your function for too long inactivity goes here\n SessionStore.setInativity(false)\n- // alert('go out')\n try {\n window['inactivity/function']()\n } catch (error) {}\ndiff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts\nindex 804a7e9fc..031820182 100644\n--- a/src/app/shared/chat/group-messages/group-messages.page.ts\n+++ b/src/app/shared/chat/group-messages/group-messages.page.ts\n@@ -211,9 +211,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe\n let containerHeight = windowHeight - e.srcElement.clientHeight;\n \n if (scroll > this.currentPosition) {\n- //alert('BOTTOM');\n } else {\n- //alert('UP');\n this.scrollingOnce = false;\n }\n if ((containerHeight - 100) > scroll) {\ndiff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts\nindex 0cc310ac2..089665e26 100644\n--- a/src/app/shared/chat/messages/messages.page.ts\n+++ b/src/app/shared/chat/messages/messages.page.ts\n@@ -242,9 +242,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy\n let containerHeight = windowHeight - e.srcElement.clientHeight;\n \n if (scroll > this.currentPosition) {\n- //alert('BOTTOM');\n } else {\n- //alert('UP');\n this.scrollingOnce = false;\n }\n if ((containerHeight - 100) > scroll) {\ndiff --git a/test/login.spec.ts b/test/login.spec.ts\nindex dc9b6ced5..47d2d44cc 100644\n--- a/test/login.spec.ts\n+++ b/test/login.spec.ts\n@@ -61,7 +61,7 @@ export const loginTest = async (page) => {\n describe('Puppeteer tests', () => {\n \n \tbeforeAll(async () => {\n-\t\t// await page.goto(process.env.PUPPETEER_HOST)\n+\t\tawait page.goto('https://jestjs.io/docs/puppeteer')\n \t})\n \n \ttest('[table] Clear Code button and set pin', async () => {\n@@ -69,6 +69,7 @@ describe('Puppeteer tests', () => {\n \t\tconst pathname = await page.evaluate( () => window.location.pathname)\n \t\tif (pathname == '/') {\n \t\t\t\t\t\t\n+\t\t\tconsole.log('hello')\n \t\t\t// const browser = await puppeteer.launch({headless: false});\n \t\t\tawait page.setViewport({width: 1200, height: 720});\n \t\t\tawait page.goto(process.env.PUPPETEER_HOST); // wait until page load", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: package-lock.json\n\tmodified: package.json\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: jest-puppeteer.config.js\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/inativity.service.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: test/login.spec.ts", + "lastCommitAuthor": "'Peter Maquiran'", + "lastCommitTime": "'Wed Feb 22 09:30:35 2023 +0100'", + "lastCommitMessage": "jest attemp version", + "lastCommitNumber": "4813", + "change": "", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: jest-puppeteer.config.js\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/inativity.service.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/messages/messages.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file