updated tests to match new formatting"

This commit is contained in:
Kendall Werts 2020-01-22 23:50:19 -06:00
parent 3aa2902cde
commit 61b5c2e4b2

View file

@ -93,51 +93,53 @@ browser.tests = {
); );
// add 200ok (bad data). // add 200ok (bad data).
await browser.storage.sync.set({ const testSites = {
"assignedSites": { "siteContainerMap@@_developer.mozilla.org": {
"siteContainerMap@@_developer.mozilla.org": { "userContextId": "588",
"userContextId": "588", "neverAsk": true,
"neverAsk": true, "identityMacAddonUUID": "d20d7af2-9866-468e-bb43-541efe8c2c2e",
"identityMacAddonUUID": "d20d7af2-9866-468e-bb43-541efe8c2c2e", "hostname": "developer.mozilla.org"
"hostname": "developer.mozilla.org" },
}, "siteContainerMap@@_reddit.com": {
"siteContainerMap@@_reddit.com": { "userContextId": "592",
"userContextId": "592", "neverAsk": true,
"neverAsk": true, "identityMacAddonUUID": "3dc916fb-8c0a-4538-9758-73ef819a45f7",
"identityMacAddonUUID": "3dc916fb-8c0a-4538-9758-73ef819a45f7", "hostname": "reddit.com"
"hostname": "reddit.com" },
}, "siteContainerMap@@_twitter.com": {
"siteContainerMap@@_twitter.com": { "userContextId": "589",
"userContextId": "589", "neverAsk": true,
"neverAsk": true, "identityMacAddonUUID": "cdd73c20-c26a-4c06-9b17-735c1f5e9187",
"identityMacAddonUUID": "cdd73c20-c26a-4c06-9b17-735c1f5e9187", "hostname": "twitter.com"
"hostname": "twitter.com" },
}, "siteContainerMap@@_www.facebook.com": {
"siteContainerMap@@_www.facebook.com": { "userContextId": "590",
"userContextId": "590", "neverAsk": true,
"neverAsk": true, "identityMacAddonUUID": "32cc4a9b-05ed-4e54-8e11-732468de62f4",
"identityMacAddonUUID": "32cc4a9b-05ed-4e54-8e11-732468de62f4", "hostname": "www.facebook.com"
"hostname": "www.facebook.com" },
}, "siteContainerMap@@_www.linkedin.com": {
"siteContainerMap@@_www.linkedin.com": { "userContextId": "591",
"userContextId": "591", "neverAsk": true,
"neverAsk": true, "identityMacAddonUUID": "9ff381e3-4c11-420d-8e12-e352a3318be1",
"identityMacAddonUUID": "9ff381e3-4c11-420d-8e12-e352a3318be1", "hostname": "www.linkedin.com"
"hostname": "www.linkedin.com" },
}, "siteContainerMap@@_200ok.us": {
"siteContainerMap@@_200ok.us": { "userContextId": "1",
"userContextId": "1", "neverAsk": true,
"neverAsk": true, "identityMacAddonUUID": "b5f5f794-b37e-4cec-9f4e-6490df620336",
"identityMacAddonUUID": "b5f5f794-b37e-4cec-9f4e-6490df620336", "hostname": "www.linkedin.com"
"hostname": "www.linkedin.com"
}
} }
}); };
for (const site of Object.keys(testSites)) {
await browser.storage.sync.set({[site]:testSites[site]});
}
await browser.storage.sync.set({ await browser.storage.sync.set({
deletedSiteList: ["siteContainerMap@@_www.google.com"] deletedSiteList: ["siteContainerMap@@_www.google.com"]
}); });
console.log(await browser.storage.sync.get());
await sync.runSync(); await sync.runSync();
const assignedSites = await assignManager.storageArea.getAssignedSites(); const assignedSites = await assignManager.storageArea.getAssignedSites();
@ -153,16 +155,10 @@ browser.tests = {
await sync.runSync(); await sync.runSync();
const getSync = await browser.storage.sync.get();
const getAssignedSites = const getAssignedSites =
await assignManager.storageArea.getAssignedSites(); await assignManager.storageArea.getAssignedSites();
const identities = await browser.contextualIdentities.query({}); const identities = await browser.contextualIdentities.query({});
console.assert(
Object.keys(getSync.cookieStoreIDmap).length === 5,
"cookieStoreIDmap should have 5 entries"
);
console.assert( console.assert(
identities.length === 5, identities.length === 5,
"There should be 5 identities" "There should be 5 identities"
@ -183,17 +179,11 @@ browser.tests = {
await sync.runSync(); await sync.runSync();
const getSync = await browser.storage.sync.get();
const getAssignedSites = const getAssignedSites =
await assignManager.storageArea.getAssignedSites(); await assignManager.storageArea.getAssignedSites();
const identities = await browser.contextualIdentities.query({}); const identities = await browser.contextualIdentities.query({});
console.assert(
Object.keys(getSync.cookieStoreIDmap).length === 6,
"cookieStoreIDmap should have 6 entries"
);
console.assert( console.assert(
identities.length === 6, identities.length === 6,
"There should be 6 identities" "There should be 6 identities"
@ -219,17 +209,11 @@ browser.tests = {
await sync.runSync(); await sync.runSync();
const getSync = await browser.storage.sync.get();
const getAssignedSites = const getAssignedSites =
await assignManager.storageArea.getAssignedSites(); await assignManager.storageArea.getAssignedSites();
const identities = await browser.contextualIdentities.query({}); const identities = await browser.contextualIdentities.query({});
console.assert(
Object.keys(getSync.cookieStoreIDmap).length === 7,
"cookieStoreIDmap should have 7 entries"
);
console.assert( console.assert(
identities.length === 7, identities.length === 7,
"There should be 7 identities" "There should be 7 identities"
@ -419,148 +403,115 @@ const LOCAL_DATA = {
}; };
const SYNC_DATA = { const SYNC_DATA = {
"identities": [ "identity@@_22ded543-5173-44a5-a47a-8813535945ca": {
{ "name": "Personal",
"name": "Personal", "icon": "fingerprint",
"icon": "fingerprint", "color": "red",
"iconUrl": "resource://usercontext-content/fingerprint.svg", "cookieStoreId": "firefox-container-146",
"color": "red", "macAddonUUID": "22ded543-5173-44a5-a47a-8813535945ca"
"colorCode": "#37adff",
"cookieStoreId": "firefox-container-146"
},
{
"name": "Oscar",
"icon": "dollar",
"iconUrl": "resource://usercontext-content/dollar.svg",
"color": "green",
"colorCode": "#51cd00",
"cookieStoreId": "firefox-container-147"
},
{
"name": "Mozilla",
"icon": "pet",
"iconUrl": "resource://usercontext-content/briefcase.svg",
"color": "red",
"colorCode": "#ff613d",
"cookieStoreId": "firefox-container-148"
},
{
"name": "Groceries, obviously",
"icon": "cart",
"iconUrl": "resource://usercontext-content/cart.svg",
"color": "pink",
"colorCode": "#ffcb00",
"cookieStoreId": "firefox-container-149"
},
{
"name": "Facebook",
"icon": "fence",
"iconUrl": "resource://usercontext-content/fence.svg",
"color": "toolbar",
"colorCode": "#7c7c7d",
"cookieStoreId": "firefox-container-150"
}
],
"cookieStoreIDmap": {
"firefox-container-146": "22ded543-5173-44a5-a47a-8813535945ca",
"firefox-container-147": "63e5212f-0858-418e-b5a3-09c2dea61fcd",
"firefox-container-148": "71335417-158e-4d74-a55b-e9e9081601ec",
"firefox-container-149": "59c4e5f7-fe3b-435a-ae60-1340db31a91b",
"firefox-container-150": "3dc916fb-8c0a-4538-9758-73ef819a45f7"
}, },
"assignedSites": {} "identity@@_63e5212f-0858-418e-b5a3-09c2dea61fcd": {
"name": "Oscar",
"icon": "dollar",
"color": "green",
"cookieStoreId": "firefox-container-147",
"macAddonUUID": "3e5212f-0858-418e-b5a3-09c2dea61fcd"
},
"identity@@_71335417-158e-4d74-a55b-e9e9081601ec": {
"name": "Mozilla",
"icon": "pet",
"color": "red",
"cookieStoreId": "firefox-container-148",
"macAddonUUID": "71335417-158e-4d74-a55b-e9e9081601ec"
},
"identity@@_59c4e5f7-fe3b-435a-ae60-1340db31a91b": {
"name": "Groceries, obviously",
"icon": "cart",
"color": "pink",
"cookieStoreId": "firefox-container-149",
"macAddonUUID": "59c4e5f7-fe3b-435a-ae60-1340db31a91b"
},
"identity@@_3dc916fb-8c0a-4538-9758-73ef819a45f7": {
"name": "Facebook",
"icon": "fence",
"color": "toolbar",
"cookieStoreId": "firefox-container-150",
"macAddonUUID": "3dc916fb-8c0a-4538-9758-73ef819a45f7"
}
}; };
const DUPE_TEST_SYNC = { const DUPE_TEST_SYNC = {
"identities": [ "identity@@_d20d7af2-9866-468e-bb43-541efe8c2c2e": {
{ "name": "Personal",
"name": "Personal", "icon": "fingerprint",
"icon": "fingerprint", "color": "red",
"iconUrl": "resource://usercontext-content/fingerprint.svg", "cookieStoreId": "firefox-container-588",
"color": "red", "macAddonUUID": "d20d7af2-9866-468e-bb43-541efe8c2c2e"
"colorCode": "#ff613d",
"cookieStoreId": "firefox-container-588"
},
{
"name": "Banking",
"icon": "dollar",
"iconUrl": "resource://usercontext-content/dollar.svg",
"color": "green",
"colorCode": "#51cd00",
"cookieStoreId": "firefox-container-589"
},
{
"name": "Mozilla",
"icon": "pet",
"iconUrl": "resource://usercontext-content/pet.svg",
"color": "red",
"colorCode": "#ff613d",
"cookieStoreId": "firefox-container-590"
},
{
"name": "Groceries, obviously",
"icon": "cart",
"iconUrl": "resource://usercontext-content/cart.svg",
"color": "pink",
"colorCode": "#ff4bda",
"cookieStoreId": "firefox-container-591"
},
{
"name": "Facebook",
"icon": "fence",
"iconUrl": "resource://usercontext-content/fence.svg",
"color": "toolbar",
"colorCode": "#7c7c7d",
"cookieStoreId": "firefox-container-592"
},
{
"name": "Oscar",
"icon": "dollar",
"iconUrl": "resource://usercontext-content/dollar.svg",
"color": "green",
"colorCode": "#51cd00",
"cookieStoreId": "firefox-container-593"
}
],
"cookieStoreIDmap": {
"firefox-container-588": "d20d7af2-9866-468e-bb43-541efe8c2c2e",
"firefox-container-589": "cdd73c20-c26a-4c06-9b17-735c1f5e9187",
"firefox-container-590": "32cc4a9b-05ed-4e54-8e11-732468de62f4",
"firefox-container-591": "9ff381e3-4c11-420d-8e12-e352a3318be1",
"firefox-container-592": "3dc916fb-8c0a-4538-9758-73ef819a45f7",
"firefox-container-593": "63e5212f-0858-418e-b5a3-09c2dea61fcd"
}, },
"assignedSites": { "identity@@_cdd73c20-c26a-4c06-9b17-735c1f5e9187": {
"siteContainerMap@@_developer.mozilla.org": { "name": "Big Bird",
"userContextId": "588", "icon": "pet",
"neverAsk": true, "color": "yellow",
"identityMacAddonUUID": "d20d7af2-9866-468e-bb43-541efe8c2c2e", "cookieStoreId": "firefox-container-589",
"hostname": "developer.mozilla.org" "macAddonUUID": "cdd73c20-c26a-4c06-9b17-735c1f5e9187"
}, },
"siteContainerMap@@_reddit.com": { "identity@@_32cc4a9b-05ed-4e54-8e11-732468de62f4": {
"userContextId": "592", "name": "Mozilla",
"neverAsk": true, "icon": "pet",
"identityMacAddonUUID": "3dc916fb-8c0a-4538-9758-73ef819a45f7", "color": "red",
"hostname": "reddit.com" "cookieStoreId": "firefox-container-590",
}, "macAddonUUID": "32cc4a9b-05ed-4e54-8e11-732468de62f4"
"siteContainerMap@@_twitter.com": { },
"userContextId": "589", "identity@@_9ff381e3-4c11-420d-8e12-e352a3318be1": {
"neverAsk": true, "name": "Groceries, obviously",
"identityMacAddonUUID": "cdd73c20-c26a-4c06-9b17-735c1f5e9187", "icon": "cart",
"hostname": "twitter.com" "color": "pink",
}, "cookieStoreId": "firefox-container-591",
"siteContainerMap@@_www.facebook.com": { "macAddonUUID": "9ff381e3-4c11-420d-8e12-e352a3318be1"
"userContextId": "590", },
"neverAsk": true, "identity@@_3dc916fb-8c0a-4538-9758-73ef819a45f7": {
"identityMacAddonUUID": "32cc4a9b-05ed-4e54-8e11-732468de62f4", "name": "Facebook",
"hostname": "www.facebook.com" "icon": "fence",
}, "color": "toolbar",
"siteContainerMap@@_www.linkedin.com": { "cookieStoreId": "firefox-container-592",
"userContextId": "591", "macAddonUUID": "3dc916fb-8c0a-4538-9758-73ef819a45f7"
"neverAsk": true, },
"identityMacAddonUUID": "9ff381e3-4c11-420d-8e12-e352a3318be1", "identity@@_63e5212f-0858-418e-b5a3-09c2dea61fcd": {
"hostname": "www.linkedin.com" "name": "Oscar",
} "icon": "dollar",
"color": "green",
"cookieStoreId": "firefox-container-593",
"macAddonUUID": "63e5212f-0858-418e-b5a3-09c2dea61fcd"
},
"siteContainerMap@@_developer.mozilla.org": {
"userContextId": "588",
"neverAsk": true,
"identityMacAddonUUID": "d20d7af2-9866-468e-bb43-541efe8c2c2e",
"hostname": "developer.mozilla.org"
},
"siteContainerMap@@_reddit.com": {
"userContextId": "592",
"neverAsk": true,
"identityMacAddonUUID": "3dc916fb-8c0a-4538-9758-73ef819a45f7",
"hostname": "reddit.com"
},
"siteContainerMap@@_twitter.com": {
"userContextId": "589",
"neverAsk": true,
"identityMacAddonUUID": "cdd73c20-c26a-4c06-9b17-735c1f5e9187",
"hostname": "twitter.com"
},
"siteContainerMap@@_www.facebook.com": {
"userContextId": "590",
"neverAsk": true,
"identityMacAddonUUID": "32cc4a9b-05ed-4e54-8e11-732468de62f4",
"hostname": "www.facebook.com"
},
"siteContainerMap@@_www.linkedin.com": {
"userContextId": "591",
"neverAsk": true,
"identityMacAddonUUID": "9ff381e3-4c11-420d-8e12-e352a3318be1",
"hostname": "www.linkedin.com"
} }
}; };