Skip to content
This repository was archived by the owner on Sep 15, 2021. It is now read-only.

Commit f2b6d31

Browse files
gortokgortok
committed
Merge pull request #1174 from pbakondy/fix-tests
Fix tests by upgrade karma and jasmine
2 parents baf52b7 + 9af3ab6 commit f2b6d31

23 files changed

+137
-127
lines changed

‎config/karma.conf.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ module.exports = {
2020
'src/plugins/*.js': ['coverage']
2121
},
2222

23+
plugins: [
24+
'karma-jasmine',
25+
'karma-phantomjs-launcher',
26+
'karma-chrome-launcher',
27+
'karma-coverage'
28+
],
29+
2330
coverageReporter: {
2431
type : 'html',
2532
dir : 'coverage/'
@@ -43,4 +50,3 @@ module.exports = {
4350
// - IE (only Windows; has to be installed with `npm install karma-ie-launcher`)
4451
browsers: ['Chrome']
4552
};
46-

‎gulpfile.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var gulp = require('gulp'),
66
header = require('gulp-header'),
77
jshint = require('gulp-jshint'),
88
uglify = require('gulp-uglify'),
9-
karma = require('karma').server,
9+
Server = require('karma').Server,
1010
karmaConf = require('./config/karma.conf.js'),
1111
rename = require('gulp-rename'),
1212
shell = require('gulp-shell'),
@@ -74,7 +74,8 @@ gulp.task('karma', function (done) {
7474
karmaConf.singleRun = true;
7575
argv.browsers && (karmaConf.browsers = argv.browsers.trim().split(','));
7676
argv.reporters && (karmaConf.reporters = argv.reporters.trim().split(','));
77-
karma.start(karmaConf, done);
77+
var server = new Server(karmaConf, done);
78+
server.start();
7879
});
7980

8081
gulp.task('jshint', function () {
@@ -104,7 +105,8 @@ gulp.task('jscs', function () {
104105
gulp.task('karma-watch', function (done) {
105106
console.log(karmaConf);
106107
karmaConf.singleRun = false;
107-
karma.start(karmaConf, done);
108+
var server = new Server(karmaConf, done);
109+
server.start();
108110
});
109111

110112
gulp.task('watch', ['build'], function () {

‎package.json‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@
1717
"gulp-rename": "^1.2.0",
1818
"gulp-shell": "^0.2.10",
1919
"gulp-uglify": "^0.2.1",
20+
"jasmine-core": "^2.4.1",
2021
"jshint-stylish": "^0.4.0",
21-
"karma": "^0.12.16",
22-
"karma-chrome-launcher": "~0.1.2",
23-
"karma-coverage": "~0.2.6",
24-
"karma-jasmine": "~0.1.5",
25-
"karma-phantomjs-launcher": "~0.1.2",
26-
"minimist": "^0.1.0"
22+
"karma": "^0.13.21",
23+
"karma-chrome-launcher": "~0.2.2",
24+
"karma-coverage": "~0.5.3",
25+
"karma-jasmine": "~0.3.7",
26+
"karma-phantomjs-launcher": "~1.0.0",
27+
"minimist": "^0.1.0",
28+
"phantomjs-prebuilt": "^2.1.4"
2729
},
2830
"licenses": [
2931
{

‎test/plugins/adMob.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe('Service: $cordovaAdMob', function() {
3333
var options = { someOption: 1 };
3434

3535
spyOn(window.plugins.AdMob, fnName)
36-
.andCallFake(function (options, successCb, errorCb) {
36+
.and.callFake(function (options, successCb, errorCb) {
3737
successCb();
3838
});
3939

@@ -53,7 +53,7 @@ describe('Service: $cordovaAdMob', function() {
5353
var options = { someOption: 1 };
5454

5555
spyOn(window.plugins.AdMob, fnName)
56-
.andCallFake(function (options, successCb, errorCb) {
56+
.and.callFake(function (options, successCb, errorCb) {
5757
errorCb();
5858
});
5959

‎test/plugins/appAvailability.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe('Service: $cordovaAppAvailability', function() {
1818
var result;
1919

2020
spyOn(window.appAvailability, 'check')
21-
.andCallFake(function (urlScheme, successCb, errorCb) {
21+
.and.callFake(function (urlScheme, successCb, errorCb) {
2222
successCb(true);
2323
});
2424

@@ -31,7 +31,7 @@ describe('Service: $cordovaAppAvailability', function() {
3131
$rootScope.$digest();
3232

3333
expect(result).toBe(true);
34-
expect(window.appAvailability.check.calls[0].args[0]).toBe('twitter://');
34+
expect(window.appAvailability.check.calls.argsFor(0)[0]).toBe('twitter://');
3535
});
3636

3737
it('should call errorCb when in window\'s appAvailability.check a error orccurs', function() {
@@ -40,7 +40,7 @@ describe('Service: $cordovaAppAvailability', function() {
4040
var errorObj = { someError: 1 };
4141

4242
spyOn(window.appAvailability, 'check')
43-
.andCallFake(function (urlScheme, successCb, errorCb) {
43+
.and.callFake(function (urlScheme, successCb, errorCb) {
4444
errorCb(errorObj);
4545
});
4646

‎test/plugins/barcodeScanner.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('Service: $cordovaBarcodeScanner', function () {
2727
var imageData = {data: '123456789'};
2828

2929
spyOn(cordova.plugins.barcodeScanner, 'scan')
30-
.andCallFake(function (successCb, errorCb) {
30+
.and.callFake(function (successCb, errorCb) {
3131
successCb(imageData);
3232
});
3333

‎test/plugins/batteryStatus.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ describe('Service: $cordovaBatteryStatus', function () {
1515
(function (eventName) {
1616
it('should broadcast the `' + eventName + '` event the right way', function () {
1717

18-
spyOn($rootScope, '$broadcast').andCallThrough();
18+
spyOn($rootScope, '$broadcast').and.callThrough();
1919

2020
var result = {'isPlugged': true, 'level': 1};
2121

‎test/plugins/camera.spec.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ describe('Service: $cordovaCamera', function() {
3737
var imageData = { url: 'file://blob' };
3838

3939
spyOn(navigator.camera, 'getPicture')
40-
.andCallFake(function (successCb, errorCb, options) {
40+
.and.callFake(function (successCb, errorCb, options) {
4141
successCb(imageData);
4242
});
4343

@@ -50,7 +50,7 @@ describe('Service: $cordovaCamera', function() {
5050
$rootScope.$digest();
5151

5252
expect(result).toBe(imageData);
53-
expect(navigator.camera.getPicture.calls[0].args[2]).toBe(options);
53+
expect(navigator.camera.getPicture.calls.argsFor(0)[2]).toBe(options);
5454
});
5555

5656
it('should call errorCb when in window\'s appAvailability.getPicture a error orccurs', function() {
@@ -59,7 +59,7 @@ describe('Service: $cordovaCamera', function() {
5959
var errorObj = { someError: 1 };
6060

6161
spyOn(navigator.camera, 'getPicture')
62-
.andCallFake(function (successCb, errorCb, options) {
62+
.and.callFake(function (successCb, errorCb, options) {
6363
errorCb(errorObj);
6464
});
6565

@@ -79,15 +79,15 @@ describe('Service: $cordovaCamera', function() {
7979
var options = { someOptions: 1 };
8080

8181
spyOn(navigator.camera, 'cleanup')
82-
.andCallFake(function (successCb, errorCb) {
82+
.and.callFake(function (successCb, errorCb) {
8383
successCb();
8484
});
8585

8686
$cordovaCamera.cleanup();
8787

8888
$rootScope.$digest();
8989

90-
expect(navigator.camera.cleanup.calls[0].args[2]).toBe();
90+
expect(navigator.camera.cleanup.calls.argsFor(0)[2]).toBe();
9191
});
9292

9393
it('should call errorCb when in window\'s appAvailability.cleanup a error orccurs', function() {
@@ -96,7 +96,7 @@ describe('Service: $cordovaCamera', function() {
9696
var errorObj = { someError: 1 };
9797

9898
spyOn(navigator.camera, 'cleanup')
99-
.andCallFake(function (successCb, errorCb, options) {
99+
.and.callFake(function (successCb, errorCb, options) {
100100
errorCb(errorObj);
101101
});
102102

‎test/plugins/capture.spec.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('Service: $cordovaCapture', function() {
3232
var options = { someOption: 1 };
3333

3434
spyOn(navigator.device.capture, fnName)
35-
.andCallFake(function (successCb, errorCb, options) {
35+
.and.callFake(function (successCb, errorCb, options) {
3636
successCb(true);
3737
});
3838

@@ -44,7 +44,7 @@ describe('Service: $cordovaCapture', function() {
4444
$rootScope.$digest();
4545

4646
expect(result).toBe(true);
47-
expect(navigator.device.capture[fnName].calls[0].args[2]).toBe(options);
47+
expect(navigator.device.capture[fnName].calls.argsFor(0)[2]).toBe(options);
4848
});
4949

5050
it('navigator\'s device.capture.' + fnName + ' return `null` when device.capture is not set', function() {
@@ -70,7 +70,7 @@ describe('Service: $cordovaCapture', function() {
7070
var errorObj = { someError: 1 };
7171

7272
spyOn(navigator.device.capture, fnName)
73-
.andCallFake(function (successCb, errorCb, options) {
73+
.and.callFake(function (successCb, errorCb, options) {
7474
errorCb(errorObj);
7575
});
7676

‎test/plugins/datePicker.spec.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describe('Service: $cordovaDatePicker', function() {
1919
var options = { mode: 'date', date: new Date() };
2020

2121
spyOn(window.datePicker, 'show')
22-
.andCallFake(function (options, successCb, errorCb) {
22+
.and.callFake(function (options, successCb, errorCb) {
2323
successCb(options.date);
2424
});
2525

@@ -32,14 +32,14 @@ describe('Service: $cordovaDatePicker', function() {
3232
$rootScope.$digest();
3333

3434
expect(result).toBe(options.date);
35-
expect(window.datePicker.show.calls[0].args[0]).toBe(options);
35+
expect(window.datePicker.show.calls.argsFor(0)[0]).toBe(options);
3636
});
3737

3838
it('should have default options if none are passed', function() {
3939
var result;
4040

4141
spyOn(window.datePicker, 'show')
42-
.andCallFake(function(options, successCb, errorCb) {
42+
.and.callFake(function(options, successCb, errorCb) {
4343
successCb(options.date);
4444
});
4545

0 commit comments

Comments
 (0)