From c12e8122f83636be31a1d6f888fea30bbe682f6a Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Thu, 30 Apr 2015 20:11:32 +0100
Subject: [PATCH] fix browser tests

---
 src/babel/transformation/file/plugin-manager.js    |  2 +-
 src/babel/util.js                                  |  3 +++
 test/core/api.js                                   | 14 ++++++++++++++
 .../api/resolve-module-source/actual.js            |  3 ---
 .../api/resolve-module-source/expected.js          |  5 -----
 .../api/resolve-module-source/options.js           |  5 -----
 6 files changed, 18 insertions(+), 14 deletions(-)
 delete mode 100644 test/core/fixtures/transformation/api/resolve-module-source/actual.js
 delete mode 100644 test/core/fixtures/transformation/api/resolve-module-source/expected.js
 delete mode 100644 test/core/fixtures/transformation/api/resolve-module-source/options.js

diff --git a/src/babel/transformation/file/plugin-manager.js b/src/babel/transformation/file/plugin-manager.js
index 3ceafe5542..3cb2faf1cc 100644
--- a/src/babel/transformation/file/plugin-manager.js
+++ b/src/babel/transformation/file/plugin-manager.js
@@ -31,7 +31,7 @@ export default class PluginManager {
     // this is a plugin in the form of "foobar" or "foobar:after"
     // where the optional colon is the delimiter for plugin position in the transformer stack
 
-    var match = key.match(/^(.*?):(after|before)$/);
+    var match = name.match(/^(.*?):(after|before)$/);
     if (match) [, name, position] = match;
 
     var loc = util.resolveRelative(name) || util.resolveRelative(`babel-plugin-${name}`);
diff --git a/src/babel/util.js b/src/babel/util.js
index eb117b459a..3f6e12e756 100644
--- a/src/babel/util.js
+++ b/src/babel/util.js
@@ -43,6 +43,9 @@ export function resolve(loc: string) {
 var relativeMod;
 
 export function resolveRelative(loc: string) {
+  // we're in the browser, probably
+  if (typeof Module === "object") return null;
+
   if (!relativeMod) {
     relativeMod = new Module;
     relativeMod.paths = Module._nodeModulePaths(process.cwd());
diff --git a/test/core/api.js b/test/core/api.js
index 310b5a3029..c4f4a5607d 100644
--- a/test/core/api.js
+++ b/test/core/api.js
@@ -25,6 +25,20 @@ suite("api", function () {
     }, /Unknown helper foob/);
   });
 
+  test("resolveModuleSource", function () {
+    var actual = 'import foo from "foo-import-default";\nimport "foo-import-bare";\nexport { foo } from "foo-export-named";';
+    var expected = 'import foo from "resolved/foo-import-default";\nimport "resolved/foo-import-bare";\nexport { foo } from "resolved/foo-export-named";';
+
+    actual = transform(actual, {
+      blacklist: ["es6.modules", "strict"],
+      resolveModuleSource: function (originalSource) {
+        return "resolved/" + originalSource;
+      }
+    }).code.trim();
+
+    assert.equal(actual, expected);
+  });
+
   test("extra options", function () {
     var file1 = new File({ extra: { foo: "bar" } });
     assert.equal(file1.opts.extra.foo, "bar");
diff --git a/test/core/fixtures/transformation/api/resolve-module-source/actual.js b/test/core/fixtures/transformation/api/resolve-module-source/actual.js
deleted file mode 100644
index 3cde6441d4..0000000000
--- a/test/core/fixtures/transformation/api/resolve-module-source/actual.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { foo } from "foo-export-named";
-import foo from "foo-import-default";
-import "foo-import-bare";
diff --git a/test/core/fixtures/transformation/api/resolve-module-source/expected.js b/test/core/fixtures/transformation/api/resolve-module-source/expected.js
deleted file mode 100644
index cba3ca9973..0000000000
--- a/test/core/fixtures/transformation/api/resolve-module-source/expected.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-import foo from "resolved/foo-import-default";
-import "resolved/foo-import-bare";
-export { foo } from "resolved/foo-export-named";
diff --git a/test/core/fixtures/transformation/api/resolve-module-source/options.js b/test/core/fixtures/transformation/api/resolve-module-source/options.js
deleted file mode 100644
index e54ae43bfa..0000000000
--- a/test/core/fixtures/transformation/api/resolve-module-source/options.js
+++ /dev/null
@@ -1,5 +0,0 @@
-exports.blacklist = ["es6.modules"];
-
-exports.resolveModuleSource = function (originalSource) {
-  return "resolved/" + originalSource;
-};