updated mocha
This commit is contained in:
		
							parent
							
								
									77b83cae2a
								
							
						
					
					
						commit
						c65f11b308
					
				
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										10
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								package.json
									
									
									
									
									
								
							@ -27,12 +27,13 @@
 | 
				
			|||||||
  },
 | 
					  },
 | 
				
			||||||
  "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",
 | 
					    "underscore": "^1.6.0",
 | 
				
			||||||
    "chai": "^1.9.1",
 | 
					 | 
				
			||||||
    "codo": "^2.0.9",
 | 
					 | 
				
			||||||
    "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",
 | 
				
			||||||
@ -58,9 +59,6 @@
 | 
				
			|||||||
    "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"
 | 
				
			||||||
    "mocha": "^1.21.4",
 | 
					 | 
				
			||||||
    "sinon": "^1.10.2",
 | 
					 | 
				
			||||||
    "sinon-chai": "^2.5.0"
 | 
					 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -87,8 +87,9 @@ class JsonTest extends Test
 | 
				
			|||||||
    ]
 | 
					    ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
describe "JsonFramework", ->
 | 
					describe "JsonFramework", ->
 | 
				
			||||||
 | 
					  @timeout 50000
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  beforeEach (done)->
 | 
					  beforeEach (done)->
 | 
				
			||||||
    @timeout 50000
 | 
					 | 
				
			||||||
    @yTest = new JsonTest()
 | 
					    @yTest = new JsonTest()
 | 
				
			||||||
    @users = @yTest.users
 | 
					    @users = @yTest.users
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,5 @@
 | 
				
			|||||||
chai      = require('chai')
 | 
					chai      = require('chai')
 | 
				
			||||||
expect    = chai.expect
 | 
					expect    = chai.expect
 | 
				
			||||||
should    = chai.should()
 | 
					 | 
				
			||||||
sinon     = require('sinon')
 | 
					sinon     = require('sinon')
 | 
				
			||||||
sinonChai = require('sinon-chai')
 | 
					sinonChai = require('sinon-chai')
 | 
				
			||||||
_         = require("underscore")
 | 
					_         = require("underscore")
 | 
				
			||||||
@ -13,7 +12,7 @@ module.exports = class Test
 | 
				
			|||||||
  constructor: (@name_suffix = "")->
 | 
					  constructor: (@name_suffix = "")->
 | 
				
			||||||
    @number_of_test_cases_multiplier = 1
 | 
					    @number_of_test_cases_multiplier = 1
 | 
				
			||||||
    @repeat_this = 3 * @number_of_test_cases_multiplier
 | 
					    @repeat_this = 3 * @number_of_test_cases_multiplier
 | 
				
			||||||
    @doSomething_amount = 1230 * @number_of_test_cases_multiplier
 | 
					    @doSomething_amount = 123 * @number_of_test_cases_multiplier
 | 
				
			||||||
    @number_of_engines = 5 + @number_of_test_cases_multiplier - 1
 | 
					    @number_of_engines = 5 + @number_of_test_cases_multiplier - 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @time = 0 # denotes to the time when run was started
 | 
					    @time = 0 # denotes to the time when run was started
 | 
				
			||||||
 | 
				
			|||||||
@ -29,6 +29,8 @@ class TextTest extends Test
 | 
				
			|||||||
    @users[user_num].val("TextTest").val()
 | 
					    @users[user_num].val("TextTest").val()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
describe "TextFramework", ->
 | 
					describe "TextFramework", ->
 | 
				
			||||||
 | 
					  @timeout 50000
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  beforeEach (done)->
 | 
					  beforeEach (done)->
 | 
				
			||||||
    @timeout 50000
 | 
					    @timeout 50000
 | 
				
			||||||
    @yTest = new TextTest()
 | 
					    @yTest = new TextTest()
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user