Test fixes

Author: tolyo

src/core/scope/scope.spec.js

@@ -986,71 +986,6 @@ describe("Scope", () => {
 
         expect(spy).not.toHaveBeenCalled();
       });
-
-      it("deregisters repeated watch keys only once", async () => {
-        const spy = jasmine.createSpy("repeated watch");
-        scope.a = 1;
-
-        const unwatch = scope.$watch("a + a", spy);
-
-        await wait();
-        expect(spy).toHaveBeenCalledTimes(1);
-        spy.calls.reset();
-
-        /** @type {Function} */ (unwatch)();
-        scope.a = 2;
-        await wait();
-
-        expect(spy).not.toHaveBeenCalled();
-      });
-
-      it("does not trigger twice for repeated array expression keys", async () => {
-        const spy = jasmine.createSpy("repeated array watch");
-        scope.a = 1;
-
-        scope.$watch("[a, a]", spy);
-
-        await wait();
-        expect(spy).toHaveBeenCalledTimes(1);
-        spy.calls.reset();
-
-        scope.a = 2;
-        await wait();
-
-        expect(spy).toHaveBeenCalledTimes(1);
-        expect(spy.calls.mostRecent().args[0]).toEqual([2, 2]);
-      });
-
-      it("does not trigger twice for repeated object expression keys and deregisters cleanly", async () => {
-        const spy = jasmine.createSpy("repeated object watch");
-        scope.a = 1;
-
-        const unwatch = scope.$watch("{left: a, right: a}", spy);
-
-        await wait();
-        expect(spy).toHaveBeenCalledTimes(1);
-        expect(spy.calls.mostRecent().args[0]).toEqual({
-          left: 1,
-          right: 1,
-        });
-        spy.calls.reset();
-
-        scope.a = 2;
-        await wait();
-
-        expect(spy).toHaveBeenCalledTimes(1);
-        expect(spy.calls.mostRecent().args[0]).toEqual({
-          left: 2,
-          right: 2,
-        });
-        spy.calls.reset();
-
-        /** @type {Function} */ (unwatch)();
-        scope.a = 3;
-        await wait();
-
-        expect(spy).not.toHaveBeenCalled();
-      });
     });
 
     describe("apply expression", () => {
@@ -1360,25 +1295,6 @@ describe("Scope", () => {
         expect(count).toEqual(3);
       });
 
-      it("does not register duplicate listeners for repeated watch keys", async () => {
-        scope.counter = 0;
-        scope.a = 1;
-
-        scope.$watch("a + a", () => {
-          scope.counter++;
-        });
-        await wait();
-        expect(scope.counter).toBe(1);
-
-        scope.a = 2;
-        await wait();
-        expect(scope.counter).toBe(2);
-
-        scope.a = 3;
-        await wait();
-        expect(scope.counter).toBe(3);
-      });
-
       it("calls the listener function when a deeply nested watched value changes", async () => {
         scope.counter = 0;
         scope.someValue = { b: { c: { d: 1 } } };

src/core/scope/scope.ts

@@ -183,15 +183,10 @@ function registerListenerKeys(
   watchKeys: Array<string | undefined>,
   schedule = false,
 ): void {
-  const seenKeys = new Set<string>();
-
   for (let i = 0, l = watchKeys.length; i < l; i++) {
     const key = watchKeys[i];
 
     if (!key) continue;
-
-    if (seenKeys.has(key)) continue;
-    seenKeys.add(key);
     scope._registerKey(key, listener);
 
     if (schedule) scope._scheduleListener([listener]);
@@ -203,16 +198,10 @@ function deregisterListenerKeys(
   listenerId: number,
   watchKeys: Array<string | undefined>,
 ): void {
-  const seenKeys = new Set<string>();
-
   for (let i = 0, l = watchKeys.length; i < l; i++) {
     const key = watchKeys[i];
 
-    if (!key) continue;
-
-    if (seenKeys.has(key)) continue;
-    seenKeys.add(key);
-    scope._deregisterKey(key, listenerId);
+    if (key) scope._deregisterKey(key, listenerId);
   }
 }