Skip to content

Commit

Permalink
Merge pull request #58 from agco/bugfix/AGCMD-1933
Browse files Browse the repository at this point in the history
Bugfix/agcmd 1933
  • Loading branch information
mavdi committed Feb 10, 2016
2 parents 377df33 + 4464c43 commit 5c7f3c8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.iml
.idea
node_modules
coverage
12 changes: 8 additions & 4 deletions test/remoteIncludes.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,18 @@ describe('remote link', function () {

after(function () {
const promise1 = new Promise(function (resolve) {
utils.removeFromDB(server1, ['posts', 'comments', 'topics']).then(function () {
// TODO: calling removeFromDB causes after() to timeout, so i've commented it out
// Still not sure what the root cause of this is though.
//utils.removeFromDB(server1, ['posts', 'comments', 'topics']).then(function () {
server1.stop(resolve);
});
//});
});
const promise2 = new Promise(function (resolve) {
utils.removeFromDB(server2, ['people', 'countries']).then(function () {
// TODO: calling removeFromDB causes after() to timeout, so i've commented it out
// Still not sure what the root cause of this is though.
//utils.removeFromDB(server2, ['people', 'countries']).then(function () {
server2.stop(resolve);
});
//});
});
return Promise.all([promise1, promise2]);
});
Expand Down

0 comments on commit 5c7f3c8

Please sign in to comment.