Skip to content

Commit

Permalink
Fix integration_tests
Browse files Browse the repository at this point in the history
  • Loading branch information
thymikee committed Apr 23, 2017
1 parent f178b22 commit 50295d2
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

throw new Error(
`this error should not be a problem because` +
`this file is never required or executed`,
`this file is never required or executed`
);

// Flow annotations to make sure istanbul can instrument non ES6 source
Expand Down
6 changes: 3 additions & 3 deletions integration_tests/jasmine_async/__tests__/promise_it-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('promise it', () => {
return new Promise(resolve => {
if (this.someContextValue !== 'value') {
throw new Error(
'expected this.someContextValue to be set: ' + this.someContextValue,
'expected this.someContextValue to be set: ' + this.someContextValue
);
}
resolve();
Expand All @@ -55,7 +55,7 @@ describe('promise it', () => {
() => {
return new Promise(resolve => setTimeout(resolve, 10));
},
250,
250
);

// failing tests
Expand All @@ -64,6 +64,6 @@ describe('promise it', () => {
() => {
return new Promise(resolve => setTimeout(resolve, 100));
},
10,
10
);
});
2 changes: 1 addition & 1 deletion integration_tests/snapshot/__tests__/snapshot-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ describe('snapshot', () => {

it('cannot be used with .not', () => {
expect(() => expect('').not.toMatchSnapshot()).toThrow(
'Jest: `.not` cannot be used with `.toMatchSnapshot()`.',
'Jest: `.not` cannot be used with `.toMatchSnapshot()`.'
);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = {
module: tsc.ModuleKind.CommonJS,
},
path,
[],
[]
);
}
return src;
Expand Down
16 changes: 13 additions & 3 deletions scripts/prettier.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,24 @@ const defaultOptions = {
const config = {
default: {
ignore: ['**/node_modules/**'],
patterns: ['packages/*/src/**/', 'types/', 'integration_tests/**/'],
patterns: [
'packages/*/src/**/',
'types/',
'integration_tests/',
'integration_tests/__tests__/',
],
},
es5Compatible: {
ignore: ['**/node_modules/**', '**/coverage/**'],
ignore: [
'**/node_modules/**',
'**/coverage/**',
'integration_tests/*',
'integration_tests/__tests__/*',
],
options: {
'trailing-comma': 'es5',
},
patterns: ['examples/**/', 'scripts/**/'],
patterns: ['examples/**/', 'scripts/**/', 'integration_tests/**/'],
},
};

Expand Down

0 comments on commit 50295d2

Please sign in to comment.