Backed out changeset 517b6c2b1d57 (bug 1772988) for causing failures at test_filename_sanitize.js . CLOSED TREE

This commit is contained in:
Butkovits Atila 2022-08-30 22:56:49 +03:00
parent d65cbb8313
commit ca18bee08c
2 changed files with 4 additions and 57 deletions

View file

@ -545,15 +545,16 @@ static const nsExtraMimeTypeEntry extraMimeEntries[] = {
{TEXT_CSS, "css", "Style Sheet"},
{TEXT_VCARD, "vcf,vcard", "Contact Information"},
{TEXT_CALENDAR, "ics,ical,ifb,icalendar", "iCalendar"},
{VIDEO_OGG, "ogv,ogg", "Ogg Video"},
{VIDEO_OGG, "ogv", "Ogg Video"},
{VIDEO_OGG, "ogg", "Ogg Video"},
{APPLICATION_OGG, "ogg", "Ogg Video"},
{AUDIO_OGG, "oga", "Ogg Audio"},
{AUDIO_OGG, "opus", "Opus Audio"},
{VIDEO_WEBM, "webm", "Web Media Video"},
{AUDIO_WEBM, "webm", "Web Media Audio"},
{AUDIO_MP3, "mp3,mpega,mp2", "MPEG Audio"},
{AUDIO_MP3, "mp3", "MPEG Audio"},
{VIDEO_MP4, "mp4", "MPEG-4 Video"},
{AUDIO_MP4, "m4a,m4b", "MPEG-4 Audio"},
{AUDIO_MP4, "m4a", "MPEG-4 Audio"},
{VIDEO_RAW, "yuv", "Raw YUV Video"},
{AUDIO_WAV, "wav", "Waveform Audio"},
{VIDEO_3GPP, "3gpp,3gp", "3GPP Video"},

View file

@ -159,58 +159,4 @@ add_task(async function validate_filename_method() {
checkFilename("test_テスト_T\x83E\\S\x83T.pテ\x83ng", 0),
"test_テスト_T E_S T.png"
);
// Now check some media types
Assert.equal(
mimeService.validateFileNameForSaving("video.ogg", "video/ogg", 0),
"video.ogg",
"video.ogg"
);
Assert.equal(
mimeService.validateFileNameForSaving("video.ogv", "video/ogg", 0),
"video.ogv",
"video.ogv"
);
Assert.equal(
mimeService.validateFileNameForSaving("video.ogt", "video/ogg", 0),
"video.ogv",
"video.ogt"
);
Assert.equal(
mimeService.validateFileNameForSaving("audio.mp3", "audio/mpeg", 0),
"audio.mp3",
"audio.mp3"
);
Assert.equal(
mimeService.validateFileNameForSaving("audio.mpega", "audio/mpeg", 0),
"audio.mpega",
"audio.mpega"
);
Assert.equal(
mimeService.validateFileNameForSaving("audio.mp2", "audio/mpeg", 0),
"audio.mp2",
"audio.mp2"
);
Assert.equal(
mimeService.validateFileNameForSaving("audio.mp4", "audio/mpeg", 0),
AppConstants.platform == "linux" ? "audio.mpga" : "audio.mp3",
"audio.mp4"
);
Assert.equal(
mimeService.validateFileNameForSaving("sound.m4a", "audio/mp4", 0),
"sound.m4a",
"sound.mpa"
);
Assert.equal(
mimeService.validateFileNameForSaving("sound.m4b", "audio/mp4", 0),
"sound.m4b",
"sound.mpb"
);
Assert.equal(
mimeService.validateFileNameForSaving("sound.m4c", "audio/mp4", 0),
AppConstants.platform == "macosx" ? "sound.mp4" : "sound.m4a",
"sound.mpc"
);
});