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

Commit b2f5964

Browse files
committed
Uncommented some tests.
Changed target angular version to 1.0.x to complete tests, till ui-sortable is ready for 1.2.x.
1 parent 9a844d1 commit b2f5964

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
"package.json"
1717
],
1818
"dependencies": {
19-
"angular": "~1.x",
19+
"angular": "~1.0.x",
2020
"jquery-ui": ">= 1.9",
2121
"jquery-simulate": "latest"
2222
},
2323
"devDependencies": {
24-
"angular-mocks": "~1.x"
24+
"angular-mocks": "~1.0.x"
2525
}
2626
}

test/sortable.spec.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,17 @@ describe('uiSortable', function() {
134134
li.simulate('drag', { dy: dy });
135135
expect($rootScope.items.map(function(x){ return x.text; })).toEqual(["One", "Three", "Four", "Two"]);
136136

137-
// // fails on angular 1.2
138-
// li = element.find(':eq(2)');
139-
// dy = -(2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
140-
// li.simulate('drag', { dy: dy });
141-
// expect($rootScope.items.map(function(x){ return x.text; })).toEqual(["Four", "One", "Three", "Two"]);
142-
143-
// // fails on angular 1.2
144-
// li = element.find(':eq(3)');
145-
// dy = -(2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
146-
// li.simulate('drag', { dy: dy });
147-
// expect($rootScope.items.map(function(x){ return x.text; })).toEqual(["Four", "Two", "One", "Three"]);
137+
// fails on angular 1.2
138+
li = element.find(':eq(2)');
139+
dy = -(2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
140+
li.simulate('drag', { dy: dy });
141+
expect($rootScope.items.map(function(x){ return x.text; })).toEqual(["Four", "One", "Three", "Two"]);
142+
143+
// fails on angular 1.2
144+
li = element.find(':eq(3)');
145+
dy = -(2 + EXTRA_DY_PERCENTAGE) * li.outerHeight();
146+
li.simulate('drag', { dy: dy });
147+
expect($rootScope.items.map(function(x){ return x.text; })).toEqual(["Four", "Two", "One", "Three"]);
148148

149149
// also placing right above the locked node seems a bit harder !?!?
150150

@@ -165,13 +165,15 @@ describe('uiSortable', function() {
165165

166166
host.append(elementTop).append(elementBottom);
167167

168+
// fails on angular 1.2
168169
var li1 = elementTop.find(':eq(0)');
169170
var li2 = elementBottom.find(':eq(0)');
170171
var dy = EXTRA_DY_PERCENTAGE * li1.outerHeight() + (li2.position().top - li1.position().top);
171172
li1.simulate('drag', { dy: dy });
172173
expect($rootScope.itemsTop).toEqual(["Top Two", "Top Three"]);
173174
expect($rootScope.itemsBottom).toEqual(["Bottom One", "Top One", "Bottom Two", "Bottom Three"]);
174175

176+
// fails on angular 1.2
175177
li1 = elementBottom.find(':eq(1)');
176178
li2 = elementTop.find(':eq(1)');
177179
dy = -EXTRA_DY_PERCENTAGE * li1.outerHeight() - (li1.position().top - li2.position().top);

0 commit comments

Comments
 (0)