From b139314abf1fca9bd4767bd4e38048d71bd64096 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Thu, 24 Oct 2013 11:43:09 -0700 Subject: [PATCH] fixed some case-related issues --- Gruntfile.js | 2 -- package.json | 7 ------ src/lib/loggers/Stream.js | 2 +- src/lib/loggers/stream.js | 2 +- src/lib/utils.js | 2 +- test/serializers/json.test.js! | 40 ++++++++++++++++++++++++++++++++++ 6 files changed, 43 insertions(+), 12 deletions(-) create mode 100644 test/serializers/json.test.js! diff --git a/Gruntfile.js b/Gruntfile.js index 8f73fefd5..d09756d7b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -122,10 +122,8 @@ module.exports = function (grunt) { grunt.loadNpmTasks('grunt-mocha-test'); grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-jshint'); - grunt.loadNpmTasks('grunt-contrib-jshint'); // Default task. - // grunt.registerTask('docs', ['docular']); grunt.registerTask('default', [ 'jshint', 'mochaTest:unit', diff --git a/package.json b/package.json index 7cf23a437..82b431f44 100644 --- a/package.json +++ b/package.json @@ -8,18 +8,12 @@ "version": "0.0.1", "devDependencies": { "grunt": "~0.4.0", - "grunt-contrib": "~0.7.0", - "grunt-contrib-concat": "~0.3.0", "grunt-contrib-jshint": "~0.6.0", "grunt-contrib-nodeunit": "~0.2.0", "js-yaml": "~2.1.0", "mkdirp": "~0.3.5", - "yuidoc-bootstrap-theme": "git://github.com/spenceralger/yuidoc-bootstrap-theme.git#master", - "grunt-contrib-yuidoc": "~0.5.0", - "mocha-as-promised": "~1.4.0", "moment": "~2.2.1", "should": "~2.0.1", - "sinon": "~1.7.3", "grunt-mocha-test": "~0.7.0", "grunt-contrib-watch": "~0.5.3", "expect.js": "~0.2.0", @@ -31,7 +25,6 @@ "dependencies": { "require-directory": "git://github.com/spenceralger/node-require-directory.git#master", "cli-color": "~0.2.3", - "qs": "~0.6.5", "lodash": "~2.2.1", "tar": "~0.1.18" }, diff --git a/src/lib/loggers/Stream.js b/src/lib/loggers/Stream.js index 149cfb8d9..dae6375ff 100644 --- a/src/lib/loggers/Stream.js +++ b/src/lib/loggers/Stream.js @@ -12,7 +12,7 @@ module.exports = Stream; -var LoggerAbstract = require('../Logger'), +var LoggerAbstract = require('../logger'), nodeStreams = require('stream'), _ = require('../utils'), fs = require('fs'); diff --git a/src/lib/loggers/stream.js b/src/lib/loggers/stream.js index 149cfb8d9..dae6375ff 100644 --- a/src/lib/loggers/stream.js +++ b/src/lib/loggers/stream.js @@ -12,7 +12,7 @@ module.exports = Stream; -var LoggerAbstract = require('../Logger'), +var LoggerAbstract = require('../logger'), nodeStreams = require('stream'), _ = require('../utils'), fs = require('fs'); diff --git a/src/lib/utils.js b/src/lib/utils.js index a2305e7a4..11cb1d74c 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -2,7 +2,7 @@ var path = require('path'), _ = require('lodash'), fs = require('fs'), requireDir = require('require-directory'), - qs = require('qs'), + qs = require('querystring'), url = require('url'), nodeUtils = require('util'); diff --git a/test/serializers/json.test.js! b/test/serializers/json.test.js! new file mode 100644 index 000000000..0261b1c69 --- /dev/null +++ b/test/serializers/json.test.js! @@ -0,0 +1,40 @@ +/* JSON Serializer tests */ + +var JsonSerializer = require('../../src/lib/serializers/Json'); + +describe('json serializer', function () { + + var json; + + beforeEach(function () { + json = new JsonSerializer(); + }); + + it('creates simple json strings', function () { + json.serialize({foo: true}).should.eql('{"foo":true}'); + }); + + it('creates pretty json strings', function () { + json.serialize({foo: true, bake: 'cake', 'with': ['bacon']}, null, ' ') + .should.eql(['{', + ' "foo": true,', + ' "bake": "cake",', + ' "with": [', + ' "bacon"', + ' ]', + '}'].join('\n')); + }); + + it('reads simple json strings', function () { + json.unserialize('{"foo":true}').should.eql({ foo: true }); + }); + + it('does not create date objects', function () { + json + .unserialize('{"date":"2012-04-23T18:25:43.511Z"}') + .should.eql({ + date: '2012-04-23T18:25:43.511Z' + }); + }); + +}); \ No newline at end of file