Skip to content

Commit fb409bb

Browse files
previprevi
authored
update dependencies, also add missing localized messages (#108)
* bump deps blockly 11, other * bump cypress * fix gallery (600), settings (700) e2e tests * add messages, remove console.log
1 parent 232c85c commit fb409bb

22 files changed

Lines changed: 8168 additions & 12573 deletions

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎.github/workflows/build_frontend.yml‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,20 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
14+
- name: Use Node.js 22.x
15+
uses: actions/setup-node@v4
16+
with:
17+
node-version: 22.x
18+
cache: 'npm'
1419
- name: Docker login
1520
run: docker login ghcr.io -u previ -p ${{ secrets.GHCR_BACKEND_STUB_RO }}
1621
- name: Run stub
1722
run: docker run -dp 5000:5000 --name backend-stub ghcr.io/coderbotorg/backend:stub-latest
1823
# Install NPM dependencies, cache them correctly
1924
# and run all Cypress tests
2025
- name: Cypress run
21-
uses: cypress-io/github-action@v4
26+
uses: cypress-io/github-action@v6
2227
with:
2328
#build: npm run build-test
2429
start: npm run test
@@ -36,7 +41,7 @@ jobs:
3641
- name: Clean up
3742
run: docker stop backend-stub && docker rm backend-stub
3843
- name: Archive coverage
39-
uses: actions/upload-artifact@v3
44+
uses: actions/upload-artifact@v4
4045
with:
4146
name: coverage
4247
path: coverage
@@ -45,16 +50,16 @@ jobs:
4550
runs-on: ubuntu-latest
4651
needs: test
4752
steps:
48-
- uses: actions/checkout@v3
49-
- name: Use Node.js 16.x
50-
uses: actions/setup-node@v3
53+
- uses: actions/checkout@v4
54+
- name: Use Node.js 22.x
55+
uses: actions/setup-node@v4
5156
with:
52-
node-version: 16
57+
node-version: 22.x
5358
cache: 'npm'
5459
- run: npm ci
5560
- run: npm run build --if-present
5661
- name: Archive dist
57-
uses: actions/upload-artifact@v3
62+
uses: actions/upload-artifact@v4
5863
with:
5964
name: dist
6065
path: dist
@@ -93,7 +98,7 @@ jobs:
9398
runs-on: ubuntu-latest
9499
needs: build
95100
steps:
96-
- uses: actions/checkout@v3 # Checking out the repo
101+
- uses: actions/checkout@v4 # Checking out the repo
97102
- name: Docker meta
98103
id: meta
99104
uses: docker/metadata-action@v4
@@ -113,7 +118,7 @@ jobs:
113118
# push event
114119
type=sha,enable=true,prefix=git-,format=short
115120
- name: Download dist artifact
116-
uses: actions/download-artifact@v3
121+
uses: actions/download-artifact@v4
117122
with:
118123
name: dist
119124
path: dist
@@ -133,7 +138,7 @@ jobs:
133138
username: ${{ github.actor }}
134139
password: ${{ secrets.GITHUB_TOKEN }}
135140
- name: Build and push
136-
uses: docker/build-push-action@v3
141+
uses: docker/build-push-action@v6
137142
with:
138143
push: true
139144
platforms: linux/arm/v7

‎.github/workflows/build_publish.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Create GitHub Release
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313
with:
1414
fetch-depth: 0
1515
- name: Create Release
@@ -36,19 +36,19 @@ jobs:
3636
needs: [release]
3737
strategy:
3838
matrix:
39-
node-version: [16.x]
39+
node-version: [22.x]
4040
runs-on: ubuntu-latest
4141
steps:
42-
- uses: actions/checkout@v2
42+
- uses: actions/checkout@v4
4343
- name: Use Node.js ${{ matrix.node-version }}
44-
uses: actions/setup-node@v2
44+
uses: actions/setup-node@v4
4545
with:
4646
node-version: ${{ matrix.node-version }}
4747
cache: 'npm'
4848
- run: npm ci
4949
- run: npm run build --if-present
5050

51-
- uses: actions/download-artifact@v1
51+
- uses: actions/download-artifact@v4
5252
with:
5353
name: info
5454

@@ -76,7 +76,7 @@ jobs:
7676
needs: [build]
7777
runs-on: ubuntu-latest
7878
steps:
79-
- uses: actions/download-artifact@v1
79+
- uses: actions/download-artifact@v4
8080
with:
8181
name: info
8282
- name: Set publish_info

‎cypress/e2e/300_activities.cy.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ describe('activities page', () => {
103103
cy.get('#button_index_2').find('button.remove').click()
104104
cy.get('#button_index_1').find('button.remove').click()
105105
cy.get('button#toolbox').click()
106-
cy.get('.blockly-toolbox-editor').find('#blockly-9').click()
106+
cy.get('.blockly-toolbox-editor').find('#blockly-g').click()
107107
cy.get('.blocklyDraggable').click({ force: true, multiple: true })
108108
cy.get('button#activity_save').click()
109109
cy.visit('http://localhost:8080')
@@ -141,7 +141,7 @@ describe('activities page', () => {
141141
cy.get('#card_font_ui').find('input[value*="opensans"]').click()
142142
cy.get('#card_font_editor').find('input[value*="robotomono"]').click()
143143
cy.get('button#toolbox').click()
144-
cy.get('.blockly-toolbox-editor').find('#blockly-3').click()
144+
cy.get('.blockly-toolbox-editor').find('#blockly-g').click()
145145
cy.get('.blocklyDraggable').click({ force: true, multiple: true })
146146
cy.get('button#activity_save').click()
147147
cy.visit('http://localhost:8080')
@@ -179,7 +179,7 @@ describe('activities page', () => {
179179
cy.get('input#category_name').type("Test category")
180180
cy.get('button#save_category').click()
181181
cy.get('.v-list-item-title').contains('Test category').click({ force: true })
182-
cy.get('.blockly-toolbox-editor').find('#blockly-1').click({ force: true })
182+
cy.get('.blockly-toolbox-editor').find('#blockly-g').click({ force: true })
183183
cy.get('.blocklyDraggable').click({ force: true, multiple: true })
184184
cy.get('button#activity_save').click()
185185
cy.visit('http://localhost:8080')

‎cypress/e2e/500_control.cy.js‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,17 @@ describe('load control page, verify stream is there', () => {
2626
cy.get('a.v-list-item[href*="control"]').click()
2727
cy.get('#app').click()
2828
cy.get('button.photo').click()
29+
cy.visit('http://localhost:8080')
30+
cy.get('.v-carousel').should('exist')
31+
cy.get('button.v-app-bar-nav-icon').should('exist').click()
32+
cy.get('a.v-list-item[href*="gallery"]').click()
33+
cy.get('#app').click()
34+
cy.get('.gallery').contains('DSC1').should('exist')
35+
cy.get('.v-main').contains('DSC1').click()
36+
cy.get('.v-card-title.details').contains('DSC1').should('exist')
37+
cy.get('.v-card-title.details').contains('DSC1').parents('.v-card').find('button.ok').click()
38+
cy.get('.v-main').contains('DSC1').parents('.v-card').find('.mdi-delete').click()
39+
cy.get('#gallery_photo_confirm_card').find('.ok').click()
2940
})
3041

3142
it('record a video', () => {
@@ -37,6 +48,18 @@ describe('load control page, verify stream is there', () => {
3748
cy.get('button.video').click()
3849
cy.wait(5000)
3950
cy.get('button.video').click()
51+
cy.visit('http://localhost:8080')
52+
cy.get('.v-carousel').should('exist')
53+
cy.get('button.v-app-bar-nav-icon').should('exist').click()
54+
cy.get('a.v-list-item[href*="gallery"]').click()
55+
cy.get('#app').click()
56+
cy.get('.gallery').contains('VID1').should('exist')
57+
cy.get('.v-main').contains('VID1').click()
58+
cy.get('.v-card-title.details').contains('VID1').should('exist')
59+
cy.get('.v-card-title.details').contains('VID1').parents('.v-card').find('button.ok').click()
60+
cy.get('.v-main').contains('VID1').parents('.v-card').find('.mdi-delete').click()
61+
cy.get('#gallery_photo_confirm_card').find('.ok').click()
62+
4063
})
4164
/*
4265
it('say a phrase', () => {
@@ -59,5 +82,5 @@ describe('load control page, verify stream is there', () => {
5982
cy.get('a.gallery').click()
6083
cy.url().should('include', '/gallery')
6184
})
62-
*/
85+
*/
6386
})

‎cypress/e2e/700_settings.cy.js‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,29 +65,32 @@ describe('load homepage', () => {
6565
cy.intercept('http://localhost:5000/wifi/v1/list_access_points', (req) => {
6666
req.reply({"ssids": [{"ssid": "wifi-home", "conn_type": "WPA2", "strength": 99}]})
6767
})
68-
cy.visit('http://localhost:8080')
68+
cy.visit('localhost:8080')
69+
cy.wait(1000)
6970
cy.get('.v-carousel').should('exist')
7071
cy.get('button.v-app-bar-nav-icon').should('exist').click()
7172
cy.get('a.v-list-item[href*="/settings"]').click()
7273
cy.get('#app').click()
7374
cy.get('button#1').click()
74-
cy.get('input#settings_movement_control_forward_speed').clear().type('90')
75-
cy.get('input#settings_movement_control_forward_elapse').clear().type('1')
76-
cy.get('input#settings_movement_control_turn_speed').clear().type('90')
77-
cy.get('input#settings_movement_control_turn_elapse').clear().type('1')
78-
cy.get('input#settings_movement_program_forward_speed').clear().type('90')
79-
cy.get('input#settings_movement_program_forward_elapse').clear().type('1')
80-
cy.get('input#settings_movement_program_turn_speed').clear().type('90')
81-
cy.get('input#settings_movement_program_turn_elapse').clear().type('1')
82-
cy.get('#save').click()
75+
cy.wait(1000)
76+
cy.get('input#settings_movement_control_forward_speed').type('{selectAll}90')
77+
cy.get('input#settings_movement_control_forward_elapse').type('{selectAll}1')
78+
cy.get('input#settings_movement_control_turn_speed').type('{selectAll}90')
79+
cy.get('input#settings_movement_control_turn_elapse').type('{selectAll}1')
80+
cy.get('input#settings_movement_program_forward_speed').type('{selectAll}90')
81+
cy.get('input#settings_movement_program_forward_elapse').type('{selectAll}1')
82+
cy.get('input#settings_movement_program_turn_speed').type('{selectAll}90')
83+
cy.get('input#settings_movement_program_turn_elapse').type('{selectAll}1')
84+
cy.get('button#save').click()
85+
cy.get('#snackId').should('exist')
8386
cy.visit('http://localhost:8080')
8487
cy.get('.v-carousel').should('exist')
8588
cy.get('button.v-app-bar-nav-icon').should('exist').click()
8689
cy.get('a.v-list-item[href*="/settings"]').click()
8790
cy.get('#app').click()
8891
cy.get('button#1').click()
89-
//cy.get('input#settings_movement_control_forward_speed').should('have.value', '90')
90-
//cy.get('input#settings_movement_control_forward_elapse').should('have.value', '1')
92+
cy.get('input#settings_movement_control_forward_speed').should('have.value', '90')
93+
cy.get('input#settings_movement_control_forward_elapse').should('have.value', '1')
9194
cy.get('input#settings_movement_control_turn_speed').should('have.value', '90')
9295
cy.get('input#settings_movement_control_turn_elapse').should('have.value', '1')
9396
cy.get('input#settings_movement_program_forward_speed').should('have.value', '90')
@@ -131,4 +134,4 @@ describe('load homepage', () => {
131134
cy.get('a.v-list-item[href*="/control"]').click()
132135
cy.get('#confirm_exit_dialog').should('exist')
133136
})
134-
})
137+
})

0 commit comments

Comments
 (0)