Skip to content

Commit a5f51d5

Browse files
committed
Switch tests too jasmine 2 changing useMock() to jasmine.clock().install();
1 parent 34742d8 commit a5f51d5

4 files changed

Lines changed: 552 additions & 550 deletions

File tree

karma.conf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module.exports = function(config) {
3535
base: 'SauceLabs',
3636
browserName: 'firefox',
3737
platform: 'Linux',
38-
version: '4'
38+
version: '13'
3939
},
4040
sl_firefox_2: {
4141
base: 'SauceLabs',
@@ -92,7 +92,7 @@ module.exports = function(config) {
9292

9393
// list of files / patterns to load in the browser
9494
files: [
95-
'node_modules/sinon/pkg/sinon-1.17.2.js',
95+
'node_modules/sinon/pkg/sinon-1.7.3.js',
9696
'test/FakeXMLHttpRequestUpload.js',
9797
'src/*.js',
9898
'test/*Spec.js'

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@
4444
"karma-ie-launcher": "*",
4545
"karma-jasmine": "~0.3",
4646
"karma-sauce-launcher": "~0.3.0",
47-
"sinon": "~1.17.2"
47+
"sinon": "~1.7.3"
4848
}
4949
}

test/setupSpec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ describe('setup', function() {
112112
event.dataTransfer = {files: []};
113113
div.dispatchEvent(event);
114114
expect(onDrop).toHaveBeenCalled();
115-
expect(onDrop.callCount).toBe(1);
115+
expect(onDrop.calls.count()).toBe(1);
116116

117117
flow.unAssignDrop(div);
118118
div.dispatchEvent(event);
119-
expect(onDrop.callCount).toBe(1);
119+
expect(onDrop.calls.count()).toBe(1);
120120
});
121121
});
122122

0 commit comments

Comments
 (0)