Merge develop into feature/validateVariables

Author: github-actions[bot]

.github/workflows/autoupdate.yaml

@@ -1,8 +1,6 @@
 name: autoupdate
 on:
- push:
-   branches:
-     - feature/*
+    push: {}
 jobs:
     autoupdate:
         name: autoupdate

cypress/cypress-functions.ts

@@ -131,13 +131,15 @@ function copyCypressEnvConfigIfNecessary() {
     }
     console.info("Cypress Configuration: " + cypressJsonString)
 }
-function setGithubStatusAndUploadTestResults(failedTests: any[] | null, context: string, cb: (err: any) => void) {
-    // @ts-ignore
+function setGithubStatusAndUploadTestResults(failedTests: any[], context: string, cb: (err: any) => void) {
+    const test = failedTests[0];
     const failedTestTitle = failedTests[0].title[1]
-    // @ts-ignore
-    const errorMessage = failedTests[0].error
-    qmGit.setGithubStatus("failure", context, failedTestTitle + ": " +
-        errorMessage, getReportUrl(), function() {
+    const errorMessage = test.displayError
+    if(!failedTests[0].displayError || failedTests[0].displayError === "undefined"){
+        qmLog.le("No displayError on failedTests[0]: ", failedTests[0])
+    }
+    qmGit.setGithubStatus("failure", context, failedTestTitle + " err: " +
+        failedTests[0].error, getReportUrl(), function() {
         uploadMochawesome().then(function(urls) {
             console.error(errorMessage)
             cb(errorMessage)
@@ -348,6 +350,12 @@ export function runCypressTestsInParallel(cb?: (err: any) => void) {
     })
 }
 
+function moveToFront(specFileNames: string[], first: string) {
+    specFileNames.sort(function (x, y) {
+        return x == first ? -1 : y == first ? 1 : 0;
+    });
+}
+
 export function runCypressTests(cb?: (err: any) => void) {
     qmLog.logStartOfProcess("runCypressTests")
     deleteSuccessFile()
@@ -364,6 +372,8 @@ export function runCypressTests(cb?: (err: any) => void) {
             if (!specFileNames) {
                 throw new Error("No specFileNames in " + specsPath)
             }
+            moveToFront(specFileNames, "ionic_measurements_spec.js") // Fails a lot
+            moveToFront(specFileNames, "ionic_variables_spec.js") // Fails a lot
             for (let i = 0, p = Promise.resolve(); i < specFileNames.length; i++) {
                 const specName = specFileNames[i]
                 if (releaseStage === "ionic" && specName.indexOf("ionic_") === -1) {

cypress/examples/aliasing.spec.js

@@ -28,7 +28,7 @@ context('Aliasing', () => {
   it('.as() - alias a route for later use', () => {
     // Alias the route to wait for its response
     cy.server()
-    cy.route('GET', 'comments/*').as('getComment')
+    cy.intercept('GET', 'comments/*').as('getComment')
 
     // we have code that gets a comment when
     // the button is clicked in scripts.js

cypress/examples/files.spec.js

@@ -27,7 +27,7 @@ context('Files', () => {
     // when application makes an Ajax request matching "GET comments/*"
     // Cypress will intercept it and reply with object
     // from the "comment" alias
-    cy.route('GET', 'comments/*', '@comment').as('getComment')
+    cy.intercept('GET', 'comments/*', '@comment').as('getComment')
 
     // we have code that gets a comment when
     // the button is clicked in scripts.js
@@ -38,7 +38,7 @@ context('Files', () => {
       .and('include', 'Using fixtures to represent data')
 
     // you can also just write the fixture in the route
-    cy.route('GET', 'comments/*', 'fixture:example.json').as('getComment')
+    cy.intercept('GET', 'comments/*', 'fixture:example.json').as('getComment')
 
     // we have code that gets a comment when
     // the button is clicked in scripts.js
@@ -50,7 +50,7 @@ context('Files', () => {
 
     // or write fx to represent fixture
     // by default it assumes it's .json
-    cy.route('GET', 'comments/*', 'fx:example').as('getComment')
+    cy.intercept('GET', 'comments/*', 'fx:example').as('getComment')
 
     // we have code that gets a comment when
     // the button is clicked in scripts.js

cypress/examples/network_requests.spec.js

@@ -155,15 +155,15 @@ context('Network Requests', () => {
       })
   })
 
-  it('cy.route() - route responses to matching requests', () => {
+  it('cy.intercept() - route responses to matching requests', () => {
     // https://on.cypress.io/route
 
     let message = 'whoa, this comment does not exist'
 
     cy.server()
 
     // Listen to GET to comments/1
-    cy.route('GET', 'comments/*').as('getComment')
+    cy.intercept('GET', 'comments/*').as('getComment')
 
     // we have code that gets a comment when
     // the button is clicked in scripts.js
@@ -173,19 +173,19 @@ context('Network Requests', () => {
     cy.wait('@getComment').its('status').should('eq', 200)
 
     // Listen to POST to comments
-    cy.route('POST', '/comments').as('postComment')
+    cy.intercept('POST', '/comments').as('postComment')
 
     // we have code that posts a comment when
     // the button is clicked in scripts.js
     cy.get('.network-post').click()
     cy.wait('@postComment').should((xhr) => {
       expect(xhr.requestBody).to.include('email')
       expect(xhr.requestHeaders).to.have.property('Content-Type')
-      expect(xhr.responseBody).to.have.property('name', 'Using POST in cy.route()')
+      expect(xhr.responseBody).to.have.property('name', 'Using POST in cy.intercept()')
     })
 
     // Stub a response to PUT comments/ ****
-    cy.route({
+    cy.intercept({
       method: 'PUT',
       url: 'comments/*',
       status: 404,

cypress/examples/waiting.spec.js

@@ -21,7 +21,7 @@ context('Waiting', () => {
     cy.server()
 
     // Listen to GET to comments/1
-    cy.route('GET', 'comments/*').as('getComment')
+    cy.intercept('GET', 'comments/*').as('getComment')
 
     // we have code that gets a comment when
     // the button is clicked in scripts.js

cypress/integration/ionic_measurements_spec.js

@@ -3,7 +3,7 @@
 function saveMeasurement() {
     cy.get('#saveButton').click({force: true})
     cy.log('Waiting for measurement to post to API...')
-    cy.wait('@post-measurement', {timeout: 30000}).should('have.property', 'status', 201)
+    cy.wait('@post-measurement', {timeout: 30000}).its('response.statusCode').should('eq', 201)
     cy.log('Waiting for measurement with id to be stored...')
     cy.wait(500)
 }
@@ -67,6 +67,10 @@ function ratingValueToImage(value, valence) {
     return ratingImages[valence][value - 1]
 }
 
+function getTopMeasurementTitle() {
+    return cy.get('#historyItemTitle-0', {timeout: 40000})
+}
+
 /**
  * @param {number} [dosageValue]
  * @param variableName
@@ -93,16 +97,21 @@ function recordTreatmentMeasurementAndCheckHistoryPage(dosageValue, variableName
     saveMeasurement()
     cy.visitIonicAndSetApiUrl('/#/app/history-all-category/' + variableCategory)
     let treatmentStringNoQuotes = `${dosageValue} mg Aaa Test Treatment`
-    cy.get('#historyItemTitle-0', {timeout: 40000})
-        .should('contain', treatmentStringNoQuotes)
+    getTopMeasurementTitle().invoke('text').then((text) => {
+        //debugger
+        if(text.trim() !== treatmentStringNoQuotes){
+            cy.log("ERROR: top value should be " + treatmentStringNoQuotes + " but is " + text.trim())
+        }
+    })
+    getTopMeasurementTitle().should('contain', treatmentStringNoQuotes)
 }
 
 /**
  * @param {string} itemTitle
  */
 function editHistoryPageMeasurement(itemTitle) {
     cy.log(`Editing history measurement with title containing: ${itemTitle}`)
-    cy.get('#historyItemTitle-0', {timeout: 30000}).contains(itemTitle)
+    getTopMeasurementTitle().contains(itemTitle)
     cy.get('#action-sheet-button-0', {timeout: 30000}).click({force: true})
     cy.clickActionSheetButtonContaining('Edit')
     cy.wait(2000)
@@ -125,7 +134,7 @@ function deleteMeasurements(variableName) {
                     cy.wrap($el).click({force: true, timeout: 10000})
                     cy.clickActionSheetButtonContaining('Delete')
                     cy.wait('@measurements-delete', {timeout: 30000})
-                        .should('have.property', 'status', 204)
+                        .its('response.statusCode').should('eq', 204)
                     deleted = true
                 })
         }
@@ -139,7 +148,7 @@ function deleteMeasurements(variableName) {
                 cy.wrap($el).click()
                 cy.clickActionSheetButtonContaining('Delete')
                 cy.wait('@measurements-delete', {timeout: 30000})
-                    .should('have.property', 'status', 204)
+                    .its('response.statusCode').should('eq', 204)
                 deleted = true
             } else {
                 // It's a header
@@ -164,8 +173,8 @@ describe('Measurements', function () {
     it('Goes to edit measurement from history page', function () {
         cy.loginWithAccessTokenIfNecessary('/#/app/history-all-category/Anything')
         cy.wait('@measurements', {timeout: 30000})
-            .should('have.property', 'status', 200)
-        cy.get('#historyItemTitle-0', {timeout: 30000}).click({force: true})
+            .its('response.statusCode').should('eq', 200)
+        getTopMeasurementTitle().click({force: true})
         cy.clickActionSheetButtonContaining('Edit')
         cy.wait(2000)
         cy.url().should('include', 'measurement-add')
@@ -178,7 +187,7 @@ describe('Measurements', function () {
         checkChartsPage(variableName)
         goToHistoryForVariable(variableName, true)
         cy.wait('@measurements', {timeout: 30000})
-            .should('have.property', 'status', 200)
+            .its('response.statusCode').should('eq', 200)
         deleteMeasurements(variableName)
         cy.loginWithAccessTokenIfNecessary('/#/app/measurement-add-search')
         cy.searchAndClickTopResult(variableName, true)
@@ -212,7 +221,7 @@ describe('Measurements', function () {
         })
     })
     // Skipping because it fails randomly and can't reproduce failure locally
-    it('Record, edit, and delete a treatment measurement', function () {
+    it.only('Record, edit, and delete a treatment measurement', function () {
         let dosageValue = Math.floor(Math.random() * 100) + 10
         let variableName = 'Aaa Test Treatment'
         let variableCategoryName = 'Treatments'
@@ -228,7 +237,7 @@ describe('Measurements', function () {
         cy.url().should('include', '/#/app/history-all-category/' + variableCategoryName)
         cy.log('Check that deleted measurement is gone (must use does not equal instead of does not contain because a ' +
             'measurement of 0mg will be true if the value is 50mg)')
-        cy.get('#historyItemTitle-0', {timeout: 40000})
+        getTopMeasurementTitle()
             .should('not.contain', `${newDosageValue} mg ` + variableName)
     })
     // Seeing if skip fixes timeout problem

cypress/integration/ionic_reminders_spec.js

@@ -152,6 +152,10 @@ describe('Reminders', function () {
     cy.wait(1000) // Have to wait for save to complete
     goToCategoryInbox(variableCategoryName)
   }
+    it('Selects a reminder time', function () {
+        cy.loginWithAccessTokenIfNecessary('/#/app/reminder-add/', false)
+        setReminderTime(8, 15, 'AM')
+    })
   it('Creates a goals reminder and skip it', function () {
     let variableName = 'Aaa Test Reminder Goal Skip'
     let variableCategoryName = 'Goals'
@@ -218,7 +222,7 @@ describe('Reminders', function () {
     cy.get('#negativeRatingOptions4').click({ force: true, timeout: 30000 })
     cy.get('#menu-item-chart-search > a').click({ force: true, timeout: 20000 })
     cy.log("waiting for notifications to post after leaving inbox state before checking history...")
-      cy.wait('@post-notifications', {timeout: 30000}).should('have.property', 'status', 201)
+      cy.wait('@post-notifications', {timeout: 30000}).its('response.statusCode').should('eq', 201)
     cy.searchAndClickTopResult(variableName, true)
     cy.contains(`${variableName} Over Time`, {timeout: 30000})
     cy.get('#menu-more-button').click({ force: true })
@@ -236,10 +240,6 @@ describe('Reminders', function () {
     cy.wait(1000)
     deleteReminders(variableCategoryName)
   })
-  it('Selects a reminder time', function () {
-    cy.loginWithAccessTokenIfNecessary('/#/app/reminder-add/', false)
-    setReminderTime(8, 15, 'AM')
-  })
   it('Sets frequency to 30 minutes', function () {
     cy.loginWithAccessTokenIfNecessary('/#/app/reminder-add/', false)
     setFrequency('30 minutes')

cypress/integration/ionic_variables_spec.js

@@ -45,7 +45,7 @@ describe('Variables', function(){
         cy.get('.primary-outcome-variable-history > img:nth-of-type(3)').click({force: true})
         cy.get('#saveButton').click({force: true})
         cy.wait('@post-measurement', {timeout: 30000})
-            .should('have.property', 'status', 201)
+            .its('response.statusCode').should('eq', 201)
         cy.loginWithAccessTokenIfNecessary('/#/app/reminders-inbox', true)
         searchForMoodFromMagnifyingGlassIcon(variableName)
         cy.clickActionSheetButtonContaining('Charts')

cypress/support/commands.js

@@ -103,14 +103,10 @@ Cypress.Commands.add('visitWithApiUrlParam', (url, options = {}) => {
     cy.visit(url, options)
 })
 // noinspection JSUnusedLocalSymbols
-Cypress.Commands.add('visitApi', (url, options = {}, urlParams = {}) => {
-    cy.log(`=== visitWithApiUrlParam at ${url} ===`)
-    if(!API_HOST || API_HOST === 'undefined'){
-        throw 'Please set API_HOST env!'
-    }
-    if(!options.qs){
-        options.qs = {}
-    }
+Cypress.Commands.add('visitApi', (url, options = {}) => {
+    cy.log(`=== visitApi at ${url} ===`)
+    if(!API_HOST || API_HOST === 'undefined'){ throw 'Please set API_HOST env!' }
+    if(!options.qs){ options.qs = {} }
     options.qs.XDEBUG_SESSION_START = 'PHPSTORM'
     cy.visit("https://" + API_HOST + url, options)
 })
@@ -201,7 +197,7 @@ Cypress.Commands.add('enterNewUserCredentials', (clickAccept) => {
     cy.get('input[name="user_pass"]').click({force: true}).type('qwerty', {force: true})
     cy.get('input[name="user_pass_confirmation"]').click({force: true}).type('qwerty', {force: true})
     cy.get('input[type="submit"]').click({force: true})
-    if(clickAccept && oauthAppBaseUrl.indexOf("quantimo.do") === -1){
+    if(clickAccept && baseUrl.indexOf("quantimo.do") === -1){
         cy.log("OAUTH_APP_HOST is external so we have to click approve on oauth page")
         cy.get('#button-approve').click({force: true})
     }