Skip to content

Commit

Permalink
Support arbitrary mongo joins in GraphQL API
Browse files Browse the repository at this point in the history
  • Loading branch information
jesstelford committed Aug 27, 2018
1 parent e83e1cb commit f27961e
Show file tree
Hide file tree
Showing 43 changed files with 1,551 additions and 840 deletions.
11 changes: 7 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ x-job-setup: &job-setup
# Download and cache dependencies
x-restore-cache: &restore-cache
keys:
- v8-dependencies-{{ checksum "yarn.lock" }}
- v10-dependencies-{{ checksum "yarn.lock" }}
# fallback to using the latest cache if no exact match is found
- v8-dependencies-
- v10-dependencies-

x-save-cache: &save-cache
paths:
- node_modules
key: v8-dependencies-{{ checksum "yarn.lock" }}
key: v10-dependencies-{{ checksum "yarn.lock" }}

x-integration-steps: &integration-steps
steps:
Expand Down Expand Up @@ -63,7 +63,10 @@ jobs:
- checkout
- restore_cache: *restore-cache
- run: sudo yarn global add bolt
- run: bolt
# Set Cypress cache dir here, in case this job runs/completes first, and
# hence clobbers the `node_modules` cache with a non-cypress version,
# causing the other job to fail with a "Missing Cypress" error.
- run: CYPRESS_CACHE_FOLDER=$CIRCLE_WORKING_DIRECTORY/node_modules/cypress/.cache/ bolt
- save_cache: *save-cache
# run tests!
- run: yarn lint:eslint --format junit -o reports/junit/js-lint-results.xml
Expand Down
4 changes: 3 additions & 1 deletion jest/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ test.failing = (title, testFn) => {
// Test is expected to fail
return;
}
throw new Error(`Expected test '${title}' to fail. If this previously failing case now passes, consider removing '.failing' from the test definition`);
throw new Error(
`Expected test '${title}' to fail. If this previously failing case now passes, consider removing '.failing' from the test definition`
);
});
};
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
"jest-junit": "^4.0.0",
"kalendaryo": "^1.10.0",
"loader-utils": "^1.1.0",
"lodash.get": "^4.4.2",
"lodash.isequal": "^4.5.0",
"lodash.set": "^4.3.2",
"mkdirp": "^0.5.1",
Expand Down
Loading

0 comments on commit f27961e

Please sign in to comment.