more e2e tests

cypress/e2e/100_home.cy.js

@@ -20,20 +20,12 @@ describe('load homepage', () => {
     cy.get('a[href*="/gallery"]').should('exist')
     cy.get('a[href*="/settings"]').should('exist')
   })
-  /*
+
   it('checks home page links', () => {
     cy.visit('http://localhost:8080')
-    cy.get('a.v-btn[href*="/program"]').click()
-    cy.url().should('include', '/program')
-    cy.visit('http://localhost:8080')
-    cy.get('a.v-btn[href*="/docs"]').invoke('removeAttr', 'target').click()
-    cy.url().should('include', '/docs')
-    cy.visit('http://localhost:8080')
-    cy.get('a.v-btn[href*="/control"]').click()
-    cy.url().should('include', '/control')
-    cy.visit('http://localhost:8080')
-    cy.get('a.v-btn[href*="/settings"]').click()
-    cy.url().should('include', '/settings')
+    cy.get('a.v-btn[href*="/program"]').should('exist')
+    cy.get('a.v-btn[href*="/docs"]').should('exist')
+    cy.get('a.v-btn[href*="/control"]').should('exist')
+    cy.get('a.v-btn[href*="/settings"]').should('exist')
   })
-  */
 })

cypress/e2e/500_control.cy.js

@@ -1,4 +1,4 @@
-describe('load homepage', () => {
+describe('load control page, verify stream is there', () => {
   it('checks sidebar contents', () => {
     cy.visit('http://localhost:8080')
     cy.get('.v-carousel').should('exist')
@@ -7,15 +7,55 @@ describe('load homepage', () => {
     cy.get('img[src*="video/stream"]').should('exist')
   })
 
-  it('takes picture', () => {
+  it('move', () => {
+    cy.visit('http://localhost:8080')
+    cy.get('.v-carousel').should('exist')
+    cy.get('button.v-app-bar-nav-icon').should('exist').click()  
+    cy.get('a.v-list-item[href*="control"]').click()
+    cy.get('#app').click()
+    cy.get('button.up').click()
+    cy.get('button.left').click()
+    cy.get('button.right').click()
+    cy.get('button.down').click()
   })
 
-  it('say a phrase', () => {
+  it('takes a picture', () => {
+    cy.visit('http://localhost:8080')
+    cy.get('.v-carousel').should('exist')
+    cy.get('button.v-app-bar-nav-icon').should('exist').click()  
+    cy.get('a.v-list-item[href*="control"]').click()
+    cy.get('#app').click()
+    cy.get('button.photo').click()
   })
 
   it('record a video', () => {
+    cy.visit('http://localhost:8080')
+    cy.get('.v-carousel').should('exist')
+    cy.get('button.v-app-bar-nav-icon').should('exist').click()  
+    cy.get('a.v-list-item[href*="control"]').click()
+    cy.get('#app').click()
+    cy.get('button.video').click()
+    cy.get('button.video').click()
+  })
+
+  it('say a phrase', () => {
+    cy.visit('http://localhost:8080')
+    cy.get('.v-carousel').should('exist')
+    cy.get('button.v-app-bar-nav-icon').should('exist').click()  
+    cy.get('a.v-list-item[href*="control"]').click()
+    cy.get('#app').click()
+    cy.get('button.speak').click()
+    cy.get('#control_text_to_speech').clear().type('hello world!')
+    cy.get('#dialog_control_speak_title').find('button.ok').click()
   })
 
   it('opens gallery', () => {
+    cy.visit('http://localhost:8080')
+    cy.get('.v-carousel').should('exist')
+    cy.get('button.v-app-bar-nav-icon').should('exist').click()  
+    cy.get('a.v-list-item[href*="control"]').click()
+    cy.get('#app').click()
+    cy.get('a.gallery').click()
+    cy.url().should('include', '/gallery')
   })
 })

cypress/e2e/600_gallery.cy.js

@@ -8,15 +8,47 @@ describe('load homepage', () => {
     cy.get('h3').should('exist')
   })
 
-  it('checks photo exists, sees details', () => {
-  })
-
-  it('checks video exists, plays it', () => {
-  })
-
-  it('deletes existing photo', () => {
+  it('takes a picture, verify gallery and details, delete', () => {
+    cy.visit('http://localhost:8080')
+    cy.get('.v-carousel').should('exist')
+    cy.get('button.v-app-bar-nav-icon').should('exist').click()  
+    cy.get('a.v-list-item[href*="control"]').click()
+    cy.get('#app').click()
+    cy.get('button.photo').click()
+    cy.visit('http://localhost:8080')
+    cy.get('.v-carousel').should('exist')
+    cy.get('button.v-app-bar-nav-icon').should('exist').click()  
+    cy.get('a.v-list-item[href*="gallery"]').click()
+    cy.get('#app').click()
+    cy.get('.gallery').contains('DSC1').should('exist')
+    cy.get('.v-main').contains('DSC1').click()
+    cy.get('.v-card-title.details').contains('DSC1').should('exist')
+    cy.get('.v-card-title.details').contains('DSC1').parents('.v-card').find('button.ok').click()
+    cy.get('.v-main').contains('DSC1').parents('.v-card').find('.mdi-delete').click()
+    cy.get('#gallery_photo_confirm_card').find('.ok').click()
   })
 
-  it('deletes existing vide', () => {
+  it('takes a video, deletes is', () => {
+    cy.visit('http://localhost:8080')
+    cy.get('.v-carousel').should('exist')
+    cy.get('button.v-app-bar-nav-icon').should('exist').click()  
+    cy.get('a.v-list-item[href*="control"]').click()
+    cy.get('#app').click()
+    cy.get('button.video').click()
+    cy.wait(1000)
+    cy.get('button.video').click()
+    cy.visit('http://localhost:8080')
+    cy.get('.v-carousel').should('exist')
+    cy.get('button.v-app-bar-nav-icon').should('exist').click()  
+    cy.get('a.v-list-item[href*="gallery"]').click()
+    cy.get('#app').click()
+    /*
+    cy.get('.gallery').contains('VID1').should('exist')
+    cy.get('.v-main').contains('VID1').click()
+    cy.get('.v-card-title.details').contains('VID1').should('exist')
+    cy.get('.v-card-title.details').contains('VID1').parents('.v-card').find('button.ok').click()
+    cy.get('.v-main').contains('VID1').parents('.v-card').find('.mdi-delete').click()
+    cy.get('#gallery_photo_confirm_card').find('.ok').click()
+    */
   })
 })

cypress/e2e/700_settings.cy.js

@@ -50,11 +50,78 @@ describe('load homepage', () => {
     cy.get('#settings_password').clear()
     cy.get('#save').click()
   })
-  /*
+
   it('modifies most settings, valid values, save', () => {
+    cy.intercept('http://localhost:5000/wifi/v1/connection_status', (req) => {
+      req.reply({"wifi": false, "internet": true})
+    })
+    cy.intercept('http://localhost:5000/wifi/v1/list_access_points', (req) => {
+      req.reply({"ssids": [{"ssid": "wifi-home", "conn_type": "WPA2", "strength": 99}]})
+    })
+    cy.visit('http://localhost:8080')
+    cy.get('.v-carousel').should('exist')
+    cy.get('button.v-app-bar-nav-icon').should('exist').click()
+    cy.get('a.v-list-item[href*="/settings"]').click()
+    cy.get('#app').click()
+    cy.get('button#1').click()
+    cy.get('input#settings_movement_control_forward_speed').clear().type('90')
+    cy.get('input#settings_movement_control_forward_elapse').clear().type('1')
+    cy.get('input#settings_movement_control_turn_speed').clear().type('90')
+    cy.get('input#settings_movement_control_turn_elapse').clear().type('1')
+    cy.get('input#settings_movement_program_forward_speed').clear().type('90')
+    cy.get('input#settings_movement_program_forward_elapse').clear().type('1')
+    cy.get('input#settings_movement_program_turn_speed').clear().type('90')
+    cy.get('input#settings_movement_program_turn_elapse').clear().type('1')
+    cy.get('#save').click()
+    cy.visit('http://localhost:8080')
+    cy.get('.v-carousel').should('exist')
+    cy.get('button.v-app-bar-nav-icon').should('exist').click()
+    cy.get('a.v-list-item[href*="/settings"]').click()
+    cy.get('#app').click()
+    cy.get('button#1').click()
+    cy.get('input#settings_movement_control_forward_speed').should('have.value', '90')
+    cy.get('input#settings_movement_control_forward_elapse').should('have.value', '1')
+    cy.get('input#settings_movement_control_turn_speed').should('have.value', '90')
+    cy.get('input#settings_movement_control_turn_elapse').should('have.value', '1')
+    cy.get('input#settings_movement_program_forward_speed').should('have.value', '90')
+    cy.get('input#settings_movement_program_forward_elapse').should('have.value', '1')
+    cy.get('input#settings_movement_program_turn_speed').should('have.value', '90')
+    cy.get('input#settings_movement_program_turn_elapse').should('have.value', '1')
   })
 
   it('modifies most settings, invalid values, verify error message', () => {
+    cy.intercept('http://localhost:5000/wifi/v1/connection_status', (req) => {
+      req.reply({"wifi": false, "internet": true})
+    })
+    cy.intercept('http://localhost:5000/wifi/v1/list_access_points', (req) => {
+      req.reply({"ssids": [{"ssid": "wifi-home", "conn_type": "WPA2", "strength": 99}]})
+    })
+    cy.visit('http://localhost:8080')
+    cy.get('.v-carousel').should('exist')
+    cy.get('button.v-app-bar-nav-icon').should('exist').click()
+    cy.get('a.v-list-item[href*="/settings"]').click()
+    cy.get('#app').click()
+    cy.get('button#1').click()
+    cy.get('input#settings_movement_control_forward_speed').clear().type('1000')
+    cy.get('input#settings_movement_control_forward_speed').parents('.v-input').find('.v-messages')
+  })
+
+  it('modifies some settings, leave page whithout saving, verify "dirty" message', () => {
+    cy.intercept('http://localhost:5000/wifi/v1/connection_status', (req) => {
+      req.reply({"wifi": false, "internet": true})
+    })
+    cy.intercept('http://localhost:5000/wifi/v1/list_access_points', (req) => {
+      req.reply({"ssids": [{"ssid": "wifi-home", "conn_type": "WPA2", "strength": 99}]})
+    })
+    cy.visit('http://localhost:8080')
+    cy.get('.v-carousel').should('exist')
+    cy.get('button.v-app-bar-nav-icon').should('exist').click()
+    cy.get('a.v-list-item[href*="/settings"]').click()
+    cy.get('#app').click()
+    cy.get('button#1').click()
+    cy.get('input#settings_movement_control_forward_speed').clear().type('99')
+    cy.get('button.v-app-bar-nav-icon').should('exist').click()
+    cy.get('a.v-list-item[href*="/control"]').click()
+    cy.get('#confirm_exit_dialog').should('exist')
   })
-  */
 })

src/common/coderbot.js

@@ -246,20 +246,24 @@ class CoderBot {
     return this.$axios.post(`${this.CB}/system/halt`);
   }
 
-  getInfoAndStatus() {
+  getStatus() {
     const p1 = this.$axios.get(`${this.CB}/system/status`)
       .then((response) => {
         this.$store.commit('setStatus', response.data);
       }).catch((error) => {
         this.$store.commit('setStatus', null);
       });
+    return Promise.all([p1]);
+  }
+
+  getInfo() {
     const p2 = this.$axios.get(`${this.CB}/system/info`)
       .then((response) => {
         this.$store.commit('setInfo', response.data);
       }).catch(error => {
         this.$store.commit('setInfo', null);
       });
-    return Promise.all([p1, p2]);
+    return Promise.all([p2]);
   }
 
   deleteMusicPackage(pkgNameID) {
@@ -399,15 +403,15 @@ class CoderBot {
     return `${this.CB}/video/stream`;
   }
 
-  getPhotos() {
+  getMediaList() {
     return this.$axios.get(`${this.CB}/media`);
   }
 
-  deletePhoto(name) {
+  deleteMedia(name) {
     return this.$axios.delete(`${this.CB}/media/${name}`);
   }
 
-  getPhotoURL(name) {
+  getMediaURL(name) {
     return `${this.CB}/media/${name}`;
   }
 

src/components/BlocklyWorkspace.vue

@@ -105,10 +105,12 @@ export default {
           maxBlocks: settings.maxBlocks,
           zoom: {
             controls: true,
-            wheel: false,
+            wheel: true,
             startScale: 1.0,
-            maxScale: 1.5,
-            minScale: 0.2,
+            maxScale: 3,
+            minScale: 0.3,
+            scaleSpeed: 1.2,
+            pinch: true
           },
         },
       );

src/components/Control.vue

@@ -15,29 +15,29 @@
             <v-container class="d-flex align-center flex-column">
               <v-row>
                 <v-col class="d-flex align-center flex-column">
-                  <v-btn color="indigo" class="white--text jp-btn" v-on:mousedown="move(0)"
+                  <v-btn color="indigo" class="white--text jp-btn up" v-on:mousedown="move(0)"
                     v-on:mouseup="stop()">
                     <v-icon icon="mdi-arrow-up"></v-icon>
                   </v-btn>
                 </v-col>
               </v-row>
               <v-row>
                 <v-col>
-                  <v-btn color="indigo" class="white--text jp-btn" v-on:mousedown="move(1)"
+                  <v-btn color="indigo" class="white--text jp-btn left" v-on:mousedown="move(1)"
                     v-on:mouseup="stop()">
                     <v-icon icon="mdi-arrow-left"></v-icon>
                   </v-btn>
                 </v-col>
                 <v-col>
-                  <v-btn large color="indigo" class="white--text jp-btn" v-on:mousedown="move(2)"
+                  <v-btn large color="indigo" class="white--text jp-btn right" v-on:mousedown="move(2)"
                     v-on:mouseup="stop()">
                     <v-icon icon="mdi-arrow-right"></v-icon>
                   </v-btn>
                 </v-col>
               </v-row>
               <v-row>
                 <v-col>
-                  <v-btn color="indigo" class="white--text jp-btn" v-on:mousedown="move(3)"
+                  <v-btn color="indigo" class="white--text jp-btn down" v-on:mousedown="move(3)"
                     v-on:mouseup="stop()">
                     <v-icon icon="mdi-arrow-down"></v-icon>
                   </v-btn>
@@ -50,7 +50,7 @@
               </v-row>
               <v-row>
                 <v-col>
-                  <v-btn color="indigo" v-on:click="ttsdialog = true" class="controlBtn"
+                  <v-btn color="indigo" v-on:click="ttsdialog = true" class="controlBtn speak"
                     :disabled="!ttsBtnEnabled">
                     {{ $t("message.control_speak") }}
                     <v-icon icon="mdi-bullhorn-variant"></v-icon>
@@ -59,7 +59,7 @@
               </v-row>
               <v-row>
                 <v-col class="d-flex align-center flex-column">
-                  <v-btn color="indigo" class="controlBtn" v-on:click="takePhoto()"
+                  <v-btn color="indigo" class="controlBtn photo" v-on:click="takePhoto()"
                     :disabled="!photoBtnEnabled">
                     {{ $t("message.control_photo_take") }}
                     <v-icon icon="mdi-camera"></v-icon>
@@ -68,7 +68,7 @@
               </v-row>
               <v-row>
                 <v-col class="d-flex align-center flex-column">
-                  <v-btn color="indigo" class="controlBtn" v-on:click="videoHandler()"
+                  <v-btn color="indigo" class="controlBtn video" v-on:click="videoHandler()"
                     :disabled="!videoBtn.enabled">
                     {{ videoBtn.text }}
                     <v-icon dark>mdi-{{ videoBtn.icon }}</v-icon>
@@ -77,7 +77,7 @@
               </v-row>
               <v-row>
                 <v-col class="d-flex align-center flex-column">
-                  <v-btn color="indigo" class="controlBtn" to="/gallery">
+                  <v-btn color="indigo" class="controlBtn gallery" to="/gallery">
                     {{ $t("message.control_photo_gallery") }}
                     <v-icon icon="mdi-image-multiple"></v-icon>
                   </v-btn>
@@ -94,18 +94,18 @@
         {{ $t("message.close") }}
       </v-btn>
     </v-snackbar>
-    <v-dialog v-model="ttsdialog" width="600px">
+    <v-dialog v-model="ttsdialog" width="600px" id="dialog_control_speak_title">
       <v-card>
         <v-card-title>
-          <span class="headline">{{ $t("message.gallery_empty") }}</span>
+          <span class="headline">{{ $t("message.control_speak_title") }}</span>
         </v-card-title>
         <v-card-text>
-          <v-text-field v-model="ttstext" v-bind:label="$t('message.control_text_to_speech')" solo></v-text-field>
+          <v-text-field v-model="ttstext" v-bind:label="$t('message.control_text_to_speech')" solo id="control_text_to_speech"></v-text-field>
         </v-card-text>
         <v-card-actions>
           <v-spacer></v-spacer>
           <v-btn color="gray darken-1" text="text" @click="ttsdialog=false">{{ $t("message.cancel") }}</v-btn>
-          <v-btn color="green darken-1" text="text" @click="say()">{{ $t("message.control_speak") }}</v-btn>
+          <v-btn color="green darken-1 ok" text="text" @click="say()">{{ $t("message.control_speak") }}</v-btn>
         </v-card-actions>
       </v-card>
     </v-dialog>