From 895385c097d9a35f5df66076eb7202e6680c39fa Mon Sep 17 00:00:00 2001 From: Dave Laird Date: Fri, 11 Sep 2020 07:52:32 -0700 Subject: [PATCH 1/3] run some tests --- .github/workflows/ci.yml | 92 ++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c51679852..f4b01e344 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,59 +19,59 @@ on: - cron: '0 6 * * 0' jobs: - test-legacy-mocha: - name: Legacy Mocha Tests - ${{ matrix.node-version }} - runs-on: ubuntu-latest + # test-legacy-mocha: + # name: Legacy Mocha Tests - ${{ matrix.node-version }} + # runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - node-version: ['10', '12'] + # strategy: + # fail-fast: false + # matrix: + # node-version: ['10', '12'] - steps: - - name: Checkout Code - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: volta-cli/action@v1 - with: - node-version: ${{ matrix.node-version }} + # steps: + # - name: Checkout Code + # uses: actions/checkout@v2 + # - name: Use Node.js ${{ matrix.node-version }} + # uses: volta-cli/action@v1 + # with: + # node-version: ${{ matrix.node-version }} - # Remove test-packages folder so that we don't leak node_modules between apps - - name: Remove test-packages - run: | - rm -rf test-packages - - name: Yarn Install - working-directory: ./packages/ember-cli-fastboot - run: | - yarn install --ignore-engines --frozen-lockfile - - name: Run Mocha Tests - working-directory: ./packages/ember-cli-fastboot - run: | - volta install npm@4 - npm --version - yarn test:mocha + # # Remove test-packages folder so that we don't leak node_modules between apps + # - name: Remove test-packages + # run: | + # rm -rf test-packages + # - name: Yarn Install + # working-directory: ./packages/ember-cli-fastboot + # run: | + # yarn install --ignore-engines --frozen-lockfile + # - name: Run Mocha Tests + # working-directory: ./packages/ember-cli-fastboot + # run: | + # volta install npm@4 + # npm --version + # yarn test:mocha - test-ember: - name: Ember Tests - runs-on: ${{ matrix.os }} + # test-ember: + # name: Ember Tests + # runs-on: ${{ matrix.os }} - strategy: - matrix: - node-version: [12.x, 10.x] - os: [ubuntu-latest, windows-latest] + # strategy: + # matrix: + # node-version: [12.x, 10.x] + # os: [ubuntu-latest, windows-latest] - steps: - - name: Checkout Code - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - name: Yarn Install - run: yarn install --ignore-engines --frozen-lockfile - - name: Run Tests - run: yarn workspace ember-cli-fastboot test:ember + # steps: + # - name: Checkout Code + # uses: actions/checkout@v2 + # - name: Use Node.js ${{ matrix.node-version }} + # uses: actions/setup-node@v1 + # with: + # node-version: ${{ matrix.node-version }} + # - name: Yarn Install + # run: yarn install --ignore-engines --frozen-lockfile + # - name: Run Tests + # run: yarn workspace ember-cli-fastboot test:ember test-packages: From 1cc326e57b48d12a11ae704d2f2000b02abcef72 Mon Sep 17 00:00:00 2001 From: Dave Laird Date: Fri, 11 Sep 2020 08:06:03 -0700 Subject: [PATCH 2/3] run some tests --- test-packages/basic-app/test/server-assets-test.js | 2 +- test-packages/basic-app/test/shoebox-test.js | 2 +- test-packages/basic-app/test/simple-test.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test-packages/basic-app/test/server-assets-test.js b/test-packages/basic-app/test/server-assets-test.js index 14e9982bd..966376c82 100644 --- a/test-packages/basic-app/test/server-assets-test.js +++ b/test-packages/basic-app/test/server-assets-test.js @@ -6,7 +6,7 @@ const expect = require('chai').use(require('chai-string')).expect; const { startServer, stopServer } = require('../../test-libs'); describe('serve assets acceptance', function() { - this.timeout(30000); + this.timeout(60000); before(function() { return startServer(); diff --git a/test-packages/basic-app/test/shoebox-test.js b/test-packages/basic-app/test/shoebox-test.js index 92cfbf26a..7c93e9374 100644 --- a/test-packages/basic-app/test/shoebox-test.js +++ b/test-packages/basic-app/test/shoebox-test.js @@ -6,7 +6,7 @@ const expect = require('chai').use(require('chai-string')).expect; const { startServer, stopServer } = require('../../test-libs'); describe('shoebox - put', function() { - this.timeout(30000); + this.timeout(60000); before(function() { return startServer(); diff --git a/test-packages/basic-app/test/simple-test.js b/test-packages/basic-app/test/simple-test.js index 0047bf584..b6f8a558c 100644 --- a/test-packages/basic-app/test/simple-test.js +++ b/test-packages/basic-app/test/simple-test.js @@ -6,7 +6,7 @@ const expect = require('chai').use(require('chai-string')).expect; const { startServer, stopServer } = require('../../test-libs'); describe('simple acceptance', function() { - this.timeout(30000); + this.timeout(60000); before(function() { return startServer(); From cd9237f287b58c96ca82819a84499885df29bf05 Mon Sep 17 00:00:00 2001 From: Dave Laird Date: Fri, 11 Sep 2020 08:18:49 -0700 Subject: [PATCH 3/3] run all the tests --- .github/workflows/ci.yml | 92 ++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4b01e344..c51679852 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,59 +19,59 @@ on: - cron: '0 6 * * 0' jobs: - # test-legacy-mocha: - # name: Legacy Mocha Tests - ${{ matrix.node-version }} - # runs-on: ubuntu-latest + test-legacy-mocha: + name: Legacy Mocha Tests - ${{ matrix.node-version }} + runs-on: ubuntu-latest - # strategy: - # fail-fast: false - # matrix: - # node-version: ['10', '12'] + strategy: + fail-fast: false + matrix: + node-version: ['10', '12'] - # steps: - # - name: Checkout Code - # uses: actions/checkout@v2 - # - name: Use Node.js ${{ matrix.node-version }} - # uses: volta-cli/action@v1 - # with: - # node-version: ${{ matrix.node-version }} + steps: + - name: Checkout Code + uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: volta-cli/action@v1 + with: + node-version: ${{ matrix.node-version }} - # # Remove test-packages folder so that we don't leak node_modules between apps - # - name: Remove test-packages - # run: | - # rm -rf test-packages - # - name: Yarn Install - # working-directory: ./packages/ember-cli-fastboot - # run: | - # yarn install --ignore-engines --frozen-lockfile - # - name: Run Mocha Tests - # working-directory: ./packages/ember-cli-fastboot - # run: | - # volta install npm@4 - # npm --version - # yarn test:mocha + # Remove test-packages folder so that we don't leak node_modules between apps + - name: Remove test-packages + run: | + rm -rf test-packages + - name: Yarn Install + working-directory: ./packages/ember-cli-fastboot + run: | + yarn install --ignore-engines --frozen-lockfile + - name: Run Mocha Tests + working-directory: ./packages/ember-cli-fastboot + run: | + volta install npm@4 + npm --version + yarn test:mocha - # test-ember: - # name: Ember Tests - # runs-on: ${{ matrix.os }} + test-ember: + name: Ember Tests + runs-on: ${{ matrix.os }} - # strategy: - # matrix: - # node-version: [12.x, 10.x] - # os: [ubuntu-latest, windows-latest] + strategy: + matrix: + node-version: [12.x, 10.x] + os: [ubuntu-latest, windows-latest] - # steps: - # - name: Checkout Code - # uses: actions/checkout@v2 - # - name: Use Node.js ${{ matrix.node-version }} - # uses: actions/setup-node@v1 - # with: - # node-version: ${{ matrix.node-version }} - # - name: Yarn Install - # run: yarn install --ignore-engines --frozen-lockfile - # - name: Run Tests - # run: yarn workspace ember-cli-fastboot test:ember + steps: + - name: Checkout Code + uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - name: Yarn Install + run: yarn install --ignore-engines --frozen-lockfile + - name: Run Tests + run: yarn workspace ember-cli-fastboot test:ember test-packages: