Update dependencies and support node 6.1 (#1754)

* Update dependencies and support node 6.1

* Remove gcs-adapter, which depends on grpc, which fails to build on node 6

* Remove GCS adapter usage
This commit is contained in:
Drew
2016-05-11 05:54:23 -07:00
committed by Florent Vilmart
parent 1291f70a16
commit 10ee229e60
3 changed files with 4 additions and 15 deletions

View File

@@ -1,6 +1,7 @@
language: node_js language: node_js
node_js: node_js:
- '4.3' - '4.3'
- '6.1'
env: env:
global: global:
- COVERAGE_OPTION='./node_modules/babel-istanbul/lib/cli.js cover -x **/spec/**' - COVERAGE_OPTION='./node_modules/babel-istanbul/lib/cli.js cover -x **/spec/**'

View File

@@ -57,12 +57,10 @@
"codecov": "^1.0.1", "codecov": "^1.0.1",
"cross-env": "^1.0.7", "cross-env": "^1.0.7",
"deep-diff": "^0.3.3", "deep-diff": "^0.3.3",
"flow-bin": "^0.22.0", "gaze": "^1.0.0",
"gaze": "^0.5.2",
"jasmine": "^2.3.2", "jasmine": "^2.3.2",
"mongodb-runner": "3.1.15", "mongodb-runner": "3.2.2",
"nodemon": "^1.8.1", "nodemon": "^1.8.1"
"parse-server-gcs-adapter": "^1.0.0"
}, },
"scripts": { "scripts": {
"dev": "npm run build && node bin/dev", "dev": "npm run build && node bin/dev",

View File

@@ -2,7 +2,6 @@
var loadAdapter = require("../src/Adapters/AdapterLoader").loadAdapter; var loadAdapter = require("../src/Adapters/AdapterLoader").loadAdapter;
var FilesAdapter = require("parse-server-fs-adapter").default; var FilesAdapter = require("parse-server-fs-adapter").default;
var S3Adapter = require("parse-server-s3-adapter").default; var S3Adapter = require("parse-server-s3-adapter").default;
var GCSAdapter = require("parse-server-gcs-adapter").default;
var ParsePushAdapter = require("parse-server-push-adapter").default; var ParsePushAdapter = require("parse-server-push-adapter").default;
describe("AdapterLoader", ()=>{ describe("AdapterLoader", ()=>{
@@ -114,13 +113,4 @@ describe("AdapterLoader", ()=>{
}).not.toThrow(); }).not.toThrow();
done(); done();
}) })
it("should load GCSAdapter from direct passing", (done) => {
var gcsAdapter = new GCSAdapter("projectId", "path/to/keyfile", "bucket")
expect(() => {
var adapter = loadAdapter(gcsAdapter, FilesAdapter);
expect(adapter).toBe(gcsAdapter);
}).not.toThrow();
done();
})
}); });