rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore: re-enable flaky tests (#2591)

Browse Source 
* chore: re-enable flaky tests

* chore: re-enable vault tests in ci

* chore: add missing dep

* chore: fix building web on PR

* chore: add sleep to allow deleting account to propagate
This commit is contained in:
Karol Sójko
2023-10-18 13:48:14 +02:00
committed by GitHub
parent d39d5da17e
commit ac353a47ba
5 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
.github/workflows/publish.yml vendored
View File

@@ -84,24 +84,24 @@ jobs:
trigger_workflow: true trigger_workflow: true
wait_workflow: true wait_workflow: true
# e2e-vaults: e2e-vaults:
# name: E2E Vaults Test Suite name: E2E Vaults Test Suite
# needs: build-docker needs: build-docker
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - name: Run E2E vaults test suite - name: Run E2E vaults test suite
# if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}" if: "${{ contains(github.event.head_commit.message, 'skip e2e') == false }}"
# uses: convictional/trigger-workflow-and-wait@master uses: convictional/trigger-workflow-and-wait@master
# with: with:
# owner: standardnotes owner: standardnotes
# repo: server repo: server
# github_token: ${{ secrets.CI_PAT_TOKEN }} github_token: ${{ secrets.CI_PAT_TOKEN }}
# workflow_file_name: e2e-test-suite.yml workflow_file_name: e2e-test-suite.yml
# wait_interval: 30 wait_interval: 30
# client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "vaults", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}' client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "vaults", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}'
# propagate_failure: true propagate_failure: true
# trigger_workflow: true trigger_workflow: true
# wait_workflow: true wait_workflow: true
publish: publish:
name: Publish to NPM name: Publish to NPM

36
.github/workflows/snjs.pr.yml vendored
View File

@@ -37,7 +37,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: yarn install --immutable run: yarn install --immutable
- name: Build - name: Build
run: yarn build:snjs run: yarn build:web
- name: ESLint - name: ESLint
run: yarn lint run: yarn lint
- name: Test - name: Test
@@ -91,20 +91,20 @@ jobs:
trigger_workflow: true trigger_workflow: true
wait_workflow: true wait_workflow: true
# e2e-vaults: e2e-vaults:
# name: E2E Vaults Test Suite name: E2E Vaults Test Suite
# needs: build-docker needs: build-docker
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - name: Run E2E vaults test suite - name: Run E2E vaults test suite
# uses: convictional/trigger-workflow-and-wait@master uses: convictional/trigger-workflow-and-wait@master
# with: with:
# owner: standardnotes owner: standardnotes
# repo: server repo: server
# github_token: ${{ secrets.CI_PAT_TOKEN }} github_token: ${{ secrets.CI_PAT_TOKEN }}
# workflow_file_name: e2e-test-suite.yml workflow_file_name: e2e-test-suite.yml
# wait_interval: 30 wait_interval: 30
# client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "vaults", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}' client_payload: '{"snjs_image_tag": "${{ github.sha }}", "suite": "vaults", "author": "${{ github.actor }}", "ref_name": "app:${{ github.ref }}"}'
# propagate_failure: true propagate_failure: true
# trigger_workflow: true trigger_workflow: true
# wait_workflow: true wait_workflow: true

3
packages/clipper/package.json
View File

@@ -32,6 +32,7 @@
"webpack": "*" "webpack": "*"
}, },
"dependencies": { "dependencies": {
"@mozilla/readability": "^0.4.2" "@mozilla/readability": "^0.4.2",
"@standardnotes/snjs": "workspace:^"
} }
} }

4
packages/snjs/mocha/vaults/surviving.test.js
View File

@@ -5,7 +5,7 @@ import * as Collaboration from '../lib/Collaboration.js'
chai.use(chaiAsPromised) chai.use(chaiAsPromised)
const expect = chai.expect const expect = chai.expect
describe.skip('designated survival', function () { describe('designated survival', function () {
this.timeout(Factory.ThirtySecondTimeout) this.timeout(Factory.ThirtySecondTimeout)
let context let context
@@ -337,6 +337,8 @@ describe.skip('designated survival', function () {
Factory.handlePasswordChallenges(context.application, context.password) Factory.handlePasswordChallenges(context.application, context.password)
await context.application.user.deleteAccount() await context.application.user.deleteAccount()
await Factory.sleep(2)
await secondContext.syncAndAwaitNotificationsProcessing() await secondContext.syncAndAwaitNotificationsProcessing()
await thirdContext.syncAndAwaitNotificationsProcessing() await thirdContext.syncAndAwaitNotificationsProcessing()

3
yarn.lock
View File

@@ -4232,6 +4232,7 @@ __metadata:
resolution: "@standardnotes/clipper@workspace:packages/clipper" resolution: "@standardnotes/clipper@workspace:packages/clipper"
dependencies: dependencies:
"@mozilla/readability": ^0.4.2 "@mozilla/readability": ^0.4.2
"@standardnotes/snjs": "workspace:^"
"@standardnotes/web": "workspace:*" "@standardnotes/web": "workspace:*"
"@types/webextension-polyfill": ^0.10.0 "@types/webextension-polyfill": ^0.10.0
babel-loader: ^9.1.0 babel-loader: ^9.1.0
@@ -4823,7 +4824,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@standardnotes/snjs@^2.41.1, @standardnotes/snjs@workspace:*, @standardnotes/snjs@workspace:packages/snjs": "@standardnotes/snjs@^2.41.1, @standardnotes/snjs@workspace:*, @standardnotes/snjs@workspace:^, @standardnotes/snjs@workspace:packages/snjs":
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@standardnotes/snjs@workspace:packages/snjs" resolution: "@standardnotes/snjs@workspace:packages/snjs"
dependencies: dependencies: