mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset c970fb57fedd (bug 1247459) for failing its own test on Windows. r=backout

This commit is contained in:
Sebastian Hengst 2016-05-31 08:36:02 +02:00
Родитель 455fb1c7be
Коммит 4a29890033
4 изменённых файлов: 0 добавлений и 58 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
devtools/client/webconsole/test/browser.ini
Просмотреть файл

@ -141,7 +141,6 @@ support-files =
test_bug1092055_shouldwarn.js^headers^
test_bug1092055_shouldwarn.js
test_bug1092055_shouldwarn.html
test_bug_1247459_violation.html
!/devtools/client/framework/test/shared-head.js
!/devtools/client/netmonitor/test/sjs_cors-test-server.sjs
!/image/test/mochitest/blue.png
@ -296,7 +295,6 @@ skip-if = os != "mac"
skip-if = e10s # Bug 1042253 - webconsole e10s tests (Linux debug intermittent)
[browser_webconsole_bug_1010953_cspro.js]
skip-if = e10s && (os == 'win' || os == 'mac') # Bug 1243967
[browser_webconsole_bug_1247459_violation.js]
[browser_webconsole_certificate_messages.js]
skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
[browser_webconsole_show_subresource_security_errors.js]

40
devtools/client/webconsole/test/browser_webconsole_bug_1247459_violation.js
Просмотреть файл

@ -1,40 +0,0 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that the Web Console CSP messages for two META policies
// are correctly displayed.
"use strict";
const TEST_URI = "data:text/html;charset=utf8,Web Console CSP violation test";
const TEST_VIOLATION = "https://example.com/browser/devtools/client/" +
"webconsole/test/test_bug_1247459_violation.html";
const CSP_VIOLATION_MSG = "Content Security Policy: The page\u2019s settings " +
"blocked the loading of a resource at " +
"http://some.example.com/test.png (\u201cimg-src " +
"https://example.com\u201d).";
add_task(function* () {
let { browser } = yield loadTab(TEST_URI);
let hud = yield openConsole();
hud.jsterm.clearOutput();
let loaded = loadBrowser(browser);
content.location = TEST_VIOLATION;
yield loaded;
yield waitForMessages({
webconsole: hud,
messages: [
{
name: "CSP policy URI warning displayed successfully",
text: CSP_VIOLATION_MSG,
repeats: 2
}
]
});
});

15
devtools/client/webconsole/test/test_bug_1247459_violation.html
Просмотреть файл

@ -1,15 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<meta http-equiv="Content-Security-Policy" content="img-src https://example.com"></meta>
<meta http-equiv="Content-Security-Policy" content="img-src https://example.com"></meta>
<meta charset="UTF-8">
<title>Test for Bug 1247459 - policy violations for header and META are displayed separately</title>
<!-- Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ -->
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1247459">Mozilla Bug 1247459</a>
<img src="http://some.example.com/test.png">
</body>
</html>

1
dom/security/nsCSPUtils.cpp
Просмотреть файл

@ -1118,7 +1118,6 @@ nsCSPPolicy::permits(CSPDirective aDir,
}
NS_ASSERTION(aUri, "permits needs an uri to perform the check!");
outViolatedDirective.Truncate();
nsCSPDirective* defaultDir = nullptr;