Skip to content

Commit

Permalink
Refactor test packages to use ES modules instead of CJS (#5138)
Browse files Browse the repository at this point in the history
  • Loading branch information
chicoxyzzy authored and hzoo committed Jan 16, 2017
1 parent b315fc6 commit 292c3ca
Show file tree
Hide file tree
Showing 75 changed files with 247 additions and 126 deletions.
6 changes: 3 additions & 3 deletions packages/babel-code-frame/test/index.js
@@ -1,6 +1,6 @@
const assert = require("assert");
const chalk = require("chalk");
const codeFrame = require("..");
import assert from "assert";
import chalk from "chalk";
import codeFrame from "..";

describe("babel-code-frame", function () {
it("basic usage", function () {
Expand Down
12 changes: 6 additions & 6 deletions packages/babel-core/test/api.js
@@ -1,9 +1,9 @@
const babel = require("../lib/api/node");
const buildExternalHelpers = require("../lib/tools/build-external-helpers");
const sourceMap = require("source-map");
const assert = require("assert");
const Plugin = require("../lib/transformation/plugin");
const generator = require("babel-generator").default;
import * as babel from "../lib/api/node";
import buildExternalHelpers from "../lib/tools/build-external-helpers";
import sourceMap from "source-map";
import assert from "assert";
import Plugin from "../lib/transformation/plugin";
import generator from "babel-generator";

function assertIgnored(result) {
assert.ok(result.ignored);
Expand Down
8 changes: 4 additions & 4 deletions packages/babel-core/test/browserify.js
@@ -1,7 +1,7 @@
const browserify = require("browserify");
const assert = require("assert");
const path = require("path");
const vm = require("vm");
import browserify from "browserify";
import assert from "assert";
import path from "path";
import vm from "vm";

describe("browserify", function() {
it("babel/register may be used without breaking browserify", function(done) {
Expand Down
6 changes: 3 additions & 3 deletions packages/babel-core/test/config-chain.js
@@ -1,6 +1,6 @@
const assert = require("assert");
const path = require("path");
const buildConfigChain = require("../lib/transformation/file/options/build-config-chain");
import assert from "assert";
import path from "path";
import buildConfigChain from "../lib/transformation/file/options/build-config-chain";

function fixture() {
const args = [__dirname, "fixtures", "config"];
Expand Down
6 changes: 3 additions & 3 deletions packages/babel-core/test/evaluation.js
@@ -1,6 +1,6 @@
const traverse = require("babel-traverse").default;
const assert = require("assert");
const parse = require("babylon").parse;
import traverse from "babel-traverse";
import assert from "assert";
import { parse } from "babylon";

describe("evaluation", function () {
function addTest(code, type, value, notConfident) {
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-core/test/get-possible-plugin-names.js
@@ -1,5 +1,5 @@
const assert = require("assert");
const getPossiblePluginNames = require("../lib/helpers/get-possible-plugin-names");
import assert from "assert";
import getPossiblePluginNames from "../lib/helpers/get-possible-plugin-names";

describe("getPossiblePluginNames", function () {
it("adds the babel-plugin prefix", function() {
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-core/test/get-possible-preset-names.js
@@ -1,5 +1,5 @@
const assert = require("assert");
const getPossiblePresetNames = require("../lib/helpers/get-possible-preset-names");
import assert from "assert";
import getPossiblePresetNames from "../lib/helpers/get-possible-preset-names";

describe("getPossiblePresetNames", function () {
it("adds the babel-preset prefix", function() {
Expand Down
6 changes: 3 additions & 3 deletions packages/babel-core/test/path.js
@@ -1,6 +1,6 @@
const transform = require("../lib/api/node").transform;
const Plugin = require("../lib/transformation/plugin");
const chai = require("chai");
import { transform } from "../lib/api/node";
import Plugin from "../lib/transformation/plugin";
import chai from "chai";

describe("traversal path", function () {
it("replaceWithSourceString", function () {
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-core/test/plugins.js
@@ -1 +1,3 @@
require("babel-helper-transform-fixture-test-runner")(__dirname + "/fixtures/plugins", "plugins");
import runner from "babel-helper-transform-fixture-test-runner";

runner(`${__dirname}/fixtures/plugins`, "plugins");
10 changes: 5 additions & 5 deletions packages/babel-core/test/resolution.js
@@ -1,8 +1,8 @@
const assert = require("assert");
const async = require("async");
const babel = require("../lib/api/node");
const fs = require("fs");
const path = require("path");
import assert from "assert";
import async from "async";
import * as babel from "../lib/api/node";
import fs from "fs";
import path from "path";

// Test that plugins & presets are resolved relative to `filename`.
describe("addon resolution", function () {
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-core/test/transformation.js
@@ -1 +1,3 @@
require("babel-helper-transform-fixture-test-runner")(__dirname + "/fixtures/transformation", "transformation");
import runner from "babel-helper-transform-fixture-test-runner";

runner(`${__dirname}/fixtures/transformation`, "transformation");
6 changes: 3 additions & 3 deletions packages/babel-core/test/util.js
@@ -1,6 +1,6 @@
const assert = require("assert");
const util = require("../lib/util");
const t = require("babel-types");
import assert from "assert";
import * as util from "../lib/util";
import * as t from "babel-types";

describe("util", function () {
it("canCompile", function () {
Expand Down
39 changes: 20 additions & 19 deletions packages/babel-generator/test/index.js
@@ -1,12 +1,13 @@
const Whitespace = require("../lib/whitespace");
const Printer = require("../lib/printer");
const generate = require("../lib");
const assert = require("assert");
const parse = require("babylon").parse;
const chai = require("chai");
const t = require("babel-types");
const fs = require("fs");
const path = require("path");
import Whitespace from "../lib/whitespace";
import Printer from "../lib/printer";
import generate from "../lib";
import assert from "assert";
import { parse } from "babylon";
import chai from "chai";
import * as t from "babel-types";
import fs from "fs";
import path from "path";
import fixtures from "babel-helper-fixtures";

describe("generation", function () {
it("completeness", function () {
Expand Down Expand Up @@ -39,7 +40,7 @@ describe("generation", function () {
}
};

const generated = generate.default(combinedAst, { sourceMaps: true }, sources);
const generated = generate(combinedAst, { sourceMaps: true }, sources);

chai.expect(generated.map).to.deep.equal({
version: 3,
Expand Down Expand Up @@ -140,7 +141,7 @@ describe("generation", function () {
id2.name += "2";
id2.loc.identiferName = "bar";

const generated = generate.default(ast, {
const generated = generate(ast, {
filename: "inline",
sourceFileName: "inline",
sourceMaps: true
Expand Down Expand Up @@ -191,7 +192,7 @@ describe("generation", function () {
const code = "function hi (msg) { console.log(msg); }\n";

const ast = parse(code, { filename: "a.js" }).program;
const generated = generate.default(ast, {
const generated = generate(ast, {
sourceFileName: "a.js",
sourceMaps: true,
});
Expand All @@ -209,7 +210,7 @@ describe("programmatic generation", function() {
it("numeric member expression", function() {
// Should not generate `0.foo`
const mem = t.memberExpression(t.numericLiteral(60702), t.identifier("foo"));
new Function(generate.default(mem).code);
new Function(generate(mem).code);
});

it("nested if statements needs block", function() {
Expand All @@ -225,7 +226,7 @@ describe("programmatic generation", function() {
t.expressionStatement(t.stringLiteral("alt"))
);

const ast = parse(generate.default(ifStatement).code);
const ast = parse(generate(ifStatement).code);
assert.equal(ast.program.body[0].consequent.type, "BlockStatement");
});

Expand All @@ -235,7 +236,7 @@ describe("programmatic generation", function() {
[t.directive(t.directiveLiteral("use strict"))]
);

const output = generate.default(blockStatement).code;
const output = generate(blockStatement).code;
assert.equal(output, [
"{",
" \"use strict\";",
Expand All @@ -255,7 +256,7 @@ describe("programmatic generation", function() {
null
);

const output = generate.default(objectStatement).code;
const output = generate(objectStatement).code;
assert.equal(output, [
"{",
" bar: string;",
Expand All @@ -275,7 +276,7 @@ describe("programmatic generation", function() {
]
);

const output = generate.default(objectStatement).code;
const output = generate(objectStatement).code;

assert.equal(output, [
"{",
Expand All @@ -292,7 +293,7 @@ describe("whitespace", function () {
});
});

const suites = require("babel-helper-fixtures").default(__dirname + "/fixtures");
const suites = fixtures(`${__dirname}/fixtures`);

suites.forEach(function (testSuite) {
describe("generation/" + testSuite.title, function () {
Expand All @@ -309,7 +310,7 @@ suites.forEach(function (testSuite) {
strictMode: false,
sourceType: "module",
});
const result = generate.default(actualAst, task.options, actualCode);
const result = generate(actualAst, task.options, actualCode);

if (!expect.code && result.code && fs.statSync(path.dirname(expect.loc)).isDirectory() && !process.env.CI) {
console.log(`New test file created: ${expect.loc}`);
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-plugin-check-es2015-constants/test/index.js
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-decorators/test/index.js
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-do-expressions/test/index.js
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-es2015-classes/test/index.js
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-es2015-for-of/test/index.js
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-es2015-spread/test/index.js
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);
@@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname);
import runner from "babel-helper-plugin-test-runner";

runner(__dirname);

0 comments on commit 292c3ca

Please sign in to comment.