kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-28 21:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ngScenario): provide event parameters as object

Browse Source 
BREAKING CHANGE: browserTrigger now uses an eventData object instead of direct parameters for mouse events.
To migrate, place the `keys`,`x` and `y` parameters inside of an object and place that as the third parameter
for the browserTrigger function.
This commit is contained in:
Matias Niemelä
2013-09-06 16:06:37 -04:00
parent 32ad292611
commit 28f56a383e
4 changed files with 471 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
test/ngTouch/swipeSpec.js
View File

@@ -46,7 +46,11 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect(events.cancel).not.toHaveBeenCalled();
expect(events.end).not.toHaveBeenCalled();
browserTrigger(element, startEvent, [], 100, 20);
browserTrigger(element, startEvent,{
keys: [],
x: 100,
y: 20
});
expect(events.start).toHaveBeenCalled();
@@ -71,7 +75,11 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect(events.cancel).not.toHaveBeenCalled();
expect(events.end).not.toHaveBeenCalled();
browserTrigger(element, startEvent, [], 100, 20);
browserTrigger(element, startEvent,{
keys: [],
x: 100,
y: 20
});
expect(events.start).toHaveBeenCalled();
@@ -79,7 +87,11 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect(events.cancel).not.toHaveBeenCalled();
expect(events.end).not.toHaveBeenCalled();
browserTrigger(element, moveEvent, [], 140, 20);
browserTrigger(element, moveEvent,{
keys: [],
x: 140,
y: 20
});
expect(events.start).toHaveBeenCalled();
expect(events.move).toHaveBeenCalled();
@@ -104,7 +116,11 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect(events.cancel).not.toHaveBeenCalled();
expect(events.end).not.toHaveBeenCalled();
browserTrigger(element, moveEvent, [], 100, 40);
browserTrigger(element, moveEvent,{
keys: [],
x: 100,
y: 40
});
expect(events.start).not.toHaveBeenCalled();
expect(events.move).not.toHaveBeenCalled();
@@ -128,7 +144,11 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect(events.cancel).not.toHaveBeenCalled();
expect(events.end).not.toHaveBeenCalled();
browserTrigger(element, endEvent, [], 100, 40);
browserTrigger(element, endEvent,{
keys: [],
x: 100,
y: 40
});
expect(events.start).not.toHaveBeenCalled();
expect(events.move).not.toHaveBeenCalled();
@@ -152,7 +172,11 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect(events.cancel).not.toHaveBeenCalled();
expect(events.end).not.toHaveBeenCalled();
browserTrigger(element, startEvent, [], 100, 40);
browserTrigger(element, startEvent,{
keys: [],
x: 100,
y: 40
});
expect(events.start).toHaveBeenCalled();
@@ -160,13 +184,41 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect(events.cancel).not.toHaveBeenCalled();
expect(events.end).not.toHaveBeenCalled();
browserTrigger(element, moveEvent, [], 120, 40);
browserTrigger(element, moveEvent, [], 130, 40);
browserTrigger(element, moveEvent, [], 140, 40);
browserTrigger(element, moveEvent, [], 150, 40);
browserTrigger(element, moveEvent, [], 160, 40);
browserTrigger(element, moveEvent, [], 170, 40);
browserTrigger(element, moveEvent, [], 180, 40);
browserTrigger(element, moveEvent,{
keys: [],
x: 120,
y: 40
});
browserTrigger(element, moveEvent,{
keys: [],
x: 130,
y: 40
});
browserTrigger(element, moveEvent,{
keys: [],
x: 140,
y: 40
});
browserTrigger(element, moveEvent,{
keys: [],
x: 150,
y: 40
});
browserTrigger(element, moveEvent,{
keys: [],
x: 160,
y: 40
});
browserTrigger(element, moveEvent,{
keys: [],
x: 170,
y: 40
});
browserTrigger(element, moveEvent,{
keys: [],
x: 180,
y: 40
});
expect(events.start).toHaveBeenCalled();
expect(events.move.calls.length).toBe(7);
@@ -174,7 +226,11 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect(events.cancel).not.toHaveBeenCalled();
expect(events.end).not.toHaveBeenCalled();
browserTrigger(element, endEvent, [], 200, 40);
browserTrigger(element, endEvent,{
keys: [],
x: 200,
y: 40
});
expect(events.start).toHaveBeenCalled();
expect(events.move.calls.length).toBe(7);
@@ -199,7 +255,11 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect(events.cancel).not.toHaveBeenCalled();
expect(events.end).not.toHaveBeenCalled();
browserTrigger(element, startEvent, [], 100, 40);
browserTrigger(element, startEvent,{
keys: [],
x: 100,
y: 40
});
expect(events.start).toHaveBeenCalled();
@@ -207,11 +267,31 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect(events.cancel).not.toHaveBeenCalled();
expect(events.end).not.toHaveBeenCalled();
browserTrigger(element, moveEvent, [], 101, 40);
browserTrigger(element, moveEvent, [], 105, 40);
browserTrigger(element, moveEvent, [], 110, 40);
browserTrigger(element, moveEvent, [], 115, 40);
browserTrigger(element, moveEvent, [], 120, 40);
browserTrigger(element, moveEvent,{
keys: [],
x: 101,
y: 40
});
browserTrigger(element, moveEvent,{
keys: [],
x: 105,
y: 40
});
browserTrigger(element, moveEvent,{
keys: [],
x: 110,
y: 40
});
browserTrigger(element, moveEvent,{
keys: [],
x: 115,
y: 40
});
browserTrigger(element, moveEvent,{
keys: [],
x: 120,
y: 40
});
expect(events.start).toHaveBeenCalled();
expect(events.move.calls.length).toBe(3);
@@ -219,7 +299,11 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect(events.cancel).not.toHaveBeenCalled();
expect(events.end).not.toHaveBeenCalled();
browserTrigger(element, endEvent, [], 200, 40);
browserTrigger(element, endEvent,{
keys: [],
x: 200,
y: 40
});
expect(events.start).toHaveBeenCalled();
expect(events.move.calls.length).toBe(3);
@@ -244,7 +328,11 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect(events.cancel).not.toHaveBeenCalled();
expect(events.end).not.toHaveBeenCalled();
browserTrigger(element, startEvent, [], 100, 40);
browserTrigger(element, startEvent,{
keys: [],
x: 100,
y: 40
});
expect(events.start).toHaveBeenCalled();
@@ -252,11 +340,31 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect(events.cancel).not.toHaveBeenCalled();
expect(events.end).not.toHaveBeenCalled();
browserTrigger(element, moveEvent, [], 101, 41);
browserTrigger(element, moveEvent, [], 105, 55);
browserTrigger(element, moveEvent, [], 110, 60);
browserTrigger(element, moveEvent, [], 115, 70);
browserTrigger(element, moveEvent, [], 120, 80);
browserTrigger(element, moveEvent,{
keys: [],
x: 101,
y: 41
});
browserTrigger(element, moveEvent,{
keys: [],
x: 105,
y: 55
});
browserTrigger(element, moveEvent,{
keys: [],
x: 110,
y: 60
});
browserTrigger(element, moveEvent,{
keys: [],
x: 115,
y: 70
});
browserTrigger(element, moveEvent,{
keys: [],
x: 120,
y: 80
});
expect(events.start).toHaveBeenCalled();
expect(events.cancel).toHaveBeenCalled();
@@ -264,7 +372,11 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect(events.move).not.toHaveBeenCalled();
expect(events.end).not.toHaveBeenCalled();
browserTrigger(element, endEvent, [], 200, 40);
browserTrigger(element, endEvent,{
keys: [],
x: 200,
y: 40
});
expect(events.start).toHaveBeenCalled();
expect(events.cancel).toHaveBeenCalled();