chnages and changes

.gitignore

@@ -79,4 +79,7 @@ android copy/
 report.*
 src/plugin/src/
 _node_modules/
-migrat/
+migrat/
+
+cypress/videos
+*.rar

cypress.config.js

@@ -0,0 +1,10 @@
+module.exports = {
+  // The rest of the Cypress config options go here...
+  projectId: "vu99za",
+
+  e2e: {
+    setupNodeEvents(on, config) {
+      // implement node event listeners here
+    },
+  },
+};

cypress/.gitignore

@@ -0,0 +1,26 @@
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Dependency directory
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
+videos
+screenshots
+e2e

cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

cypress/support/commands.js

@@ -0,0 +1,25 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add('login', (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })

cypress/support/e2e.js

@@ -0,0 +1,20 @@
+// ***********************************************************
+// This example support/e2e.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')

jest.config.js

@@ -9,7 +9,7 @@ module.exports = {
     "transform": {
       "^.+\\.(ts|tsx)$": "ts-jest"
     },
-    // "globalSetup": "<rootDir>/test/setupJest.ts",
+    "globalSetup": "<rootDir>/test/setupJest.ts",
     preset: 'jest-puppeteer',
-    // setupFilesAfterEnv: "<rootDir>/test/setupJest.ts",
+    setupFilesAfterEnv: "<rootDir>/test/setupJest.ts",
   }

package.json

@@ -15,7 +15,11 @@
     "install:chromium": "node node_modules/puppeteer/install.js",
     "build:version": "node ./version/git-version.js",
     "ionic-build": "ionic cap run android --prod",
-    "prepare": "husky install"
+    "prepare": "husky install",
+    "cypress:open": "cypress open",
+    "cypress:run": "cypress run",
+    "docker:build": "docker build -t gabinetedigital:0.0.0.1 .",
+    "docker:publish": "docker run -p gabinetedigital:0.0.0.1"
   },
   "private": true,
   "dependencies": {
@@ -208,6 +212,7 @@
     "cordova-plugin-media-capture": "^3.0.3",
     "cordova-plugin-network-information": "^3.0.0",
     "cordova-plugin-statusbar": "^2.4.2",
+    "cypress": "^12.13.0",
     "es6-promise-plugin": "^4.2.2",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",

src/app/services/toast.service.ts

@@ -29,7 +29,7 @@ export class ToastService {
     notification.className = 'notification'
     notification.innerHTML = `
 
-    <div class="main-content width-100 pa-20">
+    <div class="main-content width-100 pa-20 cy-message">
       <p class="message d-flex align-center success">
         <ion-icon slot="end" class="title-icon pr-10" src="/assets/images/nofitication-success.svg"></ion-icon>
         <p class="text">{{ message }}</p>

src/environments/environment.ts

@@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt'
 import { DevDev } from './suport/dev'
 
 
-export const environment: Environment = oaprDev
+export const environment: Environment = DevDev

src/environments/suport/dev.ts

@@ -3,7 +3,7 @@ import { Environment } from './../../app/models/envarioment'
 
 export const DevProd: Environment = {
   id:'3',
-  apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
+  apiURL: 'https://gdapi-dev.dyndns.info/api/',
   apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
   apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
   production: true,
@@ -24,11 +24,12 @@ export const DevProd: Environment = {
   dispatchPR: 'Despachos Titular',
 };
 
+
 export const DevDev: Environment = {
   id:'3',
-  apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
-  apiChatUrl: 'https://chat.doneit.co.ao/api/v1/',
-  apiWsChatUrl: 'wss://chat.doneit.co.ao/websocket',
+  apiURL: 'https://gdapi-dev.dyndns.info/api/',
+  apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
+  apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
   production: true,
   domain: 'gabinetedigital.local',
   defaultuser: 'paulo.pinto@gabinetedigital.local',

src/environments/suport/doneIt.ts

@@ -23,6 +23,7 @@ export const doneITProd: Environment = {
   VP: '',
   dispatchPR: 'Despachos Titular',
 };
+
 export const doneITDev: Environment = {
   id:'1',
   apiURL: 'https://API.DONEIT.CO.AO/api/',
@@ -30,8 +31,8 @@ export const doneITDev: Environment = {
   apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket',
   production: true,
   domain: 'equilibrium.co.ao',
-  defaultuser: 'evandre.dasilva@equilibrium.co.ao',
-  defaultuserpwd: 'Luand@1114',
+  defaultuser: 'peter.maquiran@equilibrium.co.ao',
+  defaultuserpwd: 'codcodccx',
   chatOffline: true,
   presidential: false,
   version: versionData,

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "affb73a60",
-  "SHA": "affb73a6072d318e3f7e3fca5c5e48cf86cee3fa",
+  "shortSHA": "2e88ed290",
+  "SHA": "2e88ed2902f0acd0958bc1075bddc28ef60b2edd",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Mon Jun 5 11:35:04 2023 +0100'",
-  "lastCommitMessage": "Peter changes 05/06",
-  "lastCommitNumber": "4959",
+  "lastCommitTime": "'Wed Jun 7 16:18:36 2023 +0100'",
+  "lastCommitMessage": "envirement change to oapr",
+  "lastCommitNumber": "4960",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 8 and 2 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/environments/environment.prod.ts\n\tmodified:   src/environments/environment.ts\n\tmodified:   src/environments/suport/dev.ts",
+  "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 9 and 2 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   .gitignore\n\tnew file:   cypress.config.js\n\tnew file:   cypress/.gitignore\n\tnew file:   cypress/fixtures/example.json\n\tnew file:   cypress/support/commands.js\n\tnew file:   cypress/support/e2e.js\n\tmodified:   jest.config.js\n\tmodified:   package-lock.json\n\tmodified:   package.json\n\tmodified:   src/app/services/toast.service.ts\n\tmodified:   src/environments/environment.ts\n\tmodified:   src/environments/suport/dev.ts\n\tmodified:   src/environments/suport/doneIt.ts",
   "changeAuthor": "eudes.inacio"
 }