From 6cf318d60f8721f7ed371ce01478a032dfb74146 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Tue, 6 Jan 2015 10:37:11 +1100
Subject: [PATCH] add updated interop modules to tests

---
 .../es6-modules-amd/exports-from/expected.js   | 18 +++++++++++-------
 .../exports-from/expected.js                   | 18 +++++++++++-------
 .../imports-glob/expected.js                   |  8 +++++++-
 .../es6-modules-common/overview/expected.js    |  8 +++++++-
 .../es6-modules-umd/exports-from/expected.js   | 18 +++++++++++-------
 5 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/test/fixtures/transformation/es6-modules-amd/exports-from/expected.js b/test/fixtures/transformation/es6-modules-amd/exports-from/expected.js
index 8e2d46f06e..7483137265 100644
--- a/test/fixtures/transformation/es6-modules-amd/exports-from/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/exports-from/expected.js
@@ -1,17 +1,21 @@
 "use strict";
 
 define(["exports", "foo"], function (exports, _foo) {
+  var _interopRequire = function (obj) {
+    return obj && (obj["default"] || obj);
+  };
+
   (function (obj) {
     for (var i in obj) {
       exports[i] = obj[i];
     }
   })(_foo);
 
-  exports.foo = _foo.foo;
-  exports.foo = _foo.foo;
-  exports.bar = _foo.bar;
-  exports.bar = _foo.foo;
-  exports["default"] = _foo.foo;
-  exports["default"] = _foo.foo;
-  exports.bar = _foo.bar;
+  exports.foo = _interopRequire(_foo);
+  exports.foo = _interopRequire(_foo);
+  exports.bar = _interopRequire(_foo);
+  exports.bar = _interopRequire(_foo);
+  exports["default"] = _interopRequire(_foo);
+  exports["default"] = _interopRequire(_foo);
+  exports.bar = _interopRequire(_foo);
 });
diff --git a/test/fixtures/transformation/es6-modules-common/exports-from/expected.js b/test/fixtures/transformation/es6-modules-common/exports-from/expected.js
index feaeac94ee..23274cc873 100644
--- a/test/fixtures/transformation/es6-modules-common/exports-from/expected.js
+++ b/test/fixtures/transformation/es6-modules-common/exports-from/expected.js
@@ -1,15 +1,19 @@
 "use strict";
 
+var _interopRequire = function (obj) {
+  return obj && (obj["default"] || obj);
+};
+
 (function (obj) {
   for (var i in obj) {
     exports[i] = obj[i];
   }
 })(require("foo"));
 
-exports.foo = require("foo").foo;
-exports.foo = require("foo").foo;
-exports.bar = require("foo").bar;
-exports.bar = require("foo").foo;
-exports["default"] = require("foo").foo;
-exports["default"] = require("foo").foo;
-exports.bar = require("foo").bar;
+exports.foo = _interopRequire(require("foo"));
+exports.foo = _interopRequire(require("foo"));
+exports.bar = _interopRequire(require("foo"));
+exports.bar = _interopRequire(require("foo"));
+exports["default"] = _interopRequire(require("foo"));
+exports["default"] = _interopRequire(require("foo"));
+exports.bar = _interopRequire(require("foo"));
diff --git a/test/fixtures/transformation/es6-modules-common/imports-glob/expected.js b/test/fixtures/transformation/es6-modules-common/imports-glob/expected.js
index 3293bd0ebd..d885f06222 100644
--- a/test/fixtures/transformation/es6-modules-common/imports-glob/expected.js
+++ b/test/fixtures/transformation/es6-modules-common/imports-glob/expected.js
@@ -1,3 +1,9 @@
 "use strict";
 
-var foo = require("foo");
+var _interopRequireWildcard = function (obj) {
+  return obj && obj.constructor === Object ? obj : {
+    "default": obj
+  };
+};
+
+var foo = _interopRequireWildcard(require("foo"));
diff --git a/test/fixtures/transformation/es6-modules-common/overview/expected.js b/test/fixtures/transformation/es6-modules-common/overview/expected.js
index ed9175cbfb..9ce11f0b0d 100644
--- a/test/fixtures/transformation/es6-modules-common/overview/expected.js
+++ b/test/fixtures/transformation/es6-modules-common/overview/expected.js
@@ -1,5 +1,11 @@
 "use strict";
 
+var _interopRequireWildcard = function (obj) {
+  return obj && obj.constructor === Object ? obj : {
+    "default": obj
+  };
+};
+
 var _interopRequire = function (obj) {
   return obj && (obj["default"] || obj);
 };
@@ -12,7 +18,7 @@ require("./directory/foo-bar");
 
 var foo = _interopRequire(require("foo"));
 
-var foo = require("foo");
+var foo = _interopRequireWildcard(require("foo"));
 
 var bar = require("foo").bar;
 var bar = require("foo").foo;
diff --git a/test/fixtures/transformation/es6-modules-umd/exports-from/expected.js b/test/fixtures/transformation/es6-modules-umd/exports-from/expected.js
index 522d97be92..70af3ecb6f 100644
--- a/test/fixtures/transformation/es6-modules-umd/exports-from/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/exports-from/expected.js
@@ -7,17 +7,21 @@
     factory(exports, require("foo"));
   }
 })(function (exports, _foo) {
+  var _interopRequire = function (obj) {
+    return obj && (obj["default"] || obj);
+  };
+
   (function (obj) {
     for (var i in obj) {
       exports[i] = obj[i];
     }
   })(_foo);
 
-  exports.foo = _foo.foo;
-  exports.foo = _foo.foo;
-  exports.bar = _foo.bar;
-  exports.bar = _foo.foo;
-  exports["default"] = _foo.foo;
-  exports["default"] = _foo.foo;
-  exports.bar = _foo.bar;
+  exports.foo = _interopRequire(_foo);
+  exports.foo = _interopRequire(_foo);
+  exports.bar = _interopRequire(_foo);
+  exports.bar = _interopRequire(_foo);
+  exports["default"] = _interopRequire(_foo);
+  exports["default"] = _interopRequire(_foo);
+  exports.bar = _interopRequire(_foo);
 });