Skip to content
Snippets Groups Projects
Commit 46b5c207 authored by Tooru Fujisawa's avatar Tooru Fujisawa
Browse files

Bug 1667455 - Part 15: Stop using Services.jsm in eslint testcase. r=kmag

parent c26c3f55
No related branches found
No related tags found
No related merge requests found
......@@ -26,24 +26,24 @@ ruleTester.run("lazy-getter-object-name", rule, {
valid: [
`
ChromeUtils.defineESModuleGetters(lazy, {
Services: "resource://gre/modules/Services.sys.mjs",
AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
});
`,
],
invalid: [
invalidCode(`
ChromeUtils.defineESModuleGetters(obj, {
Services: "resource://gre/modules/Services.sys.mjs",
AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
});
`),
invalidCode(`
ChromeUtils.defineESModuleGetters(this, {
Services: "resource://gre/modules/Services.sys.mjs",
AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
});
`),
invalidCode(`
ChromeUtils.defineESModuleGetters(window, {
Services: "resource://gre/modules/Services.sys.mjs",
AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
});
`),
],
......
......@@ -47,10 +47,10 @@ ruleTester.run("reject-eager-module-in-lazy-getter", rule, {
invalidCode(
`
XPCOMUtils.defineLazyModuleGetter(
lazy, "Services", "resource://gre/modules/Services.jsm"
lazy, "AppConstants", "resource://gre/modules/AppConstants.jsm"
);
`,
"resource://gre/modules/Services.jsm"
"resource://gre/modules/AppConstants.jsm"
),
invalidCode(
`
......
......@@ -65,22 +65,22 @@ ruleTester.run("reject-globalThis-modification", rule, {
`),
invalidCall(`
ChromeUtils.defineModuleGetter(
globalThis, "Services", "resource://gre/modules/Services.jsm"
globalThis, "AppConstants", "resource://gre/modules/AppConstants.jsm"
);
`),
invalidCall(`
ChromeUtils.defineESMGetters(globalThis, {
Services: "resource://gre/modules/Services.sys.mjs",
AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
});
`),
invalidCall(`
XPCOMUtils.defineLazyModuleGetter(
globalThis, "Services", "resource://gre/modules/Services.jsm"
globalThis, "AppConstants", "resource://gre/modules/AppConstants.jsm"
);
`),
invalidCall(`
XPCOMUtils.defineLazyModuleGetters(globalThis, {
Services: "resource://gre/modules/Services.jsm",
AppConstants: "resource://gre/modules/AppConstants.jsm",
});
`),
invalidCall(`
......
......@@ -21,12 +21,12 @@ const ruleTester = new RuleTester({
ruleTester.run("reject-import-system-module-from-non-system", rule, {
valid: [
{
code: `const { Services } = ChromeUtils.importESM("resource://gre/modules/Services.sys.mjs");`,
code: `const { AppConstants } = ChromeUtils.importESM("resource://gre/modules/AppConstants.sys.mjs");`,
},
],
invalid: [
{
code: `import { Services } from "resource://gre/modules/Services.sys.mjs";`,
code: `import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";`,
errors: [{ messageId: "rejectStaticImportSystemModuleFromNonSystem" }],
},
],
......
......@@ -27,43 +27,43 @@ const MESSAGE_DEFINE =
ruleTester.run("use-chromeutils-import", rule, {
valid: [
`ChromeUtils.import("resource://gre/modules/Service.jsm");`,
`ChromeUtils.import("resource://gre/modules/Service.jsm", this);`,
`ChromeUtils.defineModuleGetter(this, "Services",
"resource://gre/modules/Service.jsm");`,
`XPCOMUtils.defineLazyModuleGetter(this, "Services",
"resource://gre/modules/Service.jsm",
`ChromeUtils.import("resource://gre/modules/AppConstants.jsm");`,
`ChromeUtils.import("resource://gre/modules/AppConstants.jsm", this);`,
`ChromeUtils.defineModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm");`,
`XPCOMUtils.defineLazyModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm",
"Foo");`,
`XPCOMUtils.defineLazyModuleGetter(this, "Services",
"resource://gre/modules/Service.jsm",
undefined, preServicesLambda);`,
`XPCOMUtils.defineLazyModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm",
undefined, preAppConstantsLambda);`,
],
invalid: [
{
code: `Cu.import("resource://gre/modules/Services.jsm");`,
output: `ChromeUtils.import("resource://gre/modules/Services.jsm");`,
code: `Cu.import("resource://gre/modules/AppConstants.jsm");`,
output: `ChromeUtils.import("resource://gre/modules/AppConstants.jsm");`,
errors: callError(MESSAGE_IMPORT),
},
{
code: `Cu.import("resource://gre/modules/Services.jsm", this);`,
output: `ChromeUtils.import("resource://gre/modules/Services.jsm", this);`,
code: `Cu.import("resource://gre/modules/AppConstants.jsm", this);`,
output: `ChromeUtils.import("resource://gre/modules/AppConstants.jsm", this);`,
errors: callError(MESSAGE_IMPORT),
},
{
code: `Components.utils.import("resource://gre/modules/Services.jsm");`,
output: `ChromeUtils.import("resource://gre/modules/Services.jsm");`,
code: `Components.utils.import("resource://gre/modules/AppConstants.jsm");`,
output: `ChromeUtils.import("resource://gre/modules/AppConstants.jsm");`,
errors: callError(MESSAGE_IMPORT),
},
{
code: `Components.utils.import("resource://gre/modules/Services.jsm");`,
output: `ChromeUtils.import("resource://gre/modules/Services.jsm");`,
code: `Components.utils.import("resource://gre/modules/AppConstants.jsm");`,
output: `ChromeUtils.import("resource://gre/modules/AppConstants.jsm");`,
errors: callError(MESSAGE_IMPORT),
},
{
code: `XPCOMUtils.defineLazyModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");`,
output: `ChromeUtils.defineModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");`,
code: `XPCOMUtils.defineLazyModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm");`,
output: `ChromeUtils.defineModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm");`,
errors: callError(MESSAGE_DEFINE),
},
],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment