From d6526f12fbb8f3e9f863190f572b90161b3e1905 Mon Sep 17 00:00:00 2001
From: DadaMonad <kevin.jahns@rwth-aachen.de>
Date: Wed, 18 Feb 2015 00:01:43 +0000
Subject: [PATCH] fixed mocha stop

---
 gulpfile.coffee       |  4 ++--
 package.json          | 13 +++++++------
 test/Json_test.coffee |  2 +-
 test/Text_test.coffee |  3 +--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gulpfile.coffee b/gulpfile.coffee
index 212ab299..7ff7a4f6 100644
--- a/gulpfile.coffee
+++ b/gulpfile.coffee
@@ -18,6 +18,7 @@ plumber = require 'gulp-plumber'
 mochaPhantomJS = require 'gulp-mocha-phantomjs'
 cache = require 'gulp-cached'
 coffeeify = require 'gulp-coffeeify'
+exit = require 'gulp-exit'
 
 gulp.task 'default', ['build_browser']
 
@@ -81,9 +82,8 @@ gulp.task 'watch', ['build'], ->
 
 gulp.task 'mocha', ->
   gulp.src files.test, { read: false }
-    .pipe plumber()
     .pipe mocha {reporter : 'list'}
-
+    .pipe exit()
 
 gulp.task 'lint', ->
   gulp.src files.all
diff --git a/package.json b/package.json
index cfeed865..8472a1ee 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "A Framework that enables Real-Time Collaboration on arbitrary data structures.",
   "main": "./build/node/y.js",
   "scripts": {
-    "test": "./node_modules/.bin/gulp test"
+    "test": "./node_modules/.bin/gulp mocha"
   },
   "repository": {
     "type": "git",
@@ -27,13 +27,9 @@
   },
   "homepage": "https://dadamonad.github.io/yjs/",
   "dependencies": {
-    "mocha": "^2.1.0",
-    "sinon": "^1.12.2",
-    "sinon-chai": "^2.7.0"
   },
   "devDependencies": {
     "codo": "^2.0.9",
-    "underscore": "^1.6.0",
     "coffee-errors": "~0.8.6",
     "coffee-script": "^1.7.1",
     "coffeeify": "^0.6.0",
@@ -46,6 +42,7 @@
     "gulp-concat": "^2.3.4",
     "gulp-copy": "0.0.2",
     "gulp-debug": "^1.0.0",
+    "gulp-exit": "0.0.2",
     "gulp-git": "^0.5.0",
     "gulp-if": "^1.2.4",
     "gulp-ignore": "^1.2.0",
@@ -59,6 +56,10 @@
     "gulp-sourcemaps": "^1.1.1",
     "gulp-uglify": "^0.3.1",
     "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"
   }
 }
diff --git a/test/Json_test.coffee b/test/Json_test.coffee
index f0a63864..720f23ea 100644
--- a/test/Json_test.coffee
+++ b/test/Json_test.coffee
@@ -87,7 +87,7 @@ class JsonTest extends Test
     ]
 
 describe "JsonFramework", ->
-  @timeout 50000
+  @timeout 500000
 
   beforeEach (done)->
     @yTest = new JsonTest()
diff --git a/test/Text_test.coffee b/test/Text_test.coffee
index 2e2ec866..17971e8a 100644
--- a/test/Text_test.coffee
+++ b/test/Text_test.coffee
@@ -29,10 +29,9 @@ class TextTest extends Test
     @users[user_num].val("TextTest").val()
 
 describe "TextFramework", ->
-  @timeout 50000
+  @timeout 500000
 
   beforeEach (done)->
-    @timeout 50000
     @yTest = new TextTest()
     done()