Skip to content

Commit 8f3fd22

Browse files
committed
added better testing of $event passing to ui-event
1 parent 943cded commit 8f3fd22

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

modules/directives/event/test/eventSpec.js

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,8 @@ describe('uiEvent', function() {
99

1010
//helper for creating event elements
1111
function eventElement(scope, eventObject) {
12-
function uiEventAttrs() {
13-
var str = '', first = true;
14-
angular.forEach(eventObject, function(val, key) {
15-
if (first) first = false;
16-
else str += ', ';
17-
str += "'"+key+"': '"+val+"'";
18-
});
19-
return '{'+str+'}';
20-
};
21-
return $compile('<span ui-event="'+uiEventAttrs()+'">')(scope);
12+
scope._uiEvent = eventObject || {};
13+
return $compile('<span ui-event="_uiEvent">')(scope);
2214
};
2315

2416
describe('test', function() {
@@ -61,11 +53,15 @@ describe('uiEvent', function() {
6153
it('should allow passing of $event object', function() {
6254
$scope = $rootScope.$new();
6355
$scope.clicky = function(par1, $event, par2) {
64-
expect($event).toBeTruthy();
65-
expect(par1 + par2).toBe(3);
56+
expect($event.foo).toBe('bar');
57+
expect(par1).toBe(1);
58+
expect(par2).toBe(2);
6659
};
6760
var elm = eventElement($scope, {'click': 'clicky(1, $event, 2)'});
68-
$(elm).trigger('click');
61+
$(elm).trigger({
62+
type: 'click',
63+
foo: 'bar'
64+
});
6965
});
7066
});
7167

0 commit comments

Comments
 (0)