diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..de349cb --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,22 @@ +name: test + +on: + pull_request: + push: + branches: + - master + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: dcodeIO/setup-node-nvm@v5 + with: + node-version: iojs + - run: npm install + - run: npm test + env: + # Node.js/io.js bundle their own CA store, which is now substantially out of date. io.js predated the `--use-openssl-ca` flag, so we have to disable TLS verification entirely. + # Upon upgrading this test suite to a modern Node.js version, this should be removed. + NODE_TLS_REJECT_UNAUTHORIZED: '0' diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 785901c..0000000 --- a/.travis.yml +++ /dev/null @@ -1,3 +0,0 @@ -language: node_js -node_js: - - iojs diff --git a/README.md b/README.md index d692b5b..0f3bcb4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# browserify-shim [![build status](https://secure.travis-ci.org/thlorenz/browserify-shim.svg?branch=master)](http://travis-ci.org/thlorenz/browserify-shim) +# browserify-shim ### Make CommonJS-Incompatible Files Browserifyable diff --git a/test/bundle-deps.js b/test/bundle-deps.js index a0563c4..49f8e0c 100644 --- a/test/bundle-deps.js +++ b/test/bundle-deps.js @@ -9,7 +9,7 @@ function bundleNcheck(relPath, t) { browserify( { ignoreGlobals: true }) .require(require.resolve(relPath)) .bundle(function (err, src) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } var ctx = { window: {}, console: console }; ctx.self = ctx.window; diff --git a/test/bundle-ember-bower.js b/test/bundle-ember-bower.js index fd64039..3620f22 100644 --- a/test/bundle-ember-bower.js +++ b/test/bundle-ember-bower.js @@ -16,7 +16,7 @@ function bundleNcheck(relPath, t) { browserify( { ignoreGlobals: true }) .require(require.resolve(relPath)) .bundle(function (err, src) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } var ctx = { window: {}, console: console }; ctx.self = ctx.window; diff --git a/test/bundle-expose-globals.js b/test/bundle-expose-globals.js index 10faa2d..e73c9df 100644 --- a/test/bundle-expose-globals.js +++ b/test/bundle-expose-globals.js @@ -14,7 +14,7 @@ function bundleNcheck(relPath, t) { browserify( { ignoreGlobals: true }) .require(require.resolve(relPath)) .bundle(function (err, src) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } var ctx = { window: { $: jquery }, console: console }; ctx.self = ctx.window; diff --git a/test/bundle-invalid-require.js b/test/bundle-invalid-require.js index 905529e..00b686c 100644 --- a/test/bundle-invalid-require.js +++ b/test/bundle-invalid-require.js @@ -15,7 +15,7 @@ function bundleNcheck(relPath, t) { browserify( { ignoreGlobals: true }) .require(require.resolve(relPath)) .bundle(function (err, src) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } var ctx = { window: {}, console: console }; ctx.self = ctx.window; diff --git a/test/bundle-multideps.js b/test/bundle-multideps.js index aab0a29..8eadaf7 100644 --- a/test/bundle-multideps.js +++ b/test/bundle-multideps.js @@ -13,7 +13,7 @@ function bundleNcheck(relPath, t) { browserify( { ignoreGlobals: true }) .require(require.resolve(relPath)) .bundle(function (err, src) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } var ctx = { window: {}, console: console }; ctx.self = ctx.window; diff --git a/test/bundle-nodeps.js b/test/bundle-nodeps.js index 80d2261..90ecb31 100644 --- a/test/bundle-nodeps.js +++ b/test/bundle-nodeps.js @@ -13,7 +13,7 @@ function bundleNcheck(relPath, t) { browserify( { ignoreGlobals: true }) .require(require.resolve(relPath)) .bundle(function (err, src) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } var ctx = { window: {}, console: console }; ctx.self = ctx.window; diff --git a/test/bundle-pack-bower.js b/test/bundle-pack-bower.js index 4fae0e2..f2c4b62 100644 --- a/test/bundle-pack-bower.js +++ b/test/bundle-pack-bower.js @@ -12,7 +12,7 @@ function bundleNcheck(relPath, t) { browserify( { ignoreGlobals: true }) .require(require.resolve(relPath)) .bundle(function (err, src) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } var ctx = { window: {}, console: console }; ctx.self = ctx.window; diff --git a/test/bundle-packs.js b/test/bundle-packs.js index 50c5c6e..3093b84 100644 --- a/test/bundle-packs.js +++ b/test/bundle-packs.js @@ -13,7 +13,7 @@ function bundleNcheck(relPath, t) { browserify( { ignoreGlobals: true }) .require(require.resolve(relPath)) .bundle(function (err, src) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } var ctx = { window: {}, console: console }; ctx.self = ctx.window; diff --git a/test/resolve-shims-bower.js b/test/resolve-shims-bower.js index 7a08183..9da48eb 100644 --- a/test/resolve-shims-bower.js +++ b/test/resolve-shims-bower.js @@ -15,7 +15,7 @@ function inspect(obj, depth) { test('\nresolving a bower component that is shimmed', function (t) { resolve(require.resolve('./bower/components/jquery-ui/ui/jquery.ui.position.js'), msgs, function (err, res) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } t.deepEqual(res.shim, { exports: null, depends: { jquery: 'jQuery' } }, 'resolves shim correctly') t.end(); }) diff --git a/test/resolve-shims.js b/test/resolve-shims.js index 7fcf51c..4e9dcd7 100644 --- a/test/resolve-shims.js +++ b/test/resolve-shims.js @@ -14,7 +14,7 @@ function inspect(obj, depth) { test('\nno dependencies, external shim file, no expose', function (t) { resolve(require.resolve('./nodeps/extshim/vendor/non-cjs'), msgs, function (err, res) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } t.deepEqual(res.shim, { exports: 'noncjs', depends: undefined }, 'resolves noncjs shim correctly') t.end(); }); @@ -22,7 +22,7 @@ test('\nno dependencies, external shim file, no expose', function (t) { test('\nno dependencies, external shim, exposed as non-cjs', function (t) { resolve(require.resolve('./nodeps/extshim-exposed/vendor/non-cjs'), msgs, function (err, res) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } t.deepEqual(res.shim, { exports: 'noncjs', depends: undefined }, 'resolves noncjs shim correctly') t.end(); }); @@ -30,7 +30,7 @@ test('\nno dependencies, external shim, exposed as non-cjs', function (t) { test('\nno dependencies, inline shims, no expose', function (t) { resolve(require.resolve('./nodeps/inlineshim/vendor/non-cjs'), msgs, function (err, res) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } t.deepEqual(res.shim, { exports: 'noncjs', depends: undefined }, 'resolves noncjs shim correctly') t.end(); }); @@ -38,7 +38,7 @@ test('\nno dependencies, inline shims, no expose', function (t) { test('\nno dependencies, inline shims, exposed as non-cjs', function (t) { resolve(require.resolve('./nodeps/inlineshim-exposed/vendor/non-cjs'), msgs, function (err, res) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } t.deepEqual(res.shim, { exports: 'noncjs', depends: undefined }, 'resolves noncjs shim correctly') t.end(); }); @@ -46,7 +46,7 @@ test('\nno dependencies, inline shims, exposed as non-cjs', function (t) { test('\nnon-cjs-dep depends on non-cjs, external shim file, all exposed', function (t) { resolve(require.resolve('./deps/extshim/vendor/non-cjs-dep'), msgs, function (err, res) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } t.deepEqual(res.shim , { exports: 'noncjsdep', depends: { 'non-cjs': 'noncjs' } } , 'resolves noncjsdep shim correctly' @@ -57,7 +57,7 @@ test('\nnon-cjs-dep depends on non-cjs, external shim file, all exposed', functi test('\nnon-cjs-dep depends on non-cjs, inline shims, all exposed', function (t) { resolve(require.resolve('./deps/inlineshim/vendor/non-cjs-dep'), msgs, function (err, res) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } t.deepEqual(res.shim , { exports: 'noncjsdep', depends: { 'non-cjs': 'noncjs' } } , 'resolves noncjsdep shim correctly' @@ -68,7 +68,7 @@ test('\nnon-cjs-dep depends on non-cjs, inline shims, all exposed', function (t) test('\nnon-cjs-dep depends on non-cjs and non-cjs-core, external shim file, all exposed except non-cjs-core', function (t) { resolve(require.resolve('./multideps/extshim/vendor/non-cjs-dep'), msgs, function (err, res) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } var corePath = path.join(__dirname, 'multideps/extshim/vendor/non-cjs-core.js'); var depends = { 'non-cjs': 'noncjs' } depends[corePath] = 'core'; @@ -83,7 +83,7 @@ test('\nnon-cjs-dep depends on non-cjs and non-cjs-core, external shim file, all test('\nnon-cjs-dep depends on non-cjs and non-cjs-core, inline shims, all exposed except non-cjs-core', function (t) { resolve(require.resolve('./multideps/inlineshim/vendor/non-cjs-dep'), msgs, function (err, res) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } var corePath = path.join(__dirname, 'multideps/inlineshim/vendor/non-cjs-core.js'); var depends = { 'non-cjs': 'noncjs' } depends[corePath] = 'core'; @@ -98,7 +98,7 @@ test('\nnon-cjs-dep depends on non-cjs and non-cjs-core, inline shims, all expos test('\nno dependencies, inline shims, no expose, $ exposified as jquery', function (t) { resolve(require.resolve('./exposify/inlineshim/vendor/non-cjs'), msgs, function (err, res) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } t.deepEqual(res.shim, { exports: 'noncjs', depends: undefined }, 'resolves noncjs shim correctly') t.deepEqual(res.exposeGlobals, { jquery: '$' }, 'resolves expose globals correctly') t.end(); @@ -107,7 +107,7 @@ test('\nno dependencies, inline shims, no expose, $ exposified as jquery', funct test('\nno dependencies, external shims, no expose, $ exposified as jquery', function (t) { resolve(require.resolve('./exposify/extshim/vendor/non-cjs'), msgs, function (err, res) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } t.deepEqual(res.shim, { exports: 'noncjs', depends: undefined }, 'resolves noncjs shim correctly') t.deepEqual(res.exposeGlobals, { jquery: '$' }, 'resolves expose globals correctly') t.end(); diff --git a/test/shim/shim-depends.js b/test/shim/shim-depends.js index 87d02a0..6b5e39b 100644 --- a/test/shim/shim-depends.js +++ b/test/shim/shim-depends.js @@ -65,7 +65,7 @@ test('\nwhen I shim "jquery" and shim a lib that depends on it', function (t) { var entry = require.resolve('./fixtures/entry-requires-depend-on-jquery'); runFirstBundle(entry, false, function (err, require_) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } var dep = require_(1); t.equal(dep.jqVersion, '1.8.3', 'when dependent gets required, $ is attached to the window'); @@ -79,7 +79,7 @@ test('\nwhen I shim "jquery" and shim a lib that depends on it, using fullPaths' var entry = require.resolve('./fixtures/entry-requires-depend-on-jquery'); runFirstBundle(entry, true, function (err, require_) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } var dep = require_(entry); t.equal(dep.jqVersion, '1.8.3', 'when dependent gets required, $ is attached to the window'); @@ -117,7 +117,7 @@ test('\nwhen I shim "jquery" and _ lib in debug mode and shim a lib that depends var entry = require.resolve('./fixtures/entry-requires-depend-on-jquery-and-_'); runSecondBundle(entry, false, function (err, require_) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } var dep = require_(1); @@ -132,7 +132,7 @@ test('\nwhen I shim "jquery" and _ lib in debug mode and shim a lib that depends var entry = require.resolve('./fixtures/entry-requires-depend-on-jquery-and-_'); runSecondBundle(entry, true, function (err, require_) { - if (err) { t.fail(err); return t.end(); } + if (err) { t.fail(err.message); return t.end(); } var dep = require_(entry);