Revert "fix: encode fix for integration tests"

sujithvn · sujithvn · commit 84a032047052 · 2023-06-12T13:27:14.000+05:30
This reverts commit e724029. Signed-off-by: Sujith <mail.sujithvn@gmail.com>
diff --git a/apps/reaction/tests/integration/api/mutations/archiveProducts/archiveProducts.test.js b/apps/reaction/tests/integration/api/mutations/archiveProducts/archiveProducts.test.js
@@ -9,8 +9,8 @@ jest.setTimeout(300000);
 
 const internalShopId = "123";
 const internalProductId = "999";
-const opaqueShopId = "123";
-const opaqueProductId = "999";
+const opaqueProductId = "cmVhY3Rpb24vcHJvZHVjdDo5OTk="; // reaction/product:999
+const opaqueShopId = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 const internalVariantIds = ["875", "874", "925"];
 
 const shopName = "Test Shop";
diff --git a/apps/reaction/tests/integration/api/mutations/cloneProductVariants/cloneProductVariants.test.js b/apps/reaction/tests/integration/api/mutations/cloneProductVariants/cloneProductVariants.test.js
@@ -9,9 +9,9 @@ jest.setTimeout(300000);
 
 const internalShopId = "123";
 const internalProductId = "999";
-const opaqueShopId = "123";
+const opaqueShopId = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 const internalVariantIds = ["875", "874", "925"];
-const opaqueVariantIdOne = "875";
+const opaqueVariantIdOne = "cmVhY3Rpb24vcHJvZHVjdDo4NzU="; // reaction/product:875
 
 const shopName = "Test Shop";
 
diff --git a/apps/reaction/tests/integration/api/mutations/cloneProducts/cloneProducts.test.js b/apps/reaction/tests/integration/api/mutations/cloneProducts/cloneProducts.test.js
@@ -9,8 +9,8 @@ jest.setTimeout(300000);
 
 const internalShopId = "123";
 const internalProductId = "999";
-const opaqueShopId = "123";
-const opaqueProductId = "999";
+const opaqueProductId = "cmVhY3Rpb24vcHJvZHVjdDo5OTk="; // reaction/product:999
+const opaqueShopId = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 const internalVariantIds = ["875", "874", "925"];
 
 const shopName = "Test Shop";
diff --git a/apps/reaction/tests/integration/api/mutations/createProduct/createProduct.test.js b/apps/reaction/tests/integration/api/mutations/createProduct/createProduct.test.js
@@ -8,7 +8,7 @@ const CreateProductMutation = importAsString("./createProduct.graphql");
 jest.setTimeout(300000);
 
 const internalShopId = "123";
-const opaqueShopId = "123";
+const opaqueShopId = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 
 const shopName = "Test Shop";
 
@@ -159,7 +159,7 @@ test("expect a product to be created with all product input", async () => {
 
 test("non-opaque _id can be provided optionally", async () => {
   const id = "CUSTOM_ID";
-  const encodedId = "CUSTOM_ID";
+  const encodedId = "cmVhY3Rpb24vcHJvZHVjdDpDVVNUT01fSUQ="; // reaction/product:CUSTOM_ID
 
   let result;
   try {
diff --git a/apps/reaction/tests/integration/api/mutations/createProductVariant/createProductVariant.test.js b/apps/reaction/tests/integration/api/mutations/createProductVariant/createProductVariant.test.js
@@ -9,8 +9,8 @@ jest.setTimeout(300000);
 
 const internalShopId = "123";
 const internalProductId = "999";
-const opaqueShopId = "123";
-const opaqueProductId = "999";
+const opaqueProductId = "cmVhY3Rpb24vcHJvZHVjdDo5OTk="; // reaction/product:999
+const opaqueShopId = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 
 const shopName = "Test Shop";
 
@@ -144,7 +144,7 @@ test("expect a variant to be created with all product variant input", async () =
 
 test("non-opaque _id can be provided optionally", async () => {
   const id = "CUSTOM_VARIANT_ID";
-  const encodedId = "CUSTOM_VARIANT_ID";
+  const encodedId = "cmVhY3Rpb24vcHJvZHVjdDpDVVNUT01fVkFSSUFOVF9JRA=="; // reaction/product:CUSTOM_VARIANT_ID
 
   let result;
   try {
diff --git a/apps/reaction/tests/integration/api/mutations/publishProductsToCatalog/publishProductsToCatalog.test.js b/apps/reaction/tests/integration/api/mutations/publishProductsToCatalog/publishProductsToCatalog.test.js
@@ -9,11 +9,15 @@ jest.setTimeout(300000);
 
 const internalShopId = "123";
 const internalProductId = "999";
-const opaqueProductId = "999";
+const opaqueProductId = "cmVhY3Rpb24vcHJvZHVjdDo5OTk="; // reaction/product:999
 const internalTagIds = ["923", "924"];
 const internalVariantIds = ["875", "874", "925"];
 
-const opaqueCatalogVariantIds = ["875", "874", "925"];
+const opaqueCatalogVariantIds = [
+  "cmVhY3Rpb24vY2F0YWxvZ1Byb2R1Y3RWYXJpYW50Ojg3NQ==",
+  "cmVhY3Rpb24vY2F0YWxvZ1Byb2R1Y3RWYXJpYW50Ojg3NA==",
+  "cmVhY3Rpb24vY2F0YWxvZ1Byb2R1Y3RWYXJpYW50OjkyNQ=="
+]; // reaction/catalogProductVariant
 
 const shopName = "Test Shop";
 
diff --git a/apps/reaction/tests/integration/api/mutations/surcharges/createSurcharge.test.js b/apps/reaction/tests/integration/api/mutations/surcharges/createSurcharge.test.js
@@ -8,7 +8,7 @@ const CreateSurchargeMutation = importAsString("./CreateSurchargeMutation.graphq
 jest.setTimeout(300000);
 
 const internalShopId = "123";
-const opaqueShopId = "123";
+const opaqueShopId = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 const shopName = "Test Shop";
 const surchargeAttributes = [
   { property: "vendor", value: "reaction", propertyType: "string", operator: "eq" },
diff --git a/apps/reaction/tests/integration/api/mutations/surcharges/deleteSurcharge.test.js b/apps/reaction/tests/integration/api/mutations/surcharges/deleteSurcharge.test.js
@@ -9,7 +9,7 @@ const DeleteSurchargeMutation = importAsString("./DeleteSurchargeMutation.graphq
 jest.setTimeout(300000);
 
 const internalShopId = "123";
-const opaqueShopId = "123";
+const opaqueShopId = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 const shopName = "Test Shop";
 const surchargeAttributes = [
   { property: "vendor", value: "reaction", propertyType: "string", operator: "eq" },
diff --git a/apps/reaction/tests/integration/api/mutations/surcharges/updateSurcharge.test.js b/apps/reaction/tests/integration/api/mutations/surcharges/updateSurcharge.test.js
@@ -9,7 +9,7 @@ const UpdateSurchargeMutation = importAsString("./UpdateSurchargeMutation.graphq
 jest.setTimeout(300000);
 
 const internalShopId = "123";
-const opaqueShopId = "123";
+const opaqueShopId = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 const shopName = "Test Shop";
 const surchargeAttributes = [
   { property: "vendor", value: "reaction", propertyType: "string", operator: "eq" },
diff --git a/apps/reaction/tests/integration/api/queries/account/account.test.js b/apps/reaction/tests/integration/api/queries/account/account.test.js
@@ -7,12 +7,12 @@ const AccountFullQuery = importAsString("./AccountFullQuery.graphql");
 jest.setTimeout(300000);
 
 const internalNonAdminAccountId = "123";
-const opaqueNonAdminAccountId = "123";
+const opaqueNonAdminAccountId = "cmVhY3Rpb24vYWNjb3VudDoxMjM=";
 const internalAdminAccountId = "456";
 const internalOtherAccountId = "789";
-const opaqueOtherAccountId = "789";
+const opaqueOtherAccountId = "cmVhY3Rpb24vYWNjb3VudDo3ODk=";
 const internalGroupId = "mockCustomerGroup";
-const opaqueGroupId = "mockCustomerGroup";
+const opaqueGroupId = "cmVhY3Rpb24vZ3JvdXA6bW9ja0N1c3RvbWVyR3JvdXA=";
 
 const mockCustomerGroup = {
   _id: internalGroupId,
diff --git a/apps/reaction/tests/integration/api/queries/orderById/orderById.test.js b/apps/reaction/tests/integration/api/queries/orderById/orderById.test.js
@@ -6,15 +6,15 @@ import insertPrimaryShop from "@reactioncommerce/api-utils/tests/insertPrimarySh
 jest.setTimeout(300000);
 
 const mockShopId = "integ-test-shop-id";
-const opaqueShopId = "integ-test-shop-id";
+const opaqueShopId = "cmVhY3Rpb24vc2hvcDppbnRlZy10ZXN0LXNob3AtaWQ="; // reaction/order:integ-test-shop-id
 const shopName = "Test Shop";
 
 // --- Mock data for auth-ed order test
 const orderId = "integ-test-order-id";
-const opaqueOrderId = "integ-test-order-id";
+const opaqueOrderId = "cmVhY3Rpb24vb3JkZXI6aW50ZWctdGVzdC1vcmRlci1pZA=="; // reaction/order:integ-test-order-id
 
 const accountId = "integ-test-account-id";
-const opaqueAccountId = "integ-test-account-id";
+const opaqueAccountId = "cmVhY3Rpb24vYWNjb3VudDppbnRlZy10ZXN0LWFjY291bnQtaWQ="; // reaction/account:integ-test-account-id
 
 const mockOrdersAccount = Factory.Account.makeOne({
   _id: accountId
diff --git a/apps/reaction/tests/integration/api/queries/orderByReferenceId/orderByReferenceId.test.js b/apps/reaction/tests/integration/api/queries/orderByReferenceId/orderByReferenceId.test.js
@@ -10,12 +10,12 @@ jest.setTimeout(300000);
 
 // Mock data for logged-in user test
 const mockShopId = "integ-test-shop-id";
-const opaqueShopId = "integ-test-shop-id";
+const opaqueShopId = "cmVhY3Rpb24vc2hvcDppbnRlZy10ZXN0LXNob3AtaWQ=";
 const shopName = "Test Shop";
 const orderId = "integ-test-order-id";
 const orderReferenceId = "123456789";
 const accountId = "integ-test-account-id";
-const opaqueAccountId = "integ-test-account-id";
+const opaqueAccountId = "cmVhY3Rpb24vYWNjb3VudDppbnRlZy10ZXN0LWFjY291bnQtaWQ=";
 
 const mockOrdersAccount = Factory.Account.makeOne({
   _id: accountId
diff --git a/apps/reaction/tests/integration/api/queries/ordersByAccountId/ordersByAccountId.test.js b/apps/reaction/tests/integration/api/queries/ordersByAccountId/ordersByAccountId.test.js
@@ -10,8 +10,8 @@ jest.setTimeout(300000);
 const shopId = "integ-test-shop-id";
 const accountId = "integ-test-account-id";
 const differentId = "integ-test-different-id";
-const opaqueAccountId = "integ-test-account-id";
-const opaqueShopId = "integ-test-shop-id";
+const opaqueAccountId = "cmVhY3Rpb24vYWNjb3VudDppbnRlZy10ZXN0LWFjY291bnQtaWQ=";
+const opaqueShopId = "cmVhY3Rpb24vc2hvcDppbnRlZy10ZXN0LXNob3AtaWQ=";
 const orderId = "integ-test-order-id";
 const mockAccount = Factory.Account.makeOne({
   _id: accountId
diff --git a/apps/reaction/tests/integration/api/queries/viewer/viewer.test.js b/apps/reaction/tests/integration/api/queries/viewer/viewer.test.js
@@ -44,7 +44,7 @@ test("authenticated", async () => {
   const result = await viewerQuery();
   expect(result).toEqual({
     viewer: {
-      _id: "123",
+      _id: "cmVhY3Rpb24vYWNjb3VudDoxMjM=",
       addressBook: {
         nodes: [
           { address1: "mockAddress1" }
diff --git a/apps/reaction/tests/mocks/mockCatalogProducts.js b/apps/reaction/tests/mocks/mockCatalogProducts.js
@@ -7,18 +7,26 @@ import { internalTagIds, opaqueTagIds } from "./mockTags";
  */
 
 export const internalProductIds = ["999", "222"];
-export const opaqueProductIds = ["999", "222"];
+export const opaqueProductIds = ["cmVhY3Rpb24vcHJvZHVjdDo5OTk=", "cmVhY3Rpb24vcHJvZHVjdDoyMjI="]; // reaction/product
 
 export const internalVariantIds = ["875", "874", "873"];
-export const opaqueVariantIds = ["875", "874", "873"];
+export const opaqueVariantIds = [
+  "cmVhY3Rpb24vcHJvZHVjdDo4NzU=",
+  "cmVhY3Rpb24vcHJvZHVjdDo4NzQ=",
+  "cmVhY3Rpb24vcHJvZHVjdDo4NzM="
+]; // reaction/product
 
 export const internalCatalogProductIds = ["999", "222"];
-export const opaqueCatalogProductIds = ["999", "222"];
+export const opaqueCatalogProductIds = ["cmVhY3Rpb24vY2F0YWxvZ1Byb2R1Y3Q6OTk5", "cmVhY3Rpb24vY2F0YWxvZ1Byb2R1Y3Q6MjIy"]; // reaction/catalogProduct
 
-export const opaqueCatalogVariantIds = ["875", "874", "873"];
+export const opaqueCatalogVariantIds = [
+  "cmVhY3Rpb24vY2F0YWxvZ1Byb2R1Y3RWYXJpYW50Ojg3NQ==",
+  "cmVhY3Rpb24vY2F0YWxvZ1Byb2R1Y3RWYXJpYW50Ojg3NA==",
+  "cmVhY3Rpb24vY2F0YWxvZ1Byb2R1Y3RWYXJpYW50Ojg3Mw=="
+]; // reaction/catalogProductVariant
 
 export const internalCatalogItemIds = ["999", "222"];
-export const opaqueCatalogItemIds = ["999", "222"];
+export const opaqueCatalogItemIds = ["cmVhY3Rpb24vY2F0YWxvZ0l0ZW06OTk5", "cmVhY3Rpb24vY2F0YWxvZ0l0ZW06MjIy"]; // reaction/catalogItem
 
 export const createdAt = new Date("2018-04-16T15:34:28.043Z");
 export const updatedAt = new Date("2018-04-17T15:34:28.043Z");
@@ -139,7 +147,7 @@ export const mockExternalCatalogOptions = [
     pricing: [
       {
         currency: {
-          _id: "USD",
+          _id: "cmVhY3Rpb24vY3VycmVuY3k6VVNE",
           code: "USD"
         },
         compareAtPrice: null,
@@ -187,7 +195,7 @@ export const mockExternalCatalogOptions = [
     pricing: [
       {
         currency: {
-          _id: "USD",
+          _id: "cmVhY3Rpb24vY3VycmVuY3k6VVNE",
           code: "USD"
         },
         compareAtPrice: null,
@@ -288,7 +296,7 @@ export const mockExternalCatalogVariants = [
     pricing: [
       {
         currency: {
-          _id: "USD",
+          _id: "cmVhY3Rpb24vY3VycmVuY3k6VVNE",
           code: "USD"
         },
         compareAtPrice: { amount: 10 },
@@ -539,7 +547,7 @@ export const mockExternalCatalogProducts = [
       pricing: [
         {
           currency: {
-            _id: "USD",
+            _id: "cmVhY3Rpb24vY3VycmVuY3k6VVNE",
             code: "USD"
           },
           compareAtPrice: { amount: 10 },
@@ -642,7 +650,7 @@ export const mockExternalCatalogProducts = [
       pricing: [
         {
           currency: {
-            _id: "USD",
+            _id: "cmVhY3Rpb24vY3VycmVuY3k6VVNE",
             code: "USD"
           },
           compareAtPrice: { amount: 35 },
diff --git a/apps/reaction/tests/mocks/mockShop.js b/apps/reaction/tests/mocks/mockShop.js
@@ -4,5 +4,5 @@
  */
 
 export const internalShopId = "123";
-export const opaqueShopId = "123";
+export const opaqueShopId = "cmVhY3Rpb24vc2hvcDoxMjM="; // reaction/shop:123
 export const shopName = "Test Shop";
diff --git a/apps/reaction/tests/mocks/mockTags.js b/apps/reaction/tests/mocks/mockTags.js
@@ -4,4 +4,4 @@
  */
 
 export const internalTagIds = ["923", "924"];
-export const opaqueTagIds = ["923", "924"];
+export const opaqueTagIds = ["cmVhY3Rpb24vdGFnOjkyMw==", "cmVhY3Rpb24vdGFnOjkyNA=="]; // reaction/tag
