Skip to content

Commit

Permalink
Merge d3595a0 into c9f5c8c
Browse files Browse the repository at this point in the history
  • Loading branch information
TheJaredWilcurt committed Sep 19, 2020
2 parents c9f5c8c + d3595a0 commit a36b6fe
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 19 deletions.
21 changes: 18 additions & 3 deletions .github/workflows/node.js.yml
Expand Up @@ -3,13 +3,14 @@

name: Node.js CI


on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
jobs:
build:

runs-on: ubuntu-latest
Expand All @@ -33,5 +34,19 @@ jobs:

- run: npm ci
- run: npm run lint
- run: npm run coverage
- run: jest --runInBand

- if: ${{ startsWith(matrix.node-version, '10.') || startsWith(matrix.node-version, '12.') }}
run: npm t

- if: ${{ startsWith(matrix.node-version, '14.') }}
env:
COVERALLS_REPO_TOKEN: "${{ secrets.COVERALLS_REPO_TOKEN }}"
COVERALLS_GIT_BRANCH: "${{ github.ref }}"
run: npm run coverage

# - if: ${{ startsWith(matrix.node-version, '14.') }}
# name: Coveralls GitHub Action
# uses: coverallsapp/github-action@v1.1.2
# with:
# github-token: ${{ secrets.github_token }}
# path-to-lcov: ./coverage/lcov.info
14 changes: 0 additions & 14 deletions .travis.yml

This file was deleted.

3 changes: 1 addition & 2 deletions package.json
Expand Up @@ -10,8 +10,7 @@
"test-debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --no-cache --runInBand -t \"ObjectAttribute\"",
"coverage": "jest --coverage --runInBand --coverageReporters=text-lcov | coveralls",
"validate": "npm run lint && npm test",
"remote": "git remote rm eddyerburgh && git remote",
"travis": "npm run lint && npm run coverage && jest --runInBand"
"remote": "git remote rm eddyerburgh && git remote"
},
"ManifestComments": [
"Pinned jest to 24.9.0. 25.1.0 is broken on Windows. Waiting for issue #9459 to be resolved."
Expand Down
9 changes: 9 additions & 0 deletions tests/src/helpers.test.js
@@ -1,3 +1,11 @@
test('Must contain at least one test', () => {
expect(1)
.toEqual(1);
});

/*
THIS WAS INTENTIONALLY COMMENTED OUT TO SEE IF COVERALLS LOWERS TEST COVERAGE ON THE BRANCH PROPERLY
const helpers = require('../../src/helpers.js');
describe('Helpers', () => {
Expand Down Expand Up @@ -55,3 +63,4 @@ describe('Helpers', () => {
});
});
});
*/
8 changes: 8 additions & 0 deletions tests/src/index.test.js
@@ -1,3 +1,10 @@
test('Must have at least 1 test', () => {
expect(1)
.toEqual(1);
});

/*
INTENTIONALLY COMMENTED OUT TO LOWER COVERAGE PERCENT
const helpers = require('../helpers.js');
const index = require('../../index.js');
Expand Down Expand Up @@ -46,3 +53,4 @@ describe('Index', () => {
.toMatchSnapshot();
});
});
*/

0 comments on commit a36b6fe

Please sign in to comment.