Skip to content

Commit

Permalink
Merge pull request #29 from fkling/whitespace_fix
Browse files Browse the repository at this point in the history
Fix printing (fixes #28)
  • Loading branch information
fkling committed Jul 31, 2015
2 parents 7750627 + e3ee709 commit 04c4a9f
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 11 deletions.
11 changes: 11 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"parser": "babel-eslint",
"rules": {
"comma-dangle": 0,
"quotes": [2, "single", "avoid-escape"],
"strict": 0
},
"env": {
"node": true
}
}
11 changes: 5 additions & 6 deletions bin/__tests__/jscodeshift-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@
*
*/

/*global jest, describe, pit, expect*/

'use strict';
/*global jest, jasmine, describe, pit, expect*/
/*eslint camelcase: 0, no-unused-vars: 0*/

jest.autoMockOff();

// Increase default timeout (5000ms) for Travis
jasmine.getEnv().defaultTimeoutInterval = 15000;
jasmine.getEnv().defaultTimeoutInterval = 30000;

var child_process = require('child_process');
var fs = require('fs');
Expand Down Expand Up @@ -57,7 +56,7 @@ describe('jscodeshift CLI', () => {

pit('calls the transform and file information', () => {
var sourceA = createTempFileWith('a');
var sourceB = createTempFileWith('b');
var sourceB = createTempFileWith('b\n');
var sourceC = createTempFileWith('c');
var transformA = createTransformWith(
'return "transform" + fileInfo.source;'
Expand All @@ -70,7 +69,7 @@ describe('jscodeshift CLI', () => {
run(['--no-extensions', '-t', transformA, sourceA, sourceB]).then(
([stdout, stderr]) => {
expect(fs.readFileSync(sourceA).toString()).toBe('transforma');
expect(fs.readFileSync(sourceB).toString()).toBe('transformb');
expect(fs.readFileSync(sourceB).toString()).toBe('transformb\n');
}
),
run(['--no-extensions', '-t', transformB, sourceC]).then(
Expand Down
13 changes: 9 additions & 4 deletions src/__tests__/core-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
*
*/

'use strict';
/*global jest, describe, it, expect*/

jest.autoMockOff();
var core = require('../core');
var Collection = require('../Collection');
var recast = require('recast');
var b = recast.types.builders;
var NodePath = recast.types.NodePath;
Expand Down Expand Up @@ -46,8 +46,13 @@ describe('core API', function() {
});

it('throws if it gets an invalid value', function() {
expect(_ => core(42)).toThrow();
expect(_ => core({})).toThrow();
expect(() => core(42)).toThrow();
expect(() => core({})).toThrow();
});

it('returns the source as is if nothing was modified', function () {
var source = '\nvar foo;\n';
expect(core(source).toSource()).toEqual(source);
});

});
2 changes: 1 addition & 1 deletion src/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function fromAST(ast) {
}

function fromSource(source) {
return fromAST(recast.parse(source, {esprima: babel}).program);
return fromAST(recast.parse(source, {esprima: babel}));
}

/**
Expand Down

0 comments on commit 04c4a9f

Please sign in to comment.