From b4ee31322e39037ad361f62e8907f45fb6c1f1a6 Mon Sep 17 00:00:00 2001
From: Drew Gross <drew.a.gross@gmail.com>
Date: Wed, 23 Mar 2016 18:32:40 -0700
Subject: [PATCH] Fix tests

---
 spec/index.spec.js            | 6 +++---
 src/Adapters/AdapterLoader.js | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/spec/index.spec.js b/spec/index.spec.js
index cccbc8e1..5622730b 100644
--- a/spec/index.spec.js
+++ b/spec/index.spec.js
@@ -105,7 +105,7 @@ describe('server', () => {
       fileKey: 'test',
       verifyUserEmails: true,
       emailAdapter: {
-        module: './Email/SimpleMailgunAdapter',
+        module: 'parse-server-simple-mailgun-adapter',
         options: {
           fromAddress: 'parse@example.com',
           apiKey: 'k',
@@ -130,7 +130,7 @@ describe('server', () => {
       collectionPrefix: 'test_',
       fileKey: 'test',
       verifyUserEmails: true,
-      emailAdapter: './Email/SimpleMailgunAdapter',
+      emailAdapter: 'parse-server-simple-mailgun-adapter',
       publicServerURL: 'http://localhost:8378/1'
     })).toThrow('SimpleMailgunAdapter requires an API Key, domain, and fromAddress.');
     done();
@@ -150,7 +150,7 @@ describe('server', () => {
       fileKey: 'test',
       verifyUserEmails: true,
       emailAdapter: {
-        module: './Email/SimpleMailgunAdapter',
+        module: 'parse-server-simple-mailgun-adapter',
         options: {
           domain: 'd',
         }
diff --git a/src/Adapters/AdapterLoader.js b/src/Adapters/AdapterLoader.js
index 654948e9..5305b135 100644
--- a/src/Adapters/AdapterLoader.js
+++ b/src/Adapters/AdapterLoader.js
@@ -10,8 +10,12 @@ export function loadAdapter(adapter, defaultAdapter, options) {
     try {
       return adapter(options);
     } catch(e) {
-      var Adapter = adapter;
-      return new Adapter(options);
+      if (e.name === 'TypeError') {
+        var Adapter = adapter;
+        return new Adapter(options);
+      } else {
+        throw e;
+      }
     }
   } else if (typeof adapter === "string") {
     adapter = require(adapter);
@@ -19,7 +23,6 @@ export function loadAdapter(adapter, defaultAdapter, options) {
     if (adapter.default) {
       adapter = adapter.default;
     }
-
     return loadAdapter(adapter, undefined, options);
   } else if (adapter.module) {
     return loadAdapter(adapter.module, undefined, adapter.options);