Skip to content

Commit e4d3473

Browse files
committed
Merge branch 'master-up' into gql-relation-input
2 parents 0e8c231 + 750024f commit e4d3473

31 files changed

+4429
-3191
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ before_script:
4343
- greenkeeper-lockfile-update
4444
script:
4545
- npm run lint
46-
- npm run coverage
46+
- npm run pretest && npm run coverage
4747
after_script:
4848
- greenkeeper-lockfile-upload
4949
- bash <(curl -s https://codecov.io/bash)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
Parse Server works with the Express web application framework. It can be added to existing web applications, or run by itself.
4343

44-
The full documentation for Parse Server is available in the [wiki](https://github.com/parse-community/parse-server/wiki). The [Parse Server guide](http://docs.parseplatform.org/parse-server/guide/) is a good place to get started. An [API reference](http://parseplatform.org/parse-server/api/) is also available. If you're interested in developing for Parse Server, the [Development guide](http://docs.parseplatform.org/parse-server/guide/#development-guide) will help you get set up.
44+
The full documentation for Parse Server is available in the [wiki](https://github.com/parse-community/parse-server/wiki). The [Parse Server guide](http://docs.parseplatform.org/parse-server/guide/) is a good place to get started. An [API reference](http://parseplatform.org/parse-server/api/) and [Cloud Code guide](https://docs.parseplatform.org/cloudcode/guide/) are also available. If you're interested in developing for Parse Server, the [Development guide](http://docs.parseplatform.org/parse-server/guide/#development-guide) will help you get set up.
4545

4646
- [Getting Started](#getting-started)
4747
- [Running Parse Server](#running-parse-server)

package-lock.json

Lines changed: 56 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
"mongodb": "3.3.0",
4545
"node-rsa": "1.0.5",
4646
"parse": "2.6.0",
47-
"pg-promise": "9.0.1",
47+
"pg-promise": "9.0.2",
48+
"pluralize": "^8.0.0",
4849
"redis": "2.8.0",
4950
"semver": "6.3.0",
5051
"subscriptions-transport-ws": "0.9.16",
@@ -78,11 +79,11 @@
7879
"form-data": "2.5.0",
7980
"gaze": "1.1.3",
8081
"graphql-tag": "^2.10.1",
81-
"husky": "3.0.3",
82+
"husky": "3.0.4",
8283
"jasmine": "3.4.0",
8384
"jsdoc": "3.6.3",
8485
"jsdoc-babel": "0.5.0",
85-
"lint-staged": "9.2.1",
86+
"lint-staged": "9.2.3",
8687
"mongodb-runner": "4.7.2",
8788
"node-fetch": "2.6.0",
8889
"nyc": "14.1.1",
@@ -99,7 +100,7 @@
99100
"testonly": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.0.4} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=mmapv1} TESTING=1 jasmine",
100101
"test": "npm run testonly",
101102
"posttest": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.0.4} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=mmapv1} mongodb-runner stop",
102-
"coverage": "npm run pretest && cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.0.4} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=mmapv1} TESTING=1 nyc jasmine && npm run posttest",
103+
"coverage": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.0.4} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=mmapv1} TESTING=1 nyc jasmine",
103104
"start": "node ./bin/parse-server",
104105
"prepare": "npm run build",
105106
"postinstall": "node -p 'require(\"./postinstall.js\")()'"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
const {
2+
transformClassNameToGraphQL,
3+
} = require('../lib/GraphQL/transformers/className');
4+
5+
describe('transformClassNameToGraphQL', () => {
6+
it('should remove starting _ and tansform first letter to upper case', () => {
7+
expect(
8+
['_User', '_user', 'User', 'user'].map(transformClassNameToGraphQL)
9+
).toEqual(['User', 'User', 'User', 'User']);
10+
});
11+
});

0 commit comments

Comments
 (0)