File tree 2 files changed +6
-5
lines changed
2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change 85
85
"sinon-chai" : " ^2.8.0" ,<% if (filters.mocha) { %>
86
86
"karma-mocha" : " ^0.2.0" ,
87
87
"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" ,<% } %>
89
90
"karma-ng-scenario" : " ~0.1.0" ,
90
91
"karma-firefox-launcher" : " ~0.1.3" ,
91
92
"karma-script-launcher" : " ~0.1.0" ,
Original file line number Diff line number Diff line change @@ -43,11 +43,11 @@ var config = {
43
43
// Jasmine and Cucumber are fully supported as a test and assertion framework.
44
44
// Mocha has limited beta support. You will need to include your own
45
45
// 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<% } %>' ,
47
47
< % if ( filters . jasmine ) { % >
48
48
// ----- Options to be passed to minijasminenode -----
49
49
//
50
- // See the full list at https://github.com/juliemr/minijasminenode
50
+ // See the full list at https://github.com/jasmine/jasmine-npm
51
51
jasmineNodeOpts : {
52
52
defaultTimeoutInterval : 30000
53
53
} , < % } if ( filters . mocha ) { % >
@@ -74,8 +74,8 @@ var config = {
74
74
Object . getOwnPropertyDescriptor ( Object . prototype , 'should' )
75
75
) ;
76
76
< % } %>
77
- var serverConfig = config . params . serverConfig ;
78
- < % if ( filters . mongoose ) { % >
77
+ var serverConfig = config . params . serverConfig ; < % if ( filters . mongoose ) { % >
78
+
79
79
// Setup mongo for tests
80
80
var mongoose = require('mongoose-bird')();
81
81
mongoose.connect(serverConfig.mongo.uri, serverConfig.mongo.options); // Connect to database< % } % >
You can’t perform that action at this time.
0 commit comments