From e1ad789c41bb31b8bc8750ffb240105fbde57c27 Mon Sep 17 00:00:00 2001
From: Harry Sarson <harry.sarson@hotmail.co.uk>
Date: Mon, 26 Feb 2018 23:50:32 +0000
Subject: [PATCH] Test that cjs tests still work when using es-modules.

Adds an integration test that uses cjs modules but is called with
the --es-modules flag.
---
 test/integration/es-modules.spec.js             | 17 +++++++++++++++++
 .../fixtures/es-modules/cjs-module.js           |  3 +++
 .../fixtures/es-modules/cjs-test.fixture.js     |  8 ++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 test/integration/fixtures/es-modules/cjs-module.js
 create mode 100644 test/integration/fixtures/es-modules/cjs-test.fixture.js

diff --git a/test/integration/es-modules.spec.js b/test/integration/es-modules.spec.js
index 145187847b..0313d78db4 100644
--- a/test/integration/es-modules.spec.js
+++ b/test/integration/es-modules.spec.js
@@ -35,4 +35,21 @@ describe('esModules', function () {
       });
     });
   });
+
+  describe('loading of cjs tests when running with --experimental-modules and --dynamic-import', function () {
+    it('should load cjs test', function (done) {
+      this.timeout(1000);
+      run('es-modules/cjs-test.fixture.js', ['--es-modules', '--experimental-modules', '--harmony-dynamic-import'], function (err, res) {
+        if (err) {
+          done(err);
+          return;
+        }
+        assert.equal(res.pending, 0);
+        assert.equal(res.passing, 1);
+        assert.equal(res.failing, 0);
+        assert.equal(res.code, 0);
+        done();
+      });
+    });
+  });
 });
diff --git a/test/integration/fixtures/es-modules/cjs-module.js b/test/integration/fixtures/es-modules/cjs-module.js
new file mode 100644
index 0000000000..4d9e827d91
--- /dev/null
+++ b/test/integration/fixtures/es-modules/cjs-module.js
@@ -0,0 +1,3 @@
+'use strict';
+
+exports.cjs = 'cjs';
diff --git a/test/integration/fixtures/es-modules/cjs-test.fixture.js b/test/integration/fixtures/es-modules/cjs-test.fixture.js
new file mode 100644
index 0000000000..20e4c1ef2c
--- /dev/null
+++ b/test/integration/fixtures/es-modules/cjs-test.fixture.js
@@ -0,0 +1,8 @@
+var cjs = require('./cjs-module').cjs;
+
+
+describe('testing common js require', function () {
+  it('should be able to require cjs modules', function () {
+    assert(cjs, 'cjs');
+  });
+});