npm/remotedev-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

apollo-server -> graphql-server upgrade, node-uuid -> uuid, supertest=2 -> supertest-3 (#39)

Browse Source
This commit is contained in:
jonathan schatz 2017-04-17 02:00:43 -07:00 committed by Mihail Diordiev
parent a0bbc23ef1
commit 073f27f720
5 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/middleware/graphiql.js
View File

@ -1,4 +1,4 @@
var graphiqlExpress = require('apollo-server').graphiqlExpress;
var graphiqlExpress = require('graphql-server-express').graphiqlExpress;
module.exports = graphiqlExpress({
endpointURL: '/graphql',

4
lib/middleware/graphql.js
View File

@ -1,8 +1,8 @@
var apolloExpress = require('apollo-server').apolloExpress;
var graphqlExpress = require('graphql-server-express').graphqlExpress;
var schema = require('../api/schema');
module.exports = function (store) {
return apolloExpress(function() {
return graphqlExpress(function() {
return {
schema: schema,
context: {

2
lib/store.js
View File

@ -1,4 +1,4 @@
var uuid = require('node-uuid');
var uuid = require('uuid');
var pick = require('lodash/pick');
var connector = require('./db/connector');

12
package.json
View File

@ -36,29 +36,29 @@
},
"homepage": "https://github.com/zalmoxisus/remotedev-server",
"dependencies": {
"apollo-server": "^0.3.3",
"body-parser": "^1.15.0",
"chalk": "^1.1.3",
"cors": "^2.7.1",
"ejs": "^2.4.1",
"express": "^4.13.3",
"getport": "^0.1.0",
"graphql": "^0.8.0",
"graphql-tools": "^0.8.1",
"graphql": "^0.9.3",
"graphql-server-express": "^0.7.1",
"graphql-tools": "^0.11.0",
"js-data": "^2.9.0",
"knex": "0.11.10",
"lodash": "^4.15.0",
"minimist": "^1.2.0",
"morgan": "^1.7.0",
"node-uuid": "^1.4.0",
"semver": "^5.3.0",
"socketcluster": "^5.0.4",
"sqlite3": "^3.1.8"
"sqlite3": "^3.1.8",
"uuid": "^3.0.1"
},
"devDependencies": {
"expect": "^1.20.2",
"mocha": "^3.2.0",
"socketcluster-client": "^5.1.1",
"supertest": "^2.0.1"
"supertest": "^3.0.0"
}
}

37
test/integration.spec.js
View File

@ -19,15 +19,14 @@ describe('Server', function() {
});
describe('Express backend', function() {
it('loads main page', function(done) {
it('loads main page', function() {
request('http://localhost:8000')
.get('/')
.expect('Content-Type', /text\/html/)
.expect(200)
.expect(function(res) {
.then(function(res) {
expect(res.text).toMatch(/<title>RemoteDev<\/title>/);
})
.end(done);
});
it('resolves an inexistent url', function(done) {
@ -119,20 +118,20 @@ describe('Server', function() {
preloadedState: '{"todos":[{"text":"Use Redux","completed":false,"id":0}]}',
userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.95 Safari/537.36'
};
it('should add a report', function(done) {
it('should add a report', function() {
request('http://localhost:8000')
.post('/')
.send(report)
.set('Accept', 'application/json')
.expect('Content-Type', /application\/json/)
.expect(function(res) {
.expect(200)
.then(function(res) {
id = res.body.id;
expect(id).toExist();
})
.expect(200, done);
});
});
it('should get the report', function(done) {
it('should get the report', function() {
request('http://localhost:8000')
.post('/')
.send({
@ -141,13 +140,13 @@ describe('Server', function() {
})
.set('Accept', 'application/json')
.expect('Content-Type', /application\/json/)
.expect(function(res) {
.expect(200)
.then(function(res) {
expect(res.body).toInclude(report);
})
.expect(200, done);
});
});
it('should list reports', function(done) {
it('should list reports', function() {
request('http://localhost:8000')
.post('/')
.send({
@ -155,18 +154,18 @@ describe('Server', function() {
})
.set('Accept', 'application/json')
.expect('Content-Type', /application\/json/)
.expect(function(res) {
.expect(200)
.then(function(res) {
expect(res.body.length).toBe(1);
expect(res.body[0].id).toBe(id);
expect(res.body[0].title).toBe('Test report');
expect(res.body[0].added).toExist();
})
.expect(200, done);
});
});
});
describe('GraphQL backend', function() {
it('should get the report', function(done) {
it('should get the report', function() {
request('http://localhost:8000')
.post('/graphql')
.send({
@ -174,14 +173,14 @@ describe('Server', function() {
})
.set('Accept', 'application/json')
.expect('Content-Type', /application\/json/)
.expect(function(res) {
.expect(200)
.then(function(res) {
var reports = res.body.data.reports;
expect(reports.length).toBe(1);
expect(reports[0].id).toExist();
expect(reports[0].title).toBe('Test report');
expect(reports[0].type).toBe('ACTIONS');
})
.expect(200, done);
});
});
});
});