Update test imports

Author: alex-friedl

test/push-notifications/basic.js

@@ -4,7 +4,7 @@ import chai from "chai";
 import dirtyChai from "dirty-chai";
 import sinonChai from "sinon-chai";
 import { spy } from "sinon";
-import PN from "../../src";
+import PN from "../../src/index.js";
 import {
   UNKNOWN_METHOD,
   WEB_METHOD,

test/push-notifications/regIds.js

@@ -2,11 +2,11 @@
 
 import { expect } from "chai";
 import sinon from "sinon";
-import PN from "../../src";
-import sendFCM from "../../src/sendFCM";
-import sendADM from "../../src/sendADM";
-import sendWNS from "../../src/sendWNS";
-import sendWeb from "../../src/sendWeb";
+import PN from "../../src/index.js";
+import sendFCM from "../../src/sendFCM.js";
+import sendADM from "../../src/sendADM.js";
+import sendWNS from "../../src/sendWNS.js";
+import sendWeb from "../../src/sendWeb.js";
 
 const regIds = [
   "APA91bFQCD9Ndd8uVggMhj1usfeWsKIfGyBUWMprpZLGciWrMjS-77bIY24IMQNeEHzjidCcddnDxqYo-UEV03xw6ySmtIgQyzTqhSxhPGAi1maf6KDMAQGuUWc6L5Khze8YK9YrL9I_WD1gl49P3f_9hr08ZAS5Tw", // android

test/send/sendADM.js

@@ -2,8 +2,8 @@
 import { expect } from "chai";
 import sinon from "sinon";
 import adm from "node-adm";
-import PN from "../../src";
-import { testPushSuccess, testPushError, testPushException } from "../util";
+import PN from "../../src/index.js";
+import { testPushSuccess, testPushError, testPushException } from "../util.js";
 
 const method = "adm";
 const regIds = [

test/send/sendAPN.js

@@ -5,10 +5,10 @@ import sinonChai from "sinon-chai";
 import dirtyChai from "dirty-chai";
 
 import apn from "@parse/node-apn";
-import PN from "../../src";
-import APN from "../../src/sendAPN";
+import PN from "../../src/index.js";
+import APN from "../../src/sendAPN.js";
 
-import { testPushSuccess, testPushError, testPushException } from "../util";
+import { testPushSuccess, testPushError, testPushException } from "../util.js";
 
 // Mock apn certificate loading to prevent file access
 before(() => {

test/send/sendFCM.js

@@ -2,8 +2,8 @@
 import { expect } from "chai";
 import sinon from "sinon";
 import { Messaging as fbMessaging } from "firebase-admin/messaging";
-import PN from "../../src";
-import { testPushSuccess } from "../util";
+import PN from "../../src/index.js";
+import { testPushSuccess } from "../util.js";
 
 const method = "fcm";
 const regIds = [

test/send/sendWEB.js

@@ -2,8 +2,8 @@
 import { expect } from "chai";
 import sinon from "sinon";
 import webpush from "web-push";
-import PN from "../../src";
-import { testPushSuccess, testPushError, testPushException } from "../util";
+import PN from "../../src/index.js";
+import { testPushSuccess, testPushError, testPushException } from "../util.js";
 
 const method = "webPush";
 const regIds = [

test/send/sendWNS-accessToken.js

@@ -2,8 +2,8 @@
 import { expect } from "chai";
 import sinon from "sinon";
 import wns from "wns";
-import PN from "../../src";
-import { testPushSuccess, testPushError, testPushException } from "../util";
+import PN from "../../src/index.js";
+import { testPushSuccess, testPushError, testPushException } from "../util.js";
 
 const method = "wns";
 const regIds = [

test/send/sendWNS.js

@@ -2,8 +2,8 @@
 import { expect } from "chai";
 import sinon from "sinon";
 import wns from "wns";
-import PN from "../../src";
-import { testPushSuccess, testPushError, testPushException } from "../util";
+import PN from "../../src/index.js";
+import { testPushSuccess, testPushError, testPushException } from "../util.js";
 
 const method = "wns";
 const regIds = [

test/util.js

@@ -1,5 +1,4 @@
 import sinon from "sinon";
-import gcm from "node-gcm";
 import { expect } from "chai";
 
 export const testPushSuccess = (method, regIds) => (err, results, done) => {
@@ -13,10 +12,6 @@ export const testPushSuccess = (method, regIds) => (err, results, done) => {
       result.message.forEach((message) => {
         expect(message).to.have.property("regId");
         expect(regIds).to.include(message.regId);
-        if (method === "gcm") {
-          expect(message).to.have.property("originalRegId");
-          expect(regIds).to.include(message.originalRegId);
-        }
       });
     });
     done(err);
@@ -60,33 +55,4 @@ export const testPushException = (errMessage) => (err, results, done) => {
   }
 };
 
-export const sendOkMethodGCM = (regIds, data) =>
-  sinon.stub(gcm.Sender.prototype, "send", (message, recipients, retries, cb) => {
-    expect(recipients).to.be.instanceOf(Object);
-    expect(recipients).to.have.property("registrationTokens");
-    const { registrationTokens } = recipients;
-    expect(registrationTokens).to.be.instanceOf(Array);
-    registrationTokens.forEach((regId) => expect(regIds).to.include(regId));
-    expect(retries).to.be.a("number");
-    expect(message).to.be.instanceOf(gcm.Message);
-    expect(message.params.notification.title).to.eql(data.title);
-    expect(message.params.notification.body).to.eql(data.body);
-    expect(message.params.notification.sound).to.eql(data.sound);
-    expect(message.params.data.sender).to.eql(data.custom.sender);
-    expect(message.params.priority).to.equal("high");
-    // This params are duplicated in order to facilitate extraction
-    // So they are available as `gcm.notification.title` and as `title`
-    expect(message.params.data.title).to.eql(data.title);
-    expect(message.params.data.message).to.eql(data.body);
-    expect(message.params.data.sound).to.eql(data.sound);
-    cb(null, {
-      multicast_id: "abc",
-      success: registrationTokens.length,
-      failure: 0,
-      results: registrationTokens.map((token) => ({
-        message_id: "",
-        registration_id: token,
-        error: null,
-      })),
-    });
-  });
+