mirror of
https://github.com/edu4rdshl/gnome-shell.git
synced 2026-07-17 23:24:51 +00:00
environment: Port environment.js to be an ES module
Removes the init() function in favor of executing all environment changes when the file is imported. Additionally ports all unit tests using imports.gi.environment.init() to use the updated module. Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2822>
This commit is contained in:
parent
26fa1046a3
commit
9a2c3da868
10 changed files with 125 additions and 134 deletions
|
|
@ -5,9 +5,7 @@
|
|||
const JsUnit = imports.jsUnit;
|
||||
import Pango from 'gi://Pango';
|
||||
|
||||
const Environment = imports.ui.environment;
|
||||
Environment.init();
|
||||
|
||||
import '../../js/ui/environment.js';
|
||||
const Util = imports.misc.util;
|
||||
|
||||
const tests = [
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
|
||||
|
||||
// Test cases for Util.insertSorted
|
||||
import * as Assertions from '../common/assertions.js';
|
||||
|
||||
// Needed so that Util can bring some UI stuff
|
||||
// we don't actually use
|
||||
const Environment = imports.ui.environment;
|
||||
Environment.init();
|
||||
import '../../js/ui/environment.js';
|
||||
|
||||
import * as Assertions from '../common/assertions.js';
|
||||
|
||||
const Util = imports.misc.util;
|
||||
|
||||
let arrayInt = [1, 2, 3, 5, 6];
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
|
||||
const JsUnit = imports.jsUnit;
|
||||
|
||||
import '../../js/ui/environment.js';
|
||||
|
||||
import * as Assertions from '../common/assertions.js';
|
||||
const Environment = imports.ui.environment;
|
||||
Environment.init();
|
||||
|
||||
const JsParse = imports.misc.jsParse;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,7 @@
|
|||
const JsUnit = imports.jsUnit;
|
||||
import Pango from 'gi://Pango';
|
||||
|
||||
const Environment = imports.ui.environment;
|
||||
Environment.init();
|
||||
import '../../js/ui/environment.js';
|
||||
|
||||
imports.ui.main; // eslint-disable-line no-unused-expressions
|
||||
const MessageList = imports.ui.messageList;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,14 @@
|
|||
|
||||
// Test cases for version comparison
|
||||
|
||||
import '../../js/ui/environment.js';
|
||||
import GObject from 'gi://GObject';
|
||||
|
||||
const JsUnit = imports.jsUnit;
|
||||
const Signals = imports.misc.signals;
|
||||
|
||||
const Environment = imports.ui.environment;
|
||||
const {TransientSignalHolder, registerDestroyableType} = imports.misc.signalTracker;
|
||||
|
||||
Environment.init();
|
||||
|
||||
const Destroyable = GObject.registerClass({
|
||||
Signals: {'destroy': {}},
|
||||
}, class Destroyable extends GObject.Object {});
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@
|
|||
|
||||
const JsUnit = imports.jsUnit;
|
||||
|
||||
const Environment = imports.ui.environment;
|
||||
Environment.init();
|
||||
import '../../js/ui/environment.js';
|
||||
|
||||
const Util = imports.misc.util;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@
|
|||
|
||||
const JsUnit = imports.jsUnit;
|
||||
|
||||
const Environment = imports.ui.environment;
|
||||
Environment.init();
|
||||
import '../../js/ui/environment.js';
|
||||
|
||||
const Util = imports.misc.util;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue