Bug 1345981 - Move page info tests out of browser/base/content/test/general. r=Gijs

MozReview-Commit-ID: E6BrxV8J6m2

--HG--
rename : browser/base/content/test/general/browser_pageInfo.js => browser/base/content/test/pageinfo/browser_pageInfo.js
rename : browser/base/content/test/general/browser_bug517902.js => browser/base/content/test/pageinfo/browser_pageinfo_image_info.js
rename : browser/base/content/test/general/browser_bug460146.js => browser/base/content/test/pageinfo/browser_pageinfo_images.js
extra : rebase_source : 89501dfbe167a8e1c86d74c34aceaf3c5d9684cc
This commit is contained in:
Mark Banner 2017-03-09 20:05:24 +00:00
Родитель 442c38b07e
Коммит 1fdf93a46a
7 изменённых файлов: 17 добавлений и 5 удалений

Просмотреть файл

@ -136,7 +136,6 @@ skip-if = true # bug 428712
[browser_bug435325.js] [browser_bug435325.js]
[browser_bug441778.js] [browser_bug441778.js]
[browser_bug455852.js] [browser_bug455852.js]
[browser_bug460146.js]
[browser_bug462289.js] [browser_bug462289.js]
skip-if = toolkit == "cocoa" skip-if = toolkit == "cocoa"
[browser_bug462673.js] [browser_bug462673.js]
@ -146,8 +145,6 @@ skip-if = toolkit == "cocoa"
[browser_bug484315.js] [browser_bug484315.js]
[browser_bug491431.js] [browser_bug491431.js]
[browser_bug495058.js] [browser_bug495058.js]
[browser_bug517902.js]
skip-if = (os == 'linux' && e10s) # bug 1161699
[browser_bug519216.js] [browser_bug519216.js]
[browser_bug520538.js] [browser_bug520538.js]
[browser_bug521216.js] [browser_bug521216.js]
@ -280,7 +277,6 @@ support-files = feed_discovery.html
[browser_gZipOfflineChild.js] [browser_gZipOfflineChild.js]
support-files = test_offline_gzip.html gZipOfflineChild.cacheManifest gZipOfflineChild.cacheManifest^headers^ gZipOfflineChild.html gZipOfflineChild.html^headers^ support-files = test_offline_gzip.html gZipOfflineChild.cacheManifest gZipOfflineChild.cacheManifest^headers^ gZipOfflineChild.html gZipOfflineChild.html^headers^
[browser_overflowScroll.js] [browser_overflowScroll.js]
[browser_pageInfo.js]
[browser_page_style_menu.js] [browser_page_style_menu.js]
[browser_page_style_menu_update.js] [browser_page_style_menu_update.js]
[browser_parsable_css.js] [browser_parsable_css.js]

Просмотреть файл

@ -0,0 +1,7 @@
"use strict";
module.exports = {
"extends": [
"../../../../../testing/mochitest/browser.eslintrc.js"
]
};

Просмотреть файл

@ -0,0 +1,8 @@
[DEFAULT]
[browser_pageInfo.js]
support-files =
../general/feed_tab.html
[browser_pageinfo_images.js]
[browser_pageinfo_image_info.js]
skip-if = (os == 'linux' && e10s) # bug 1161699

Просмотреть файл

@ -9,7 +9,7 @@ function test() {
pageInfo = BrowserPageInfo(); pageInfo = BrowserPageInfo();
}, {capture: true, once: true}); }, {capture: true, once: true});
content.location = content.location =
"https://example.com/browser/browser/base/content/test/general/feed_tab.html"; "https://example.com/browser/browser/base/content/test/pageinfo/feed_tab.html";
function observer(win, topic, data) { function observer(win, topic, data) {
Services.obs.removeObserver(observer, "page-info-dialog-loaded"); Services.obs.removeObserver(observer, "page-info-dialog-loaded");

Просмотреть файл

@ -19,6 +19,7 @@ BROWSER_CHROME_MANIFESTS += [
'content/test/captivePortal/browser.ini', 'content/test/captivePortal/browser.ini',
'content/test/general/browser.ini', 'content/test/general/browser.ini',
'content/test/newtab/browser.ini', 'content/test/newtab/browser.ini',
'content/test/pageinfo/browser.ini',
'content/test/plugins/browser.ini', 'content/test/plugins/browser.ini',
'content/test/popupNotifications/browser.ini', 'content/test/popupNotifications/browser.ini',
'content/test/referrer/browser.ini', 'content/test/referrer/browser.ini',