diff options
| author | Misko Hevery | 2012-02-06 21:56:35 -0800 |
|---|---|---|
| committer | Misko Hevery | 2012-02-21 22:46:00 -0800 |
| commit | 1752c8c44a7058e974ef208e583683eac8817789 (patch) | |
| tree | a8d49ecfd96e739f2de12a9b71385b46ad3c0cf7 /test | |
| parent | 6216dc046510204bafd159dba17ce0cc22db6c08 (diff) | |
| download | angular.js-1752c8c44a7058e974ef208e583683eac8817789.tar.bz2 | |
feat(directive): event now accessible as $event
Closes 259
Diffstat (limited to 'test')
| -rw-r--r-- | test/BinderSpec.js | 24 | ||||
| -rw-r--r-- | test/directivesSpec.js | 11 |
2 files changed, 4 insertions, 31 deletions
diff --git a/test/BinderSpec.js b/test/BinderSpec.js index b869c616..f7a1c1b3 100644 --- a/test/BinderSpec.js +++ b/test/BinderSpec.js @@ -438,30 +438,6 @@ describe('Binder', function() { assertChild(5, false); })); - it('ItShouldDisplayErrorWhenActionIsSyntacticlyIncorrect', function() { - module(function($exceptionHandlerProvider){ - $exceptionHandlerProvider.mode('log'); - }); - inject(function($rootScope, $exceptionHandler, $log, $compile) { - element = $compile( - '<div>' + - '<input type="button" ng:click="greeting=\'ABC\'"/>' + - '<input type="button" ng:click=":garbage:"/>' + - '</div>')($rootScope); - var first = jqLite(element.find('input')[0]); - var second = jqLite(element.find('input')[1]); - var errorLogs = $log.error.logs; - - browserTrigger(first, 'click'); - expect($rootScope.greeting).toBe('ABC'); - expect(errorLogs).toEqual([]); - - browserTrigger(second, 'click'); - expect($exceptionHandler.errors[0]). - toMatchError(/Syntax Error: Token ':' not a primary expression/); - }); - }); - it('ItShouldSelectTheCorrectRadioBox', inject(function($rootScope, $compile) { element = $compile( '<div>' + diff --git a/test/directivesSpec.js b/test/directivesSpec.js index 9dee4860..45f1cffc 100644 --- a/test/directivesSpec.js +++ b/test/directivesSpec.js @@ -137,15 +137,12 @@ describe("directive", function() { expect($rootScope.clicked).toEqual(true); })); - it('should stop event propagation', inject(function($rootScope, $compile) { - element = $compile('<div ng:click="outer = true"><div ng:click="inner = true"></div></div>')($rootScope); + it('should pass event object', inject(function($rootScope, $compile) { + element = $compile('<div ng:click="event = $event"></div>')($rootScope); $rootScope.$digest(); - expect($rootScope.outer).not.toBeDefined(); - expect($rootScope.inner).not.toBeDefined(); - browserTrigger(element.find('div'), 'click'); - expect($rootScope.outer).not.toBeDefined(); - expect($rootScope.inner).toEqual(true); + browserTrigger(element, 'click'); + expect($rootScope.event).toBeDefined(); })); }); |
