Skip to content

Commit

Permalink
tests: fix
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-akait committed Oct 11, 2020
1 parent 101929d commit 6fa0abb
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Expand Up @@ -57,7 +57,7 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [10.x, 12.x, 14.x]
webpack-version: [next, latest]
webpack-version: [webpack-4, latest]

steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 4 additions & 2 deletions test/build-errors/errors.test.js
Expand Up @@ -22,7 +22,8 @@ describe('errors', () => {

expect(json['hash']).toBeDefined();
expect(json['errors']).toHaveLength(1);
expect(json['errors'][0].message).toMatch(/Can't resolve/);
// `message` for `webpack@5`
expect(json['errors'][0].message ? json['errors'][0].message : json['errors'][0]).toMatch(/Can't resolve/);
});

it('should store json to a file', (done) => {
Expand All @@ -43,7 +44,8 @@ describe('errors', () => {

expect(json['hash']).toBeDefined();
expect(json['errors']).toHaveLength(1);
expect(json['errors'][0].message).toMatch(/Can't resolve/);
// `message` for `webpack@5`
expect(json['errors'][0].message ? json['errors'][0].message : json['errors'][0]).toMatch(/Can't resolve/);

done();
});
Expand Down
6 changes: 3 additions & 3 deletions test/build-warnings/src/index.js
@@ -1,9 +1,9 @@
let module;
let obj;

try {
module = require('unknown');
obj = require('unknown');
} catch (e) {
// Ignore
}

export default module
export default obj
8 changes: 4 additions & 4 deletions test/build-warnings/warnings.test.js
Expand Up @@ -7,8 +7,6 @@ describe('warnings', () => {
it('should output by default', () => {
const { stdout, exitCode } = run(__dirname);

console.log(stdout);

expect(stdout).toMatch(/WARNING in/);
expect(stdout).toMatch(/Error: Can't resolve/);
expect(exitCode).toBe(0);
Expand All @@ -24,7 +22,8 @@ describe('warnings', () => {

expect(json['hash']).toBeDefined();
expect(json['warnings']).toHaveLength(1);
expect(json['warnings'][0].message).toMatch(/Can't resolve/);
// `message` for `webpack@5`
expect(json['warnings'][0].message ? json['warnings'][0].message : json['warnings'][0]).toMatch(/Can't resolve/);
});

it('should store json to a file', (done) => {
Expand All @@ -45,7 +44,8 @@ describe('warnings', () => {

expect(json['hash']).toBeDefined();
expect(json['warnings']).toHaveLength(1);
expect(json['warnings'][0].message).toMatch(/Can't resolve/);
// `message` for `webpack@5`
expect(json['warnings'][0].message ? json['warnings'][0].message : json['warnings'][0]).toMatch(/Can't resolve/);

done();
});
Expand Down

0 comments on commit 6fa0abb

Please sign in to comment.