joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Drew Gross
2016-03-23 18:32:40 -07:00
parent 3e45e04cf1
commit b4ee31322e
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/index.spec.js
View File

@@ -105,7 +105,7 @@ describe('server', () => {
fileKey: 'test', fileKey: 'test',
verifyUserEmails: true, verifyUserEmails: true,
emailAdapter: { emailAdapter: {
module: './Email/SimpleMailgunAdapter', module: 'parse-server-simple-mailgun-adapter',
options: { options: {
fromAddress: 'parse@example.com', fromAddress: 'parse@example.com',
apiKey: 'k', apiKey: 'k',
@@ -130,7 +130,7 @@ describe('server', () => {
collectionPrefix: 'test_', collectionPrefix: 'test_',
fileKey: 'test', fileKey: 'test',
verifyUserEmails: true, verifyUserEmails: true,
emailAdapter: './Email/SimpleMailgunAdapter', emailAdapter: 'parse-server-simple-mailgun-adapter',
publicServerURL: 'http://localhost:8378/1' publicServerURL: 'http://localhost:8378/1'
})).toThrow('SimpleMailgunAdapter requires an API Key, domain, and fromAddress.'); })).toThrow('SimpleMailgunAdapter requires an API Key, domain, and fromAddress.');
done(); done();
@@ -150,7 +150,7 @@ describe('server', () => {
fileKey: 'test', fileKey: 'test',
verifyUserEmails: true, verifyUserEmails: true,
emailAdapter: { emailAdapter: {
module: './Email/SimpleMailgunAdapter', module: 'parse-server-simple-mailgun-adapter',
options: { options: {
domain: 'd', domain: 'd',
} }

9
src/Adapters/AdapterLoader.js
View File

@@ -10,8 +10,12 @@ export function loadAdapter(adapter, defaultAdapter, options) {
try { try {
return adapter(options); return adapter(options);
} catch(e) { } catch(e) {
var Adapter = adapter; if (e.name === 'TypeError') {
return new Adapter(options); var Adapter = adapter;
return new Adapter(options);
} else {
throw e;
}
} }
} else if (typeof adapter === "string") { } else if (typeof adapter === "string") {
adapter = require(adapter); adapter = require(adapter);
@@ -19,7 +23,6 @@ export function loadAdapter(adapter, defaultAdapter, options) {
if (adapter.default) { if (adapter.default) {
adapter = adapter.default; adapter = adapter.default;
} }
return loadAdapter(adapter, undefined, options); return loadAdapter(adapter, undefined, options);
} else if (adapter.module) { } else if (adapter.module) {
return loadAdapter(adapter.module, undefined, adapter.options); return loadAdapter(adapter.module, undefined, adapter.options);