Skip to content

Commit 1ec6afe

Browse files
author
Niels Dequeker
committed
chore: Update unit-test setup to use Jasmine 2
1 parent 288e7fb commit 1ec6afe

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"angular-route": "1.2.x || 1.3.x",
3030
"angularfire": "~0.8.2",
3131
"bootstrap-css": "~3.2.0",
32-
"jasmine-jquery": "~1.7.0",
32+
"jasmine-jquery": "2.1.1",
3333
"jquery": "~2.1.1"
3434
},
3535
"ignore": [

karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = function(config) {
1+
module.exports = function (config) {
22
'use strict';
33

44
var cfg = {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"jshint-stylish": "^1.0.0",
2929
"karma": "^0.12.24",
3030
"karma-firefox-launcher": "^0.1.3",
31-
"karma-jasmine": "~0.1.0",
31+
"karma-jasmine": "~0.2.0",
3232
"karma-phantomjs-launcher": "^0.1.4",
3333
"load-grunt-tasks": "^0.6.0",
3434
"open": "0.0.5",

source/directives/uiTree.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@
5252
$scope.$digest();
5353

5454
expect(element.scope().emptyPlaceholderEnabled).toEqual(false);
55-
expect(element.scope().$emptyElm.parent()).toNotEqual(element);
55+
expect(element.scope().$emptyElm.parent()).not.toEqual(element);
5656
});
5757

5858
it('should hide the empty placeholder when ui-tree, ui-tree-nodes and empty-placeholder-enabled="false" are on the same element', function () {
5959
var element = createElement('<div ui-tree empty-placeholder-enabled="false" ui-tree-nodes="" ng-model="items"></div>');
6060
expect(element.scope().emptyPlaceholderEnabled).toEqual(false);
61-
expect(element.scope().$emptyElm.parent()).toNotEqual(element);
61+
expect(element.scope().$emptyElm.parent()).not.toEqual(element);
6262
});
6363

6464
it('should allow enabling / disabling dropping nodes', function () {

0 commit comments

Comments
 (0)