yonote/yjs
24
0
Fork 0
Code Pull Requests1 Releases Activity

fixed mocha stop

Browse Source
This commit is contained in:
DadaMonad 2015-02-18 00:01:43 +00:00
parent d3af98cd17
commit d6526f12fb
4 changed files with 11 additions and 11 deletions

4
gulpfile.coffee

@ -18,6 +18,7 @@ plumber = require 'gulp-plumber'
mochaPhantomJS = require 'gulp-mocha-phantomjs' mochaPhantomJS = require 'gulp-mocha-phantomjs'
cache = require 'gulp-cached' cache = require 'gulp-cached'
coffeeify = require 'gulp-coffeeify' coffeeify = require 'gulp-coffeeify'
exit = require 'gulp-exit'
gulp.task 'default', ['build_browser'] gulp.task 'default', ['build_browser']
@ -81,9 +82,8 @@ gulp.task 'watch', ['build'], ->
gulp.task 'mocha', -> gulp.task 'mocha', ->
gulp.src files.test, { read: false } gulp.src files.test, { read: false }
.pipe plumber()
.pipe mocha {reporter : 'list'} .pipe mocha {reporter : 'list'}
.pipe exit()
gulp.task 'lint', -> gulp.task 'lint', ->
gulp.src files.all gulp.src files.all

13
package.json

@ -4,7 +4,7 @@
"description": "A Framework that enables Real-Time Collaboration on arbitrary data structures.", "description": "A Framework that enables Real-Time Collaboration on arbitrary data structures.",
"main": "./build/node/y.js", "main": "./build/node/y.js",
"scripts": { "scripts": {
"test": "./node_modules/.bin/gulp test" "test": "./node_modules/.bin/gulp mocha"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -27,13 +27,9 @@
}, },
"homepage": "https://dadamonad.github.io/yjs/", "homepage": "https://dadamonad.github.io/yjs/",
"dependencies": { "dependencies": {
"mocha": "^2.1.0",
"sinon": "^1.12.2",
"sinon-chai": "^2.7.0"
}, },
"devDependencies": { "devDependencies": {
"codo": "^2.0.9", "codo": "^2.0.9",
"underscore": "^1.6.0",
"coffee-errors": "~0.8.6", "coffee-errors": "~0.8.6",
"coffee-script": "^1.7.1", "coffee-script": "^1.7.1",
"coffeeify": "^0.6.0", "coffeeify": "^0.6.0",
@ -46,6 +42,7 @@
"gulp-concat": "^2.3.4", "gulp-concat": "^2.3.4",
"gulp-copy": "0.0.2", "gulp-copy": "0.0.2",
"gulp-debug": "^1.0.0", "gulp-debug": "^1.0.0",
"gulp-exit": "0.0.2",
"gulp-git": "^0.5.0", "gulp-git": "^0.5.0",
"gulp-if": "^1.2.4", "gulp-if": "^1.2.4",
"gulp-ignore": "^1.2.0", "gulp-ignore": "^1.2.0",
@ -59,6 +56,10 @@
"gulp-sourcemaps": "^1.1.1", "gulp-sourcemaps": "^1.1.1",
"gulp-uglify": "^0.3.1", "gulp-uglify": "^0.3.1",
"gulp-watch": "^3.0.0", "gulp-watch": "^3.0.0",
"jquery": "^2.1.1" "jquery": "^2.1.1",
"underscore": "^1.6.0",
"mocha": "^2.1.0",
"sinon": "^1.12.2",
"sinon-chai": "^2.7.0"
} }
} }

2
test/Json_test.coffee

@ -87,7 +87,7 @@ class JsonTest extends Test
] ]
describe "JsonFramework", -> describe "JsonFramework", ->
@timeout 50000 @timeout 500000
beforeEach (done)-> beforeEach (done)->
@yTest = new JsonTest() @yTest = new JsonTest()

3
test/Text_test.coffee

@ -29,10 +29,9 @@ class TextTest extends Test
@users[user_num].val("TextTest").val() @users[user_num].val("TextTest").val()
describe "TextFramework", -> describe "TextFramework", ->
@timeout 50000 @timeout 500000
beforeEach (done)-> beforeEach (done)->
@timeout 50000
@yTest = new TextTest() @yTest = new TextTest()
done() done()