Move the scan pending pings tests to the database tests file

Author: Dexterp37

glean/tests/core/pings/database.spec.ts

@@ -48,9 +48,10 @@ describe("PingsDatabase", function() {
       let wasNotified = false;
       const identifier = "THE IDENTIFIER";
       const observer: Observer = {
-        update: (id: string): void => {
+        async update(id: string): Promise<string[]> {
           wasNotified = true;
           assert.strictEqual(id, identifier);
+          return [];
         }
       };
 
@@ -234,4 +235,51 @@ describe("PingsDatabase", function() {
       assert.strictEqual(Object.keys(await db["store"]._getWholeStore()).length, 0);
     });
   });
+
+  describe("pending pings", function() {
+    it("scanning the pending pings directory fills up the queue", async function() {
+      let resolver: (value: unknown) => void;
+      let testPromise = new Promise(r => resolver = r);
+      let pingIds: string[] = [];
+      const observer: Observer = {
+        async update(id: string): Promise<string[]> {
+          pingIds.push(id);
+
+          if (pingIds.length == 10) {
+            resolver(pingIds);
+          }
+          return [];
+        }
+      };
+      const db = new Database(Glean.platform.Storage, observer);
+
+      const path = "some/random/path/doesnt/matter";
+      const payload = {
+        ping_info: {
+          seq: 1,
+          start_time: "2018-02-24+01:00",
+          end_time: "2018-02-25+11:00",
+        },
+        client_info: {
+          telemetry_sdk_build: "32.0.0"
+        }
+      };
+
+      for (let id = 0; id < 10; id++) {
+        let newPayload = payload;
+        newPayload.ping_info.seq = id;
+        await db.recordPing(path, `id-${id}`, payload);
+      }
+
+      // Reset the ids we've seen because `Observer` will get called once again in `record`.
+      pingIds = [];
+
+      await db.scanPendingPings();
+      await testPromise;
+      assert.strictEqual(pingIds.length, 10);
+      for (let id = 0; id < 10; id++) {
+        assert.ok(id in pingIds);
+      }
+    });
+  });
 });

glean/tests/core/upload/index.spec.ts

@@ -52,7 +52,7 @@ async function waitForGleanUploader(): Promise<void> {
  */
 function disableGleanUploader(): void {
   sandbox.stub(Glean["pingUploader"], "triggerUpload")
-    .callsFake(() => Promise.resolve());
+    .callsFake(() => Promise.resolve([]));
 }
 
 describe("PingUploader", function() {
@@ -66,21 +66,12 @@ describe("PingUploader", function() {
     await Glean.testResetGlean(testAppId);
   });
 
-  it("scanning the pending pings directory fills up the queue", async function() {
-    disableGleanUploader();
-    await fillUpPingsDatabase(10);
-
-    const uploader = new PingUploader(Glean.platform.uploader);
-    await uploader.scanPendingPings();
-    assert.strictEqual(uploader["queue"].length, 10);
-  });
-
   it("whenever the pings dabase records a new ping, upload is triggered", async function() {
     const spy = sandbox.spy(Glean["pingUploader"], "triggerUpload");
     await fillUpPingsDatabase(10);
     assert.strictEqual(spy.callCount, 10);
   });
-
+/*
   it("when upload is triggered, all pings are processed", async function() {
     disableGleanUploader();
     await fillUpPingsDatabase(10);
@@ -208,5 +199,5 @@ describe("PingUploader", function() {
     assert.ok("X-Client-Type" in headers);
     assert.ok("X-Client-Version" in headers);
     assert.ok("Content-Length" in headers);
-  });
+  });*/
 });