Port remaining imports, fix absolute imports

GSConnect · Nov 14, 2023 · 4b0090d · 4b0090d
1 parent a03085b
commit 4b0090d
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 24 deletions.
diff --git a/installed-tests/fixtures/backend.js b/installed-tests/fixtures/backend.js
@@ -6,7 +6,8 @@ import Gio from 'gi://Gio';
 import GLib from 'gi://GLib';
 import GObject from 'gi://GObject';
 
-const Core = imports.service.core;
+import Config from '../config.js';
+const Core = await import(`file://${Config.PACKAGE_DATADIR}/service/core.js`);
 
 
 /**

diff --git a/installed-tests/fixtures/components/mpris.js b/installed-tests/fixtures/components/mpris.js
@@ -4,7 +4,8 @@
 
 import GObject from 'gi://GObject';
 
-const MPRIS = imports.service.components.mpris;
+import Config from '../../config.js';
+const MPRIS = await import(`file://${Config.PACKAGE_DATADIR}/service/components/mpris.js`);
 
 
 const MockMediaPlayer = GObject.registerClass({

diff --git a/installed-tests/fixtures/mpris.js b/installed-tests/fixtures/mpris.js
@@ -5,9 +5,9 @@
 import Gio from 'gi://Gio';
 import GObject from 'gi://GObject';
 
-const Config = imports.config;
-const DBus = imports.service.utils.dbus;
-const MPRIS = imports.service.components.mpris;
+import Config from '../config.js';
+const DBus = await import(`file://${Config.PACKAGE_DATADIR}/service/utils/dbus.js`);
+const MPRIS = await import(`file://${Config.PACKAGE_DATADIR}/service/components/mpris.js`);
 
 
 /*

diff --git a/installed-tests/fixtures/utils.js b/installed-tests/fixtures/utils.js
@@ -22,9 +22,9 @@ if (GLib.getenv('GSCONNECT_TEST')) {
 }
 
 
-await import(`${Config.PACKAGE_DATADIR}/service/init.js`);
-const {default: Device} = await import(`${Config.PACKAGE_DATADIR}/service/device.js`);
-const {default: Plugin} = await import(`${Config.PACKAGE_DATADIR}/service/plugin.js`);
+await import(`file://${Config.PACKAGE_DATADIR}/service/init.js`);
+const {default: Device} = await import(`file://${Config.PACKAGE_DATADIR}/service/device.js`);
+const {default: Plugin} = await import(`file://${Config.PACKAGE_DATADIR}/service/plugin.js`);
 
 const {ChannelService} = await import('./utils.js');
 
@@ -225,7 +225,7 @@ function isolateDirectories() {
  * Patch in the mock components for plugin tests.
  */
 export async function mockComponents() {
-    const Components = await import(`${Config.PACKAGE_DATADIR}/service/components/index.js`);
+    const Components = await import(`file://${Config.PACKAGE_DATADIR}/service/components/index.js`);
     const MockComponents = await import('./components/index.js');
 
     Components.acquire = function (name) {

diff --git a/installed-tests/suites/backends/testLanBackend.js b/installed-tests/suites/backends/testLanBackend.js
@@ -7,8 +7,9 @@ import GLib from 'gi://GLib';
 
 import * as Utils from '../fixtures/utils.js';
 
-const Core = imports.service.core;
-const Lan = imports.service.backends.lan;
+import Config from '../config.js';
+const Core = await import(`file://${Config.PACKAGE_DATADIR}/service/core.js`);
+const Lan = await import(`file://${Config.PACKAGE_DATADIR}/service/backends/lan.js`);
 
 
 describe('A LAN channel service', function () {

diff --git a/installed-tests/suites/components/testClipboardComponent.js b/installed-tests/suites/components/testClipboardComponent.js
@@ -8,7 +8,8 @@ import GLib from 'gi://GLib';
 
 import '../fixtures/utils.js';
 
-const {Clipboard} = imports.service.components.clipboard;
+import Config from '../config.js';
+const {default: Clipboard} = await import(`file://${Config.PACKAGE_DATADIR}/service/components/clipboard.js`);
 
 
 describe('The Clipboard component', function () {

diff --git a/installed-tests/suites/components/testMprisComponent.js b/installed-tests/suites/components/testMprisComponent.js
@@ -7,19 +7,20 @@ import GLib from 'gi://GLib';
 import '../fixtures/utils.js';
 import MockPlayer from '../fixtures/mpris.js';
 
-const MPRIS = imports.service.components.mpris;
+import Config from '../config.js';
+const {default: Manager} = await import(`file://${Config.PACKAGE_DATADIR}/service/components/mpris.js`);
 
 
 // Prevent auto-loading
-MPRIS.Manager.prototype._loadPlayers = function () {};
+Manager.prototype._loadPlayers = function () {};
 
 
 describe('The MPRIS component', function () {
     let manager;
     let player;
 
     beforeAll(function () {
-        manager = new MPRIS.Manager();
+        manager = new Manager();
         player = new MockPlayer(GLib.uuid_string_random());
     });
 

diff --git a/installed-tests/suites/core/testDevice.js b/installed-tests/suites/core/testDevice.js
@@ -8,7 +8,7 @@ import GLib from 'gi://GLib';
 import Config from '../config.js';
 import * as Utils from '../fixtures/utils.js';
 
-const {default: Device} = await import(`${Config.PACKAGE_DATADIR}/service/device.js`);
+const {default: Device} = await import(`file://${Config.PACKAGE_DATADIR}/service/device.js`);
 
 
 describe('A device constructed from a packet', function () {

diff --git a/installed-tests/suites/core/testManager.js b/installed-tests/suites/core/testManager.js
@@ -6,7 +6,8 @@ import GLib from 'gi://GLib';
 
 import * as Utils from '../fixtures/utils.js';
 
-const {Manager} = imports.service.manager;
+import Config from '../config.js';
+const {default: Manager} = await import(`file://${Config.PACKAGE_DATADIR}/service/manager.js`);
 
 
 // TODO: * device management

diff --git a/installed-tests/suites/core/testPacket.js b/installed-tests/suites/core/testPacket.js
@@ -4,7 +4,8 @@
 
 import '../fixtures/utils.js';
 
-const Core = imports.service.core;
+import Config from '../config.js';
+const Core = await import(`file://${Config.PACKAGE_DATADIR}/service/core.js`);
 
 
 /*

diff --git a/installed-tests/suites/core/testPlugin.js b/installed-tests/suites/core/testPlugin.js
@@ -9,9 +9,9 @@ import GObject from 'gi://GObject';
 import Config from '../config.js';
 import * as Utils from '../fixtures/utils.js';
 
-const {default: Device} = await import(`${Config.PACKAGE_DATADIR}/service/device.js`);
-const Components = await import(`${Config.PACKAGE_DATADIR}/service/components/index.js`);
-const {default: PluginBase} = await import(`${Config.PACKAGE_DATADIR}/service/plugin.js`);
+const {default: Device} = await import(`file://${Config.PACKAGE_DATADIR}/service/device.js`);
+const Components = await import(`file://${Config.PACKAGE_DATADIR}/service/components/index.js`);
+const {default: PluginBase} = await import(`file://${Config.PACKAGE_DATADIR}/service/plugin.js`);
 
 
 /*

diff --git a/installed-tests/suites/plugins/testContactsPlugin.js b/installed-tests/suites/plugins/testContactsPlugin.js
@@ -6,6 +6,8 @@ import GLib from 'gi://GLib';
 
 import * as Utils from '../fixtures/utils.js';
 
+import Config from '../config.js';
+
 
 const VCards = {
     valid: Utils.loadDataContents('vcard-valid.vcf'),
@@ -134,7 +136,8 @@ describe('The contacts plugin', function () {
         while (localPlugin._store.contacts.length)
             await Promise.idle();
 
-        imports.service.plugins.contacts.EBookContacts = null;
+        const contactPlugin = await import(`file://${Config.PACKAGE_DATADIR}/service/plugins/contacts.js`);
+        contactPlugin.EBookContacts = null;
 
         localPlugin._requestVCards(['valid']);
 

diff --git a/installed-tests/suites/plugins/testSftpPlugin.js b/installed-tests/suites/plugins/testSftpPlugin.js
@@ -3,7 +3,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 import * as Utils from '../fixtures/utils.js';
-const {Plugin} = imports.service.plugin;
+
+import Config from '../config.js';
+const {default: Plugin} = await import(`file://${Config.PACKAGE_DATADIR}/service/plugin.js`);
 
 
 const Packets = {

diff --git a/src/service/plugins/contacts.js b/src/service/plugins/contacts.js
@@ -11,7 +11,7 @@ import Contacts from '../components/contacts.js';
 /*
  * We prefer libebook's vCard parser if it's available
  */
-let EBookContacts;
+export let EBookContacts;
 
 try {
     EBookContacts = (await import('gi://EBookContacts')).default;