Skip to content

Commit 6a655bd

Browse files
danezfkling
authored andcommitted
Update devDependencies to babel 6 and jest 12 (#81)
1 parent bfd4da6 commit 6a655bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+164
-153
lines changed

.babelrc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
{
2-
"optional": ["runtime"]
2+
"presets": [
3+
"es2015",
4+
"stage-1"
5+
],
6+
"plugins": [
7+
"syntax-flow",
8+
"transform-flow-strip-types",
9+
"transform-runtime"
10+
]
311
}

bin/__tests__/react-docgen-test.js

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@
88
*
99
*/
1010

11-
/*global jasmine, jest, describe, pit, expect, afterEach*/
11+
/*global jasmine, jest, describe, it, expect, afterEach*/
1212

13-
// Increase default timeout (5000ms) for Travis
14-
jasmine.getEnv().defaultTimeoutInterval = 10000;
13+
const TEST_TIMEOUT = 120000;
1514

16-
jest.autoMockOff();
15+
jasmine.DEFAULT_TIMEOUT_INTERVAL = TEST_TIMEOUT;
16+
17+
jest.disableAutomock();
1718

1819
var fs = require('fs');
1920
var path = require('path');
2021
var rimraf = require('rimraf');
2122
var temp = require('temp');
22-
var spawn = require('cross-spawn-async');
23+
var spawn = require('cross-spawn');
2324

2425
function run(args, stdin) {
2526
return new Promise(resolve => {
@@ -32,6 +33,7 @@ function run(args, stdin) {
3233
docgen.stdout.on('data', data => stdout += data);
3334
docgen.stderr.on('data', data => stderr += data);
3435
docgen.on('close', () => resolve([stdout, stderr]));
36+
docgen.on('error', (e) => { throw e; });
3537
if (stdin) {
3638
docgen.stdin.write(stdin);
3739
}
@@ -88,37 +90,37 @@ describe('react-docgen CLI', () => {
8890
rimraf.sync(tempDir);
8991
}
9092
tempDir = null;
91-
tempComponents.length = 0;
92-
tempNoComponents.length = 0;
93+
tempComponents = [];
94+
tempNoComponents = [];
9395
});
9496

95-
pit('reads from stdin', () => {
97+
it('reads from stdin', () => {
9698
return run([], component).then(([stdout, stderr]) => {
9799
expect(stdout.length > 0).toBe(true);
98100
expect(stderr.length).toBe(0);
99101
});
100-
});
102+
}, TEST_TIMEOUT);
101103

102-
pit('reads files provided as command line arguments', () => {
104+
it('reads files provided as command line arguments', () => {
103105
createTempfiles();
104106
return run(tempComponents.concat(tempNoComponents)).then(
105107
([stdout, stderr]) => {
106108
expect(stdout).toContain('Component');
107109
expect(stderr).toContain('NoComponent');
108110
}
109111
);
110-
});
112+
}, TEST_TIMEOUT);
111113

112-
pit('reads directories provided as command line arguments', () => {
113-
tempDir = createTempfiles();
114+
it('reads directories provided as command line arguments', () => {
115+
createTempfiles();
114116
return run([tempDir]).then(([stdout, stderr]) => {
115117
expect(stdout).toContain('Component');
116118
expect(stderr).toContain('NoComponent');
117119
});
118-
});
120+
}, TEST_TIMEOUT);
119121

120-
pit('considers js and jsx by default', () => {
121-
tempDir = createTempfiles();
122+
it('considers js and jsx by default', () => {
123+
createTempfiles();
122124
createTempfiles('jsx');
123125
createTempfiles('foo');
124126
return run([tempDir]).then(([stdout, stderr]) => {
@@ -130,9 +132,9 @@ describe('react-docgen CLI', () => {
130132
expect(stderr).toContain('NoComponent.jsx');
131133
expect(stderr).not.toContain('NoComponent.foo');
132134
});
133-
});
135+
}, TEST_TIMEOUT);
134136

135-
pit('considers files with the specified extension', () => {
137+
it('considers files with the specified extension', () => {
136138
createTempfiles('foo');
137139
createTempfiles('bar');
138140

@@ -144,24 +146,23 @@ describe('react-docgen CLI', () => {
144146
expect(stderr).toContain('NoComponent.bar');
145147
};
146148

147-
148149
return Promise.all([
149150
run(['--extension=foo', '--extension=bar', tempDir]).then(verify),
150151
run(['-x', 'foo', '-x', 'bar', tempDir]).then(verify),
151152
]);
152-
});
153+
}, TEST_TIMEOUT);
153154

154-
pit('ignores files in node_modules and __tests__ by default', () => {
155+
it('ignores files in node_modules and __tests__ by default', () => {
155156
createTempfiles(null, 'node_modules');
156157
createTempfiles(null, '__tests__');
157158

158159
return run([tempDir]).then(([stdout, stderr]) => {
159160
expect(stdout).toBe('');
160161
expect(stderr).toBe('');
161162
});
162-
});
163+
}, TEST_TIMEOUT);
163164

164-
pit('ignores specified folders', () => {
165+
it('ignores specified folders', () => {
165166
createTempfiles(null, 'foo');
166167

167168
var verify = ([stdout, stderr]) => {
@@ -173,23 +174,23 @@ describe('react-docgen CLI', () => {
173174
run(['--ignore=foo', tempDir]).then(verify),
174175
run(['-i', 'foo', tempDir]).then(verify),
175176
]);
176-
});
177+
}, TEST_TIMEOUT);
177178

178-
pit('writes to stdout', () => {
179+
it('writes to stdout', () => {
179180
return run([], component).then(([stdout, stderr]) => {
180181
expect(stdout.length > 0).toBe(true);
181182
expect(stderr.length).toBe(0);
182183
});
183-
});
184+
}, TEST_TIMEOUT);
184185

185-
pit('writes to stderr', () => {
186+
it('writes to stderr', () => {
186187
return run([], '{}').then(([stdout, stderr]) => {
187188
expect(stderr.length > 0).toBe(true);
188189
expect(stdout.length).toBe(0);
189190
});
190-
});
191+
}, TEST_TIMEOUT);
191192

192-
pit('writes to a file if provided', function() {
193+
it('writes to a file if provided', () => {
193194
var outFile = temp.openSync();
194195
createTempfiles();
195196

@@ -202,10 +203,10 @@ describe('react-docgen CLI', () => {
202203
run(['--out=' + outFile.path, tempDir]).then(verify),
203204
run(['-o', outFile.path, tempDir]).then(verify),
204205
]);
205-
});
206+
}, TEST_TIMEOUT);
206207

207208
describe('--resolver', () => {
208-
pit('accepts the names of built in resolvers', () => {
209+
it('accepts the names of built in resolvers', () => {
209210
return Promise.all([
210211
// No option passed: same as --resolver=findExportedComponentDefinition
211212
run([
@@ -229,9 +230,9 @@ describe('react-docgen CLI', () => {
229230
expect(stdout).toContain('ComponentB');
230231
}),
231232
]);
232-
});
233+
}, TEST_TIMEOUT);
233234

234-
pit('accepts a path to a resolver function', () => {
235+
it('accepts a path to a resolver function', () => {
235236
return Promise.all([
236237
run([
237238
'--resolver='+path.join(__dirname, './example/customResolver.js'),
@@ -241,7 +242,7 @@ describe('react-docgen CLI', () => {
241242
expect(stdout).toContain('Custom');
242243
}),
243244
]);
244-
});
245+
}, TEST_TIMEOUT);
245246
});
246247

247248
});

bin/react-docgen.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var argv = require('nomnom')
5757
var async = require('async');
5858
var dir = require('node-dir');
5959
var fs = require('fs');
60-
var parser = require('../dist/main.js');
60+
var parser = require('../dist/main');
6161
var path = require('path');
6262

6363
var output = argv.out;
@@ -69,10 +69,10 @@ var resolver;
6969
if (argv.resolver) {
7070
switch(argv.resolver) {
7171
case 'findAllComponentDefinitions':
72-
resolver = require('../dist/resolver/findAllComponentDefinitions');
72+
resolver = require('../dist/resolver/findAllComponentDefinitions').default;
7373
break;
7474
case 'findExportedComponentDefinition':
75-
resolver = require('../dist/resolver/findExportedComponentDefinition');
75+
resolver = require('../dist/resolver/findExportedComponentDefinition').default;
7676
break;
7777
default: // treat value as module path
7878
resolver = require(path.resolve(process.cwd(), argv.resolver));

package.json

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"scripts": {
1515
"lint": "eslint src/",
1616
"watch": "babel src/ --out-dir dist/ --watch",
17-
"build": "rm -rf dist/ && babel src/ --out-dir dist/ --ignore __tests__,__mocks__",
17+
"build": "rimraf dist/ && babel src/ --out-dir dist/ --ignore __tests__,__mocks__",
1818
"prepublish": "npm run build",
1919
"preversion": "npm run lint",
2020
"test": "jest"
@@ -27,26 +27,29 @@
2727
"license": "BSD-3-Clause",
2828
"dependencies": {
2929
"async": "^1.4.2",
30-
"babel-runtime": "~5.8.25",
30+
"babel-runtime": "^6.9.2",
3131
"babylon": "~5.8.3",
3232
"doctrine": "^1.2.0",
3333
"node-dir": "^0.1.10",
3434
"nomnom": "^1.8.1",
35-
"recast": "^0.10.41"
35+
"recast": "^0.11.5"
3636
},
3737
"devDependencies": {
38-
"babel": "^5.6.23",
38+
"babel-cli": "^6.9.0",
3939
"babel-eslint": "^6.0.4",
40-
"babel-jest": "^5.3.0",
41-
"cross-spawn-async": "^2.1.9",
40+
"babel-jest": "^12.1.0",
41+
"babel-plugin-syntax-flow": "^6.8.0",
42+
"babel-plugin-transform-flow-strip-types": "^6.8.0",
43+
"babel-plugin-transform-runtime": "^6.9.0",
44+
"babel-preset-es2015": "^6.9.0",
45+
"babel-preset-stage-1": "^6.5.0",
46+
"cross-spawn": "^4.0.0",
4247
"eslint": "^2.10.2",
43-
"jest-cli": "^0.8.0",
48+
"jest-cli": "^12.1.1",
4449
"rimraf": "^2.3.2",
4550
"temp": "^0.8.1"
4651
},
4752
"jest": {
48-
"preprocessCachingDisabled": true,
49-
"scriptPreprocessor": "node_modules/babel-jest",
5053
"setupTestFrameworkScriptFile": "tests/setupTestFramework.js",
5154
"testPathDirs": [
5255
"bin",

src/__tests__/main-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
/*global jest, describe, beforeEach, it, expect*/
1212

13-
jest.autoMockOff();
13+
jest.disableAutomock();
1414

1515
describe('main', () => {
1616
var docgen, ERROR_MISSING_DEFINITION;
@@ -222,7 +222,7 @@ describe('main', () => {
222222
export default NotAComponent;
223223
`;
224224

225-
expect(() => docgen.parse(source)).toThrow(ERROR_MISSING_DEFINITION);
225+
expect(() => docgen.parse(source)).toThrowError(ERROR_MISSING_DEFINITION);
226226
});
227227
});
228228
});

src/__tests__/parse-test.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
/*global jest, describe, beforeEach, it, expect*/
1212

13-
jest.autoMockOff();
13+
jest.disableAutomock();
1414

1515
describe('parse', () => {
1616
var utils;
@@ -28,20 +28,20 @@ describe('parse', () => {
2828

2929
it('allows custom component definition resolvers', () => {
3030
var path = pathFromSource('({foo: "bar"})');
31-
var resolver = jest.genMockFunction().mockReturnValue(path);
32-
var handler = jest.genMockFunction();
31+
var resolver = jest.fn(() => path);
32+
var handler = jest.fn();
3333
parse('//empty', resolver, [handler]);
3434

3535
expect(resolver).toBeCalled();
3636
expect(handler.mock.calls[0][1]).toBe(path);
3737
});
3838

3939
it('errors if component definition is not found', () => {
40-
var resolver = jest.genMockFunction();
41-
expect(() => parse('//empty', resolver)).toThrow(ERROR_MISSING_DEFINITION);
40+
var resolver = jest.fn();
41+
expect(() => parse('//empty', resolver)).toThrowError(ERROR_MISSING_DEFINITION);
4242
expect(resolver).toBeCalled();
4343

44-
expect(() => parse('//empty', resolver)).toThrow(ERROR_MISSING_DEFINITION);
44+
expect(() => parse('//empty', resolver)).toThrowError(ERROR_MISSING_DEFINITION);
4545
expect(resolver).toBeCalled();
4646
});
4747

src/handlers/__tests__/componentDocblockHandler-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
/*global jest, describe, beforeEach, it, expect*/
1212

13-
jest.autoMockOff();
13+
jest.disableAutomock();
1414
jest.mock('../../Documentation');
1515

1616
describe('componentDocblockHandler', () => {
@@ -29,7 +29,7 @@ describe('componentDocblockHandler', () => {
2929
beforeEach(() => {
3030
({parse} = require('../../../tests/utils'));
3131
documentation = new (require('../../Documentation'));
32-
componentDocblockHandler = require('../componentDocblockHandler');
32+
componentDocblockHandler = require('../componentDocblockHandler').default;
3333
});
3434

3535
function test(definitionSrc, parse) { // eslint-disable-line no-shadow

src/handlers/__tests__/componentMethodsHandler-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
/*global jest, describe, beforeEach, it, expect*/
1212

13-
jest.autoMockOff();
13+
jest.disableAutomock();
1414
jest.mock('../../Documentation');
1515

1616
describe('componentMethodsHandler', () => {
@@ -21,7 +21,7 @@ describe('componentMethodsHandler', () => {
2121
beforeEach(() => {
2222
({parse} = require('../../../tests/utils'));
2323
documentation = new (require('../../Documentation'));
24-
componentMethodsHandler = require('../componentMethodsHandler');
24+
componentMethodsHandler = require('../componentMethodsHandler').default;
2525
});
2626

2727
function test(definition) {

src/handlers/__tests__/componentMethodsJsDocHandler-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010

1111
/*global jest, describe, beforeEach, it, expect*/
1212

13-
jest.autoMockOff();
13+
jest.disableAutomock();
1414

1515
describe('componentMethodsHandler', () => {
1616
let documentation;
1717
let componentMethodsJsDocHandler;
1818

1919
beforeEach(() => {
2020
documentation = new (require('../../Documentation'));
21-
componentMethodsJsDocHandler = require('../componentMethodsJsDocHandler');
21+
componentMethodsJsDocHandler = require('../componentMethodsJsDocHandler').default;
2222
});
2323

2424
it('stays the same when no docblock is present', () => {

src/handlers/__tests__/defaultPropsHandler-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
/*global jest, describe, beforeEach, it, expect*/
1212

13-
jest.autoMockOff();
13+
jest.disableAutomock();
1414
jest.mock('../../Documentation');
1515

1616
describe('defaultPropsHandler', () => {
@@ -21,7 +21,7 @@ describe('defaultPropsHandler', () => {
2121
beforeEach(() => {
2222
({parse} = require('../../../tests/utils'));
2323
documentation = new (require('../../Documentation'));
24-
defaultPropsHandler = require('../defaultPropsHandler');
24+
defaultPropsHandler = require('../defaultPropsHandler').default;
2525
});
2626

2727
function test(definition) {

0 commit comments

Comments
 (0)