From a1d489a827c9299da6de0e4b23419f3667dbd8f2 Mon Sep 17 00:00:00 2001 From: Josquin Debaz Date: Fri, 15 Mar 2024 16:45:00 +0100 Subject: [PATCH 1/8] B7161682765: Stop using deprecated code in some event tests --- test/events.test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/events.test.js b/test/events.test.js index cb52187..cb76aa8 100644 --- a/test/events.test.js +++ b/test/events.test.js @@ -158,8 +158,8 @@ describe("events", () => { let anotherEvent = someEvents.createEvent(); // Assert: events created - expect(anEvent.on).toBeTruthy(); - expect(anotherEvent.on).toBeTruthy(); + expect(anEvent.register).toBeTruthy(); + expect(anotherEvent.register).toBeTruthy(); }); it("Event Category can keep named events", () => { @@ -168,7 +168,7 @@ describe("events", () => { let anEvent = someEvents.createEvent("namedEvent"); // Assert: events created - expect(anEvent.on).toBeTruthy(); + expect(anEvent.register).toBeTruthy(); }); it("Event Category can bind callback to named event using register", () => { From 60a223dbe294c508f4c7409543735ea4df9772cf Mon Sep 17 00:00:00 2001 From: Josquin Debaz Date: Thu, 7 Mar 2024 10:31:30 +0100 Subject: [PATCH 2/8] B7161682765: Make event() return an object instead of a function --- src/event.js | 12 ++---------- test/events.test.js | 12 ------------ 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/event.js b/src/event.js index 0780537..c851894 100644 --- a/src/event.js +++ b/src/event.js @@ -9,20 +9,12 @@ export default function event(spec, my) { my ||= {}; - // DEPRECATED: use that.register() instead. - function that(callback) { - // eslint-disable-next-line no-console - console.warn( - "Using an event as a function is deprecated. Send register() to the event instead.", - ); - - return that.register(callback); - } - let bindings = []; // #### Public API + let that = {}; + /** * Binds callback to event. The callback will be invoked whenever the event is fired. * diff --git a/test/events.test.js b/test/events.test.js index cb76aa8..4d3f9b6 100644 --- a/test/events.test.js +++ b/test/events.test.js @@ -290,18 +290,6 @@ describe("deprecated", () => { expect(console.warn).toHaveBeenCalled(); }); - it("'using an event as a function' delegates to register", () => { - // Arrange: an event - let anEvent = event(); - let spy = jasmine.createSpy("register"); - - anEvent.register = spy; - anEvent("foo"); - - expect(spy).toHaveBeenCalledWith("foo"); - expect(console.warn).toHaveBeenCalled(); - }); - it("off() method delegates to unregister", () => { // Arrange: an event let anEvent = event(); From 1983f31309ceb8c58d57cda8725f6aebf5321eab Mon Sep 17 00:00:00 2001 From: Josquin Debaz Date: Fri, 15 Mar 2024 16:38:45 +0100 Subject: [PATCH 3/8] B7161682765: Remove unused event.on() method --- src/event.js | 16 ---------------- test/events.test.js | 12 ------------ 2 files changed, 28 deletions(-) diff --git a/src/event.js b/src/event.js index c851894..a9fb05c 100644 --- a/src/event.js +++ b/src/event.js @@ -15,22 +15,6 @@ export default function event(spec, my) { let that = {}; - /** - * Binds callback to event. The callback will be invoked whenever the event is fired. - * - * @deprecated use that.register() instead. - * @param callback {function} - * @returns {eventBinding} - */ - that.on = function (callback) { - // eslint-disable-next-line no-console - console.warn( - "Sending on() to an event is deprecated. Send register() instead.", - ); - - return that.register(callback); - }; - /** * Binds callback to event. The callback will be invoked * whenever the event is fired. Avoid adding the same callback diff --git a/test/events.test.js b/test/events.test.js index 4d3f9b6..1ab4582 100644 --- a/test/events.test.js +++ b/test/events.test.js @@ -278,18 +278,6 @@ describe("deprecated", () => { console.warn = originalConsoleWarn; }); - it("on() method delegates to register", () => { - // Arrange: an event - let anEvent = event(); - let spy = jasmine.createSpy("register"); - - anEvent.register = spy; - anEvent.on("foo"); - - expect(spy).toHaveBeenCalledWith("foo"); - expect(console.warn).toHaveBeenCalled(); - }); - it("off() method delegates to unregister", () => { // Arrange: an event let anEvent = event(); From a6de3c084db3a333a1c1992df74e7047978f6afb Mon Sep 17 00:00:00 2001 From: Josquin Debaz Date: Fri, 15 Mar 2024 16:48:42 +0100 Subject: [PATCH 4/8] B7161682765: Remove unused event.onceOn() method --- src/event.js | 16 ---------------- test/events.test.js | 12 ------------ 2 files changed, 28 deletions(-) diff --git a/src/event.js b/src/event.js index a9fb05c..5212747 100644 --- a/src/event.js +++ b/src/event.js @@ -97,22 +97,6 @@ export default function event(spec, my) { return that; } - /** - * Like on() except callback will only be fired once - * - * @deprecated use registerOnce() instead - * @param callback {function} - * @returns {eventBinding} - */ - that.onceOn = function (callback) { - // eslint-disable-next-line no-console - console.warn( - "Sending onceOn() to an event is deprecated. Send registerOnce() instead.", - ); - - return that.registerOnce(callback); - }; - /** * Like on() except callback will only be fired once * diff --git a/test/events.test.js b/test/events.test.js index 1ab4582..51f20f3 100644 --- a/test/events.test.js +++ b/test/events.test.js @@ -290,18 +290,6 @@ describe("deprecated", () => { expect(console.warn).toHaveBeenCalled(); }); - it("onceOn() method delegates to registerOnce", () => { - // Arrange: an event - let anEvent = event(); - let spy = jasmine.createSpy("registerOnce"); - - anEvent.registerOnce = spy; - anEvent.onceOn(spy); - - expect(spy).toHaveBeenCalled(); - expect(console.warn).toHaveBeenCalled(); - }); - it("on() category method delegates to register", () => { // Arrange: an event let someEvents = eventCategory(); From 1400e19153f421e67bde9026a4e25a814b53a3d6 Mon Sep 17 00:00:00 2001 From: Josquin Debaz Date: Fri, 15 Mar 2024 16:50:32 +0100 Subject: [PATCH 5/8] B7161682765: Remove unused event.off() method --- src/event.js | 15 --------------- test/events.test.js | 12 ------------ 2 files changed, 27 deletions(-) diff --git a/src/event.js b/src/event.js index 5212747..5528b2e 100644 --- a/src/event.js +++ b/src/event.js @@ -115,21 +115,6 @@ export default function event(spec, my) { return onceBinding; }; - /** - * Removed "binding" attached to event. - * @deprecated use unregister() instead - * @param name {String} Name of event - * @param binding {eventBinding} Binding - */ - that.off = function (binding) { - // eslint-disable-next-line no-console - console.warn( - "Sending off() to an event is deprecated. Send unregister() instead.", - ); - - that.unregister(binding); - }; - /** * Removed "binding" attached to event. * @param name {String} Name of event diff --git a/test/events.test.js b/test/events.test.js index 51f20f3..8d62bc2 100644 --- a/test/events.test.js +++ b/test/events.test.js @@ -278,18 +278,6 @@ describe("deprecated", () => { console.warn = originalConsoleWarn; }); - it("off() method delegates to unregister", () => { - // Arrange: an event - let anEvent = event(); - let spy = jasmine.createSpy("unregister"); - - anEvent.unregister = spy; - anEvent.off("foo"); - - expect(spy).toHaveBeenCalledWith("foo"); - expect(console.warn).toHaveBeenCalled(); - }); - it("on() category method delegates to register", () => { // Arrange: an event let someEvents = eventCategory(); From a504fe5f88312c2d0a7d2615004f082f1d69f54c Mon Sep 17 00:00:00 2001 From: Josquin Debaz Date: Fri, 15 Mar 2024 16:56:29 +0100 Subject: [PATCH 6/8] B7161682765: Remove unused eventCategory.on() method --- src/eventCategory.js | 16 ---------------- test/events.test.js | 13 ------------- 2 files changed, 29 deletions(-) diff --git a/src/eventCategory.js b/src/eventCategory.js index f15b4a5..8d99a2f 100644 --- a/src/eventCategory.js +++ b/src/eventCategory.js @@ -33,22 +33,6 @@ export default function eventCategory() { return addEvent(event(), name); }; - /** - * Binds callback to a named event. The callback will be invoked whenever the event is fired. - * - * @deprecated use register() instead - * @param name {String} - * @param callback {function} - */ - that.on = function (name, callback) { - // eslint-disable-next-line no-console - console.warn( - "Sending on() to a category is deprecated. Send register() instead.", - ); - - return that.register(name, callback); - }; - /** * Binds callback to a named event. The callback will be invoked whenever the event is fired. * diff --git a/test/events.test.js b/test/events.test.js index 8d62bc2..46ddaee 100644 --- a/test/events.test.js +++ b/test/events.test.js @@ -278,19 +278,6 @@ describe("deprecated", () => { console.warn = originalConsoleWarn; }); - it("on() category method delegates to register", () => { - // Arrange: an event - let someEvents = eventCategory(); - let spy = jasmine.createSpy("register"); - - someEvents.register = spy; - - someEvents.on("namedEvent", "something else"); - - expect(spy).toHaveBeenCalledWith("namedEvent", "something else"); - expect(console.warn).toHaveBeenCalled(); - }); - it("off() category method delegates to unregister", () => { // Arrange: an event let someEvents = eventCategory(); From 76752114faa1a427d4fa680c3570ccde8218c0bf Mon Sep 17 00:00:00 2001 From: Josquin Debaz Date: Fri, 15 Mar 2024 16:58:35 +0100 Subject: [PATCH 7/8] B7161682765: Remove unused eventCategory.off() method --- src/eventCategory.js | 15 --------------- test/events.test.js | 13 ------------- 2 files changed, 28 deletions(-) diff --git a/src/eventCategory.js b/src/eventCategory.js index 8d99a2f..3f72d03 100644 --- a/src/eventCategory.js +++ b/src/eventCategory.js @@ -43,21 +43,6 @@ export default function eventCategory() { return ensureEventHolderFor(name).register(callback); }; - /** - * Removed "binding" attached to event. - * @deprecated use unregister() instead - * @param name {String} Name of event - * @param binding {eventBinding} Binding - */ - that.off = function (name, binding) { - // eslint-disable-next-line no-console - console.warn( - "Sending off() to a category is deprecated. Send unregister() instead.", - ); - - return that.unregister(name, binding); - }; - /** * Removed "binding" attached to event. * @param name {String} Name of event diff --git a/test/events.test.js b/test/events.test.js index 46ddaee..a8eef8e 100644 --- a/test/events.test.js +++ b/test/events.test.js @@ -278,19 +278,6 @@ describe("deprecated", () => { console.warn = originalConsoleWarn; }); - it("off() category method delegates to unregister", () => { - // Arrange: an event - let someEvents = eventCategory(); - let spy = jasmine.createSpy("unregister"); - - someEvents.unregister = spy; - - someEvents.off("namedEvent", "something else"); - - expect(spy).toHaveBeenCalledWith("namedEvent", "something else"); - expect(console.warn).toHaveBeenCalled(); - }); - it("onceOn() category method delegates to registerOnce", () => { // Arrange: an event let someEvents = eventCategory(); From 7ca546fbf0059cb5bb9588123f9b783ad01306ce Mon Sep 17 00:00:00 2001 From: Josquin Debaz Date: Fri, 15 Mar 2024 16:59:34 +0100 Subject: [PATCH 8/8] B7161682765: Remove unused eventCategory.onceOn() method --- src/eventCategory.js | 17 ----------------- test/events.test.js | 30 ------------------------------ 2 files changed, 47 deletions(-) diff --git a/src/eventCategory.js b/src/eventCategory.js index 3f72d03..29991f6 100644 --- a/src/eventCategory.js +++ b/src/eventCategory.js @@ -52,23 +52,6 @@ export default function eventCategory() { return ensureEventHolderFor(name).unregister(binding); }; - /** - * Like on() except callback will only be fired once - * - * @deprecated use registerOnce() instead - * @param name - * @param callback - * @returns {*} - */ - that.onceOn = function (name, callback) { - // eslint-disable-next-line no-console - console.warn( - "Sending onceOn() to a category is deprecated. Send registerOnce() instead.", - ); - - return that.registerOnce(name, callback); - }; - /** * Like on() except callback will only be fired once * diff --git a/test/events.test.js b/test/events.test.js index a8eef8e..37ca1bb 100644 --- a/test/events.test.js +++ b/test/events.test.js @@ -261,33 +261,3 @@ describe("events", () => { expect(triggered).toBeTruthy(); }); }); - -describe("deprecated", () => { - /* eslint-disable no-console */ - let originalConsoleWarn; - - beforeEach(() => { - console.warn = jasmine.createSpy("console.warn"); - }); - - beforeAll(() => { - originalConsoleWarn = console.warn; - }); - - afterAll(() => { - console.warn = originalConsoleWarn; - }); - - it("onceOn() category method delegates to registerOnce", () => { - // Arrange: an event - let someEvents = eventCategory(); - let spy = jasmine.createSpy("registerOnce"); - - someEvents.registerOnce = spy; - - someEvents.onceOn("namedEvent", "something else"); - - expect(spy).toHaveBeenCalledWith("namedEvent", "something else"); - expect(console.warn).toHaveBeenCalled(); - }); -});