Skip to content

Commit

Permalink
Fix parse-server.
Browse files Browse the repository at this point in the history
  • Loading branch information
jmdobry committed Feb 25, 2016
1 parent 4cd6e8f commit cecd272
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion appengine/parse-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
},
"dependencies": {
"express": "^4.13.4",
"parse-server": "^2.0.6"
"parse-server": "^2.1.3"
}
}
3 changes: 2 additions & 1 deletion appengine/parse-server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ var parseServer = new ParseServer({
cloud: process.env.CLOUD_PATH || __dirname + '/cloud/main.js',
appId: process.env.APP_ID,
masterKey: process.env.MASTER_KEY,
fileKey: process.env.FILE_KEY
fileKey: process.env.FILE_KEY,
serverURL: process.env.SERVER_URL
});

// Mount the Parse API server middleware to /parse
Expand Down
7 changes: 6 additions & 1 deletion test/appengine/all.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,8 @@ if (process.env.TRAVIS_NODE_VERSION === 'stable') {
TRAVIS_NODE_VERSION: 'stable',
env: {
APP_ID: 'foo',
MASTER_KEY: 'bar'
MASTER_KEY: 'bar',
SERVER_URL: 'http://localhost:'
}
});
}
Expand Down Expand Up @@ -275,6 +276,10 @@ describe('appengine/', function () {
sampleTests.forEach(function (sample) {
sample.env = sample.env || {};
sample.env.PORT = port;
if (sample.dir === 'parse-server') {
sample.env.SERVER_URL = sample.env.SERVER_URL + port + '/parse';
console.log(sample);
}
port++;
it(sample.dir + ': dependencies should install', function (done) {
// Allow extra time for "npm install"
Expand Down

0 comments on commit cecd272

Please sign in to comment.