Skip to content

Commit ecf65ba

Browse files
committed
Fix tests
1 parent 5dc65b9 commit ecf65ba

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

spec/index.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ describe('server', () => {
105105
fileKey: 'test',
106106
verifyUserEmails: true,
107107
emailAdapter: {
108-
module: './Email/SimpleMailgunAdapter',
108+
module: 'parse-server-simple-mailgun-adapter',
109109
options: {
110110
fromAddress: '[email protected]',
111111
apiKey: 'k',
@@ -130,7 +130,7 @@ describe('server', () => {
130130
collectionPrefix: 'test_',
131131
fileKey: 'test',
132132
verifyUserEmails: true,
133-
emailAdapter: './Email/SimpleMailgunAdapter',
133+
emailAdapter: 'parse-server-simple-mailgun-adapter',
134134
publicServerURL: 'http://localhost:8378/1'
135135
})).toThrow('SimpleMailgunAdapter requires an API Key, domain, and fromAddress.');
136136
done();
@@ -150,7 +150,7 @@ describe('server', () => {
150150
fileKey: 'test',
151151
verifyUserEmails: true,
152152
emailAdapter: {
153-
module: './Email/SimpleMailgunAdapter',
153+
module: 'parse-server-simple-mailgun-adapter',
154154
options: {
155155
domain: 'd',
156156
}

src/Adapters/AdapterLoader.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,19 @@ export function loadAdapter(adapter, defaultAdapter, options) {
1010
try {
1111
return adapter(options);
1212
} catch(e) {
13-
var Adapter = adapter;
14-
return new Adapter(options);
13+
if (e.name === 'TypeError') {
14+
var Adapter = adapter;
15+
return new Adapter(options);
16+
} else {
17+
throw e;
18+
}
1519
}
1620
} else if (typeof adapter === "string") {
1721
adapter = require(adapter);
1822
// If it's define as a module, get the default
1923
if (adapter.default) {
2024
adapter = adapter.default;
2125
}
22-
2326
return loadAdapter(adapter, undefined, options);
2427
} else if (adapter.module) {
2528
return loadAdapter(adapter.module, undefined, adapter.options);

0 commit comments

Comments
 (0)