Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix eventNames in engines without Reflect + add tests #48

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .zuul.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
ui: mocha-qunit
concurrency: 1
browsers:
- name: chrome
version: latest
- name: firefox
version: latest
- name: safari
version: 7..latest
- name: iphone
version: latest
- name: ie
version: 8..latest
5 changes: 4 additions & 1 deletion events.js
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,11 @@ function listenerCount(type) {
return 0;
}

var ownKeys = Object.getOwnPropertySymbols ? function(obj) {
return Object.getOwnPropertyNames(obj).concat(Object.getOwnPropertySymbols(obj));
} : objectKeys;
EventEmitter.prototype.eventNames = function eventNames() {
return this._eventsCount > 0 ? Reflect.ownKeys(this._events) : [];
return this._eventsCount > 0 ? ownKeys(this._events) : [];
};

// About 1.5x faster than the two-arg version of Array#splice().
Expand Down
29 changes: 29 additions & 0 deletions tests/events-list.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
'use strict';

require('./common');
var EventEmitter = require('../');
var assert = require('assert');

var EE = new EventEmitter();
var m = function() {};
EE.on('foo', function() {});
assert.equal(1, EE.eventNames().length);
assert.equal('foo', EE.eventNames()[0]);
EE.on('bar', m);
assert.equal(2, EE.eventNames().length);
assert.equal('foo', EE.eventNames()[0]);
assert.equal('bar', EE.eventNames()[1]);
EE.removeListener('bar', m);
assert.equal(1, EE.eventNames().length);
assert.equal('foo', EE.eventNames()[0]);

if (typeof Symbol !== 'undefined') {
var s = Symbol('s');
EE.on(s, m);
assert.equal(2, EE.eventNames().length);
assert.equal('foo', EE.eventNames()[0]);
assert.equal(s, EE.eventNames()[1]);
EE.removeListener(s, m);
assert.equal(1, EE.eventNames().length);
assert.equal('foo', EE.eventNames()[0]);
}
2 changes: 2 additions & 0 deletions tests/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ var require = function(file) {

require('./add-listeners.js');
require('./check-listener-leaks.js');
require('./events-list.js');
require('./listener-count.js');
require('./listeners-side-effects.js');
require('./listeners.js');
Expand All @@ -20,6 +21,7 @@ require('./modify-in-emit.js');
require('./num-args.js');
require('./once.js');
require('./set-max-listeners-side-effects.js');
require('./special-event-names.js');
require('./subclass.js');
require('./remove-all-listeners.js');
require('./remove-listeners.js');
43 changes: 43 additions & 0 deletions tests/special-event-names.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
'use strict';

var common = require('./common');
var EventEmitter = require('../');
var assert = require('assert');

var ee = new EventEmitter();
var handler = function() {};

assert.strictEqual(ee.eventNames().length, 0);

assert.strictEqual(ee._events.hasOwnProperty, undefined);
assert.strictEqual(ee._events.toString, undefined);

ee.on('__defineGetter__', handler);
ee.on('toString', handler);
ee.on('__proto__', handler);

assert.strictEqual(ee.eventNames()[0], '__defineGetter__');
assert.strictEqual(ee.eventNames()[1], 'toString');

assert.strictEqual(ee.listeners('__defineGetter__').length, 1);
assert.strictEqual(ee.listeners('__defineGetter__')[0], handler);
assert.strictEqual(ee.listeners('toString').length, 1);
assert.strictEqual(ee.listeners('toString')[0], handler);

// Only run __proto__ tests if that property can actually be set
if ({ __proto__: 'ok' }.__proto__ === 'ok') {
assert.strictEqual(ee.eventNames().length, 3);
assert.strictEqual(ee.eventNames()[2], '__proto__');
assert.strictEqual(ee.listeners('__proto__').length, 1);
assert.strictEqual(ee.listeners('__proto__')[0], handler);

ee.on('__proto__', common.mustCall(function(val) {
assert.strictEqual(val, 1);
}));
ee.emit('__proto__', 1);

process.on('__proto__', common.mustCall(function(val) {
assert.strictEqual(val, 1);
}));
process.emit('__proto__', 1);
}