Skip to content

Commit

Permalink
Bug 1868150 - Update search engine distributions. r=mkaply
Browse files Browse the repository at this point in the history 
Differential Revision: https://phabricator.services.mozilla.com/D195435
  • Loading branch information
@Standard8
Standard8 committed Dec 5, 2023
1 parent 16c021a commit 03d3c7a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 202 deletions.
111 changes: 1 addition & 110 deletions services/settings/dumps/main/search-config-v2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,89 +125,6 @@
"environment": { "channel": ["esr"] },
"partnerCode": "MOZR",
"telemetrySuffix": "esr"
},
{
"environment": {
"distributions": ["sweetlabs-b-oem1", "sweetlabs-b-r-oem1"]
},
"partnerCode": "MZSL01",
"urls": {
"search": {
"params": [
{ "name": "ptag", "value": "MOZZ0000000020" },
{ "name": "pc", "value": "{partnerCode}" },
{
"name": "form",
"searchAccessPoint": {
"contextmenu": "MOZCON",
"searchbar": "MOZSBR",
"homepage": "MOZSPG",
"addressbar": "MOZLBR",
"newtab": "MOZTSB"
}
}
]
}
},
"telemetrySuffix": "sweetlabs1"
},
{
"environment": {
"distributions": ["sweetlabs-b-oem2", "sweetlabs-b-r-oem2"]
},
"partnerCode": "MZSL02",
"urls": {
"search": {
"params": [
{ "name": "ptag", "value": "MOZZ0000000020" },
{ "name": "pc", "value": "{partnerCode}" },
{
"name": "form",
"searchAccessPoint": {
"contextmenu": "MOZCON",
"searchbar": "MOZSBR",
"homepage": "MOZSPG",
"addressbar": "MOZLBR",
"newtab": "MOZTSB"
}
}
]
}
},
"telemetrySuffix": "sweetlabs2"
},
{
"environment": {
"distributions": ["sweetlabs-b-oem3", "sweetlabs-b-r-oem3"]
},
"partnerCode": "MZSL03",
"urls": {
"search": {
"params": [
{ "name": "ptag", "value": "MOZZ0000000020" },
{ "name": "pc", "value": "{partnerCode}" },
{
"name": "form",
"searchAccessPoint": {
"contextmenu": "MOZCON",
"searchbar": "MOZSBR",
"homepage": "MOZSPG",
"addressbar": "MOZLBR",
"newtab": "MOZTSB"
}
}
]
}
},
"telemetrySuffix": "sweetlabs3"
},
{
"environment": {
"distributions": ["acer-003", "acer-004"],
"allRegionsAndLocales": true
},
"partnerCode": "MOZX",
"telemetrySuffix": "acer3-4"
}
]
},
Expand Down Expand Up @@ -3396,14 +3313,7 @@
},
"partnerCode": "firefox",
"environment": { "locales": ["cs"] }
},
"variants": [
{
"environment": { "locales": ["cs"], "distributions": ["seznam"] },
"partnerCode": "FF_3",
"telemetrySuffix": "seznam"
}
]
}
},
{
"recordType": "engine",
Expand Down Expand Up @@ -4055,25 +3965,6 @@
"environment": { "distributions": ["MozillaOnline"] },
"default": "baidu"
},
{
"environment": {
"distributions": [
"sweetlabs-b-oem1",
"sweetlabs-b-r-oem1",
"sweetlabs-b-oem2",
"sweetlabs-b-r-oem2",
"sweetlabs-b-oem3",
"sweetlabs-b-r-oem3",
"acer-003",
"acer-004"
]
},
"default": "bing"
},
{
"environment": { "distributions": ["seznam"] },
"default": "seznam-cz"
},
{ "environment": { "distributions": ["1und1"] }, "default": "1und1" },
{ "environment": { "distributions": ["webde"] }, "default": "webde" },
{
Expand Down
92 changes: 0 additions & 92 deletions toolkit/components/search/tests/xpcshell/searchconfigs/test_distributions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,6 @@ ChromeUtils.defineESModuleGetters(this, {

const tests = [];

// Bing should be default everywhere for Acer
for (let [locale, region] of [
["en-US", "US"],
["pl", "PL"],
["be", "BY"],
["ru", "RU"],
["zh-CN", "CN"],
]) {
for (let distribution of ["acer-003", "acer-004"]) {
tests.push({
distribution,
locale,
region,
test: engines =>
hasParams(engines, "Bing", "searchbar", "pc=MOZX") &&
hasDefault(engines, "Bing") &&
hasEnginesFirst(engines, ["Bing"]),
});
}
}

for (let canonicalId of ["canonical", "canonical-001"]) {
tests.push({
locale: "en-US",
Expand Down Expand Up @@ -112,77 +91,6 @@ tests.push({
hasParams(engines, "Qwant Junior", "searchbar", "client=firefoxqwant"),
});

tests.push({
locale: "cs",
distribution: "seznam",
test: engines =>
hasParams(engines, "Seznam", "searchbar", "sourceid=FF_3") &&
hasDefault(engines, "Seznam") &&
hasEnginesFirst(engines, ["Seznam"]),
});

for (const locale of ["en-US", "en-GB", "fr", "de"]) {
tests.push({
locale,
distribution: "sweetlabs-b-oem1",
test: engines =>
hasParams(engines, "Bing", "searchbar", "pc=MZSL01") &&
hasParams(engines, "Bing", "searchbar", "ptag=MOZZ0000000020") &&
hasDefault(engines, "Bing") &&
hasEnginesFirst(engines, ["Bing"]),
});

tests.push({
locale,
distribution: "sweetlabs-b-r-oem1",
test: engines =>
hasParams(engines, "Bing", "searchbar", "pc=MZSL01") &&
hasParams(engines, "Bing", "searchbar", "ptag=MOZZ0000000020") &&
hasDefault(engines, "Bing") &&
hasEnginesFirst(engines, ["Bing"]),
});

tests.push({
locale,
distribution: "sweetlabs-b-oem2",
test: engines =>
hasParams(engines, "Bing", "searchbar", "pc=MZSL02") &&
hasParams(engines, "Bing", "searchbar", "ptag=MOZZ0000000020") &&
hasDefault(engines, "Bing") &&
hasEnginesFirst(engines, ["Bing"]),
});

tests.push({
locale,
distribution: "sweetlabs-b-r-oem2",
test: engines =>
hasParams(engines, "Bing", "searchbar", "pc=MZSL02") &&
hasParams(engines, "Bing", "searchbar", "ptag=MOZZ0000000020") &&
hasDefault(engines, "Bing") &&
hasEnginesFirst(engines, ["Bing"]),
});

tests.push({
locale,
distribution: "sweetlabs-b-oem3",
test: engines =>
hasParams(engines, "Bing", "searchbar", "pc=MZSL03") &&
hasParams(engines, "Bing", "searchbar", "ptag=MOZZ0000000020") &&
hasDefault(engines, "Bing") &&
hasEnginesFirst(engines, ["Bing"]),
});

tests.push({
locale,
distribution: "sweetlabs-b-r-oem3",
test: engines =>
hasParams(engines, "Bing", "searchbar", "pc=MZSL03") &&
hasParams(engines, "Bing", "searchbar", "ptag=MOZZ0000000020") &&
hasDefault(engines, "Bing") &&
hasEnginesFirst(engines, ["Bing"]),
});
}

for (const locale of ["en-US", "de"]) {
tests.push({
locale,
Expand Down

0 comments on commit 03d3c7a

Please sign in to comment.