File tree Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change 8585 "sinon-chai" : " ^2.8.0" ,<% if (filters.mocha) { %>
8686 "karma-mocha" : " ^0.2.0" ,
8787 "karma-chai-plugins" : " ^0.6.0" ,<% } if (filters.jasmine) { %>
88- "karma-jasmine" : " ~0.1.5" ,<% } %>
88+ "jasmine-core" : " ^2.3.4" ,
89+ "karma-jasmine" : " ~0.3.0" ,<% } %>
8990 "karma-ng-scenario" : " ~0.1.0" ,
9091 "karma-firefox-launcher" : " ~0.1.3" ,
9192 "karma-script-launcher" : " ~0.1.0" ,
Original file line number Diff line number Diff line change @@ -43,11 +43,11 @@ var config = {
4343 // Jasmine and Cucumber are fully supported as a test and assertion framework.
4444 // Mocha has limited beta support. You will need to include your own
4545 // assertion framework if working with mocha.
46- framework : '<% if (filters.jasmine) { %>jasmine <% } if (filters.mocha) { %>mocha<% } %>' ,
46+ framework : '<% if (filters.jasmine) { %>jasmine2 <% } if (filters.mocha) { %>mocha<% } %>' ,
4747< % if ( filters . jasmine ) { % >
4848 // ----- Options to be passed to minijasminenode -----
4949 //
50- // See the full list at https://github.com/juliemr/minijasminenode
50+ // See the full list at https://github.com/jasmine/jasmine-npm
5151 jasmineNodeOpts : {
5252 defaultTimeoutInterval : 30000
5353 } , < % } if ( filters . mocha ) { % >
@@ -74,8 +74,8 @@ var config = {
7474 Object . getOwnPropertyDescriptor ( Object . prototype , 'should' )
7575 ) ;
7676< % } %>
77- var serverConfig = config . params . serverConfig ;
78- < % if ( filters . mongoose ) { % >
77+ var serverConfig = config . params . serverConfig ; < % if ( filters . mongoose ) { % >
78+
7979 // Setup mongo for tests
8080 var mongoose = require('mongoose-bird')();
8181 mongoose.connect(serverConfig.mongo.uri, serverConfig.mongo.options); // Connect to database< % } % >
You can’t perform that action at this time.
0 commit comments