corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 714e6e7b8eef (bug 789550) for causing failures in browser_default_audio_filename.js CLOSED TREE

Browse Source
This commit is contained in:
Noemi Erli
2021-04-21 01:17:20 +03:00
parent 5f402dca54
commit 9f3821cda5
6 changed files with 9 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/nsContextMenu.js
View File

@@ -1834,7 +1834,7 @@ class nsContextMenu {
referrerInfo,
cookieJarSettings,
this.frameOuterWindowID,
this.mediaURL.startsWith("data") ? "index" : "", // use default file name "index" for data URIs
"",
isContentWindowPrivate
);
}

3
toolkit/content/contentAreaUtils.js
View File

@@ -1053,8 +1053,7 @@ function getDefaultFileName(
// This is something like a data: and so forth URI... no filename here.
}
// Don't use the title if it's from a data URI
if (docTitle && aURI?.scheme != "data") {
if (docTitle) {
// 4) Use the document title
return docTitle;
}

1
toolkit/content/tests/browser/audio_file.txt
View File

File diff suppressed because one or more lines are too long

2
toolkit/content/tests/browser/browser.ini
View File

@@ -72,8 +72,6 @@ skip-if = !e10s || !crashreporter
run-if = e10s && crashreporter
[browser_datetime_datepicker.js]
skip-if = tsan # Frequently times out on TSan
[browser_default_audio_filename.js]
support-files = audio_file.txt
[browser_default_image_filename.js]
[browser_default_image_filename_redirect.js]
support-files =

90
toolkit/content/tests/browser/browser_default_audio_filename.js
View File

@@ -1,90 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
var MockFilePicker = SpecialPowers.MockFilePicker;
MockFilePicker.init(window);
registerCleanupFunction(function() {
MockFilePicker.cleanup();
});
/**
* TestCase for bug 789550
* <https://bugzilla.mozilla.org/show_bug.cgi?id=789550>
*/
add_task(async function() {
const DATA_AUDIO_URL = await fetch(
getRootDirectory(gTestPath) + "audio_file.txt"
).then(async response => response.text());
await BrowserTestUtils.withNewTab(
{
gBrowser,
url: DATA_AUDIO_URL,
},
async function(browser) {
let popupShownPromise = BrowserTestUtils.waitForEvent(
document,
"popupshown"
);
await BrowserTestUtils.synthesizeMouseAtCenter(
"video",
{
type: "contextmenu",
button: 2,
},
browser
);
await popupShownPromise;
let showFilePickerPromise = new Promise(resolve => {
MockFilePicker.showCallback = function(fp) {
is(fp.defaultString, "index.mp3");
resolve();
};
});
// Select "Save Audio As" option from context menu
var saveImageAsCommand = document.getElementById("context-saveaudio");
saveImageAsCommand.doCommand();
await showFilePickerPromise;
let contextMenu = document.getElementById("contentAreaContextMenu");
let popupHiddenPromise = BrowserTestUtils.waitForEvent(
contextMenu,
"popuphidden"
);
contextMenu.hidePopup();
await popupHiddenPromise;
}
);
});
/**
* TestCase for bug 789550
* <https://bugzilla.mozilla.org/show_bug.cgi?id=789550>
*/
add_task(async function() {
const DATA_AUDIO_URL = await fetch(
getRootDirectory(gTestPath) + "audio_file.txt"
).then(async response => response.text());
await BrowserTestUtils.withNewTab(
{
gBrowser,
url: DATA_AUDIO_URL,
},
async function(browser) {
let showFilePickerPromise = new Promise(resolve => {
MockFilePicker.showCallback = function(fp) {
is(fp.defaultString, "index.mp3");
resolve();
};
});
saveBrowser(browser);
await showFilePickerPromise;
}
);
});

38
toolkit/content/tests/browser/browser_default_image_filename.js
View File

@@ -3,11 +3,7 @@
var MockFilePicker = SpecialPowers.MockFilePicker;
MockFilePicker.init(window);
const DATA_IMAGE_GIF_URL =
"data:image/gif;base64,R0lGODlhEAAOALMAAOazToeHh0tLS/7LZv/0jvb29t/f3//Ub//ge8WSLf/rhf/3kdbW1mxsbP//mf///yH5BAAAAAAALAAAAAAQAA4AAARe8L1Ekyky67QZ1hLnjM5UUde0ECwLJoExKcppV0aCcGCmTIHEIUEqjgaORCMxIC6e0CcguWw6aFjsVMkkIr7g77ZKPJjPZqIyd7sJAgVGoEGv2xsBxqNgYPj/gAwXEQA7";
registerCleanupFunction(function() {
MockFilePicker.cleanup();
});
/**
* TestCase for bug 564387
* <https://bugzilla.mozilla.org/show_bug.cgi?id=564387>
@@ -16,7 +12,8 @@ add_task(async function() {
await BrowserTestUtils.withNewTab(
{
gBrowser,
url: DATA_IMAGE_GIF_URL,
url:
"data:image/gif;base64,R0lGODlhEAAOALMAAOazToeHh0tLS/7LZv/0jvb29t/f3//Ub//ge8WSLf/rhf/3kdbW1mxsbP//mf///yH5BAAAAAAALAAAAAAQAA4AAARe8L1Ekyky67QZ1hLnjM5UUde0ECwLJoExKcppV0aCcGCmTIHEIUEqjgaORCMxIC6e0CcguWw6aFjsVMkkIr7g77ZKPJjPZqIyd7sJAgVGoEGv2xsBxqNgYPj/gAwXEQA7",
},
async function(browser) {
let popupShownPromise = BrowserTestUtils.waitForEvent(
@@ -42,6 +39,10 @@ add_task(async function() {
};
});
registerCleanupFunction(function() {
MockFilePicker.cleanup();
});
// Select "Save Image As" option from context menu
var saveImageAsCommand = document.getElementById("context-saveimage");
saveImageAsCommand.doCommand();
@@ -58,28 +59,3 @@ add_task(async function() {
}
);
});
/**
* TestCase for bug 789550
* <https://bugzilla.mozilla.org/show_bug.cgi?id=789550>
*/
add_task(async function() {
await BrowserTestUtils.withNewTab(
{
gBrowser,
url: DATA_IMAGE_GIF_URL,
},
async function(browser) {
let showFilePickerPromise = new Promise(resolve => {
MockFilePicker.showCallback = function(fp) {
is(fp.defaultString, "index.gif");
resolve();
};
});
saveBrowser(browser);
await showFilePickerPromise;
}
);
});