From 681e6fcf02a622b712ad7e94aff7c18c0ac87ea7 Mon Sep 17 00:00:00 2001 From: Typicode Date: Fri, 21 Mar 2014 14:00:12 +0100 Subject: [PATCH] Clean --- README.md | 2 +- test/fixture.js | 18 ------------------ test/server.js | 44 ++++++++++++++++++++++++++++++++++++++------ test/static.js | 25 ------------------------- 4 files changed, 39 insertions(+), 50 deletions(-) delete mode 100644 test/fixture.js delete mode 100644 test/static.js diff --git a/README.md b/README.md index 0faddb2..cdf3a55 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Build Status](https://travis-ci.org/typicode/json-server.png)](https://travis-ci.org/typicode/json-server) [![NPM version](https://badge.fury.io/js/json-server.png)](http://badge.fury.io/js/json-server) -![](http://i.imgur.com/dLeJmw6.png) +![](https://raw.githubusercontent.com/typicode/json-server/master/public/images/logo.png) # JSON Server diff --git a/test/fixture.js b/test/fixture.js deleted file mode 100644 index 453be2c..0000000 --- a/test/fixture.js +++ /dev/null @@ -1,18 +0,0 @@ -// Small database to be used during tests -module.exports = function() { - var db = {}; - - db.posts = [ - {id: 1, body: 'foo'}, - {id: 2, body: 'bar'} - ] - - db.comments = [ - {id: 1, published: true, postId: 1}, - {id: 2, published: false, postId: 1}, - {id: 3, published: false, postId: 2}, - {id: 4, published: false, postId: 2}, - ] - - return db; -} \ No newline at end of file diff --git a/test/server.js b/test/server.js index 28b16ad..2a6100c 100644 --- a/test/server.js +++ b/test/server.js @@ -1,15 +1,25 @@ var request = require('supertest') -var assert = require('assert') -var low = require('low') -var server = require('../src/server') -var fixture = require('./fixture') +var assert = require('assert') +var low = require('low') +var server = require('../src/server') var db describe('Server', function() { beforeEach(function() { - low.db = fixture() - server + low.db = {} + + low.db.posts = [ + {id: 1, body: 'foo'}, + {id: 2, body: 'bar'} + ] + + low.db.comments = [ + {id: 1, published: true, postId: 1}, + {id: 2, published: false, postId: 1}, + {id: 3, published: false, postId: 2}, + {id: 4, published: false, postId: 2}, + ] }) describe('GET /db', function() { @@ -126,4 +136,26 @@ describe('Server', function() { }) }) }) + + describe('Static routes', function() { + + describe('GET /', function() { + it('should respond with html', function(done) { + request(server) + .get('/') + .expect('Content-Type', /html/) + .expect(200, done); + }); + }); + + describe('GET /stylesheets/style.css', function() { + it('should respond with css', function(done) { + request(server) + .get('/stylesheets/style.css') + .expect('Content-Type', /css/) + .expect(200, done); + }); + }); + + }) }) \ No newline at end of file diff --git a/test/static.js b/test/static.js deleted file mode 100644 index 88dcf93..0000000 --- a/test/static.js +++ /dev/null @@ -1,25 +0,0 @@ -var request = require('supertest') -var assert = require('assert') -var server = require('../src/server') - -describe('Static routes', function() { - - describe('GET /', function() { - it('should respond with html', function(done) { - request(server) - .get('/') - .expect('Content-Type', /html/) - .expect(200, done); - }); - }); - - describe('GET /stylesheets/style.css', function() { - it('should respond with css', function(done) { - request(server) - .get('/stylesheets/style.css') - .expect('Content-Type', /css/) - .expect(200, done); - }); - }); - -}); \ No newline at end of file