Merge pull request #113 from allerta-vvf/patch-Actions

Patch Github Actions CI

.github/workflows/php.yml

@@ -47,7 +47,7 @@ jobs:
       run: |
         npm install
         ./node_modules/.bin/webpack --version
-        ./node_modules/.bin/webpack --config webpack.debug_bundle.js
+        ./node_modules/.bin/webpack --config webpack.prod.js
         ls dist
 
     - name: Shutdown Ubuntu MySQL (SUDO)
@@ -123,7 +123,7 @@ jobs:
         cd resources
         npm install
         ./node_modules/.bin/webpack --version
-        ./node_modules/.bin/webpack --config webpack.debug_bundle.js
+        ./node_modules/.bin/webpack --config webpack.prod.js
         ls dist
 
     - name: Validate composer.json and composer.lock

server/cypress/integration/d_users.spec.js

@@ -9,6 +9,7 @@ describe("User management", () => {
             .then((users) => {
                 cy.getApiKey().then((apiKey) => {
                     var i = 1
+                    var phone_number = "+1-202-555-0100"; // https://fakenumber.org/
                     users.forEach(user => {
                         console.log("User '"+user.name+"' number "+i);
                         if(i == 1){
@@ -33,6 +34,10 @@ describe("User management", () => {
                                 .clear()
                                 .type(user.password)
                                 .should('have.value', user.password)
+                            cy.get("input[name='phone_number']")
+                                .clear()
+                                .type(phone_number)
+                                .should('have.value', phone_number)
                             cy.get("input[name='birthday']")
                                 .clear()
                                 .type(user.birthday)
@@ -60,6 +65,7 @@ describe("User management", () => {
                                 name: user.name,
                                 username: user.username,
                                 password: user.password,
+                                phone_number: phone_number,
                                 birthday: user.birthday,
                                 chief: user.chief | 0,
                                 driver: user.driver | 0,
@@ -80,4 +86,4 @@ describe("User management", () => {
                 });
             })
     });
-})
+})

server/cypress/support/index.js

@@ -1,3 +1,5 @@
+Cypress.config('defaultCommandTimeout', 10000);
+
 //TODO: login remember me and better language support
 Cypress.Commands.add("login", (username="admin", password="correcthorsebatterystaple") => {
     cy.setCookie("forceLanguage", "en");
@@ -25,4 +27,4 @@ Cypress.Commands.add("getApiKey", (username="admin", password="correcthorsebatte
             console.log(response.body)
             return response.body.apiKey
         })
-})
+})