chore: fixing deprecated subscribe and tap calls (#6740)

ReactiveX · Jan 11, 2022 · c0ed6c5 · c0ed6c5
1 parent 7fd0575
commit c0ed6c5
Show file tree

Hide file tree

Showing 63 changed files with 947 additions and 1,114 deletions.
diff --git a/spec/Observable-spec.ts b/spec/Observable-spec.ts
@@ -30,11 +30,9 @@ describe('Observable', () => {
     });
 
     source.subscribe(
-      function (x) {
+      { next: function (x) {
         expect(x).to.equal(1);
-      },
-      null,
-      done
+      }, complete: done }
     );
   });
 
@@ -211,15 +209,13 @@ describe('Observable', () => {
       let mutatedByComplete = false;
 
       source.subscribe(
-        (x) => {
+        { next: (x) => {
           nexted = x;
           mutatedByNext = true;
-        },
-        null,
-        () => {
+        }, complete: () => {
           completed = true;
           mutatedByComplete = true;
-        }
+        } }
       );
 
       expect(mutatedByNext).to.be.true;
@@ -382,14 +378,13 @@ describe('Observable', () => {
       })
         .pipe(tap(() => (times += 1)))
         .subscribe(
-          function () {
+          { next: function () {
             if (times === 2) {
               subscription.unsubscribe();
             }
-          },
-          function () {
+          }, error: function () {
             errorCalled = true;
-          }
+          } }
         );
     });
 
@@ -415,15 +410,13 @@ describe('Observable', () => {
       })
         .pipe(tap(() => (times += 1)))
         .subscribe(
-          function () {
+          { next: function () {
             if (times === 2) {
               subscription.unsubscribe();
             }
-          },
-          null,
-          function () {
+          }, complete: function () {
             completeCalled = true;
-          }
+          } }
         );
     });
 
@@ -847,11 +840,9 @@ describe('Observable', () => {
           map((x) => x + '!!!')
         )
         .subscribe(
-          (x) => {
+          { next: (x) => {
             expect(x).to.equal('testtest!!!');
-          },
-          null,
-          done
+          }, complete: done }
         );
     });
 
@@ -1006,15 +997,13 @@ describe('Observable.lift', () => {
     const expected = [10, 20, 30];
 
     result.subscribe(
-      function (x) {
+      { next: function (x) {
         expect(x).to.equal(expected.shift());
-      },
-      () => {
+      }, error: () => {
         done(new Error('should not be called'));
-      },
-      () => {
+      }, complete: () => {
         done();
-      }
+      } }
     );
   });
 
@@ -1035,15 +1024,13 @@ describe('Observable.lift', () => {
     const expected = [10, 20, 30];
 
     result.subscribe(
-      function (x) {
+      { next: function (x) {
         expect(x).to.equal(expected.shift());
-      },
-      () => {
+      }, error: () => {
         done(new Error('should not be called'));
-      },
-      () => {
+      }, complete: () => {
         done();
-      }
+      } }
     );
   });
 
@@ -1065,15 +1052,13 @@ describe('Observable.lift', () => {
     const expected = [10, 20, 30];
 
     result.subscribe(
-      function (x) {
+      { next: function (x) {
         expect(x).to.equal(expected.shift());
-      },
-      () => {
+      }, error: () => {
         done(new Error('should not be called'));
-      },
-      () => {
+      }, complete: () => {
         done();
-      }
+      } }
     );
   });
 
@@ -1095,15 +1080,13 @@ describe('Observable.lift', () => {
     const expected = [30];
 
     result.subscribe(
-      function (x) {
+      { next: function (x) {
         expect(x).to.equal(expected.shift());
-      },
-      () => {
+      }, error: () => {
         done(new Error('should not be called'));
-      },
-      () => {
+      }, complete: () => {
         done();
-      }
+      } }
     );
   });
 
@@ -1124,15 +1107,13 @@ describe('Observable.lift', () => {
     const expected = [0, 10, 20, 30];
 
     result.subscribe(
-      function (x) {
+      { next: function (x) {
         expect(x).to.equal(expected.shift());
-      },
-      () => {
+      }, error: () => {
         done(new Error('should not be called'));
-      },
-      () => {
+      }, complete: () => {
         done();
-      }
+      } }
     );
   });
 
@@ -1308,15 +1289,13 @@ describe('Observable.lift', () => {
     const expected = [10, 20, 30];
 
     result.subscribe(
-      function (x) {
+      { next: function (x) {
         expect(x).to.equal(expected.shift());
-      },
-      () => {
+      }, error: () => {
         done(new Error('should not be called'));
-      },
-      () => {
+      }, complete: () => {
         done();
-      }
+      } }
     );
   });
 
@@ -1458,13 +1437,11 @@ describe('Observable.lift', () => {
     const expected = [2];
 
     result.subscribe(
-      function (x) {
+      { next: function (x) {
         expect(x).to.equal(expected.shift());
-      },
-      () => {
+      }, error: () => {
         done(new Error('should not be called'));
-      },
-      () => {
+      }, complete: () => {
         expect(log).to.deep.equal([
           'next 10', // map
           'next 20', // map
@@ -1474,7 +1451,7 @@ describe('Observable.lift', () => {
           'next 2', // count
         ]);
         done();
-      }
+      } }
     );
   });
 });