Skip to content
This repository has been archived by the owner on Oct 14, 2020. It is now read-only.

Commit

Permalink
Latest changes
Browse files Browse the repository at this point in the history
  • Loading branch information
eddyystop committed Nov 15, 2018
1 parent e43b7c6 commit 48f98ee
Show file tree
Hide file tree
Showing 6 changed files with 1,964 additions and 1,963 deletions.
8 changes: 4 additions & 4 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ class Service {
cache: {}, // where tables used with a .filter() are cached
provider: params.provider,
user: params.user,
authenticated: params.authenticated,
}
authenticated: params.authenticated
};

const props = this._options.extraAuthProps || [];

Expand All @@ -82,8 +82,8 @@ class Service {
})
.then(response => {
if (!response.errors) {
return !content.pagination ? response.data :
Object.assign({}, content.pagination, { data: response.data });
return !content.pagination ? response.data
: Object.assign({}, content.pagination, { data: response.data });
}

// Reformat GraphQL error for Feathers.
Expand Down
9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
"main": "lib/",
"keywords": [
"feathers",
"feathers-plugin"
"feathersjs",
"feathers-plugin",
"feathers-plus",
"cli",
"generator",
"graphql"
],
"license": "MIT",
"repository": {
Expand All @@ -22,7 +27,7 @@
"url": "https://github.com/feathers-plus/graphql/issues"
},
"engines": {
"node": ">= 6.0.0"
"node": ">= 8.0.0"
},
"scripts": {
"publish": "git push origin --tags && npm run changelog && git push origin",
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,18 @@ describe('async.test.js', () => {
});

it('runs interleaved tests - services', function () {
this.timeout(5000)
this.timeout(5000);

app = createApp(false);
return asyncTest(app, 10)
.then(() => assert(true))
.catch(err => assert(false));
.then(() => assert(true));
});

it('runs interleaved tests - SQL', function () {
this.timeout(5000)
this.timeout(5000);

app = createApp(true);
return asyncTest(app, 10)
.then(() => assert(true))
.catch(err => assert(false));
.then(() => assert(true));
});
});
Loading

0 comments on commit 48f98ee

Please sign in to comment.