From ad0d314fccce5b5088df93c87b83833b0c9a0c29 Mon Sep 17 00:00:00 2001 From: Giles Thompson Date: Fri, 21 Jul 2023 15:14:48 +1200 Subject: [PATCH] chore(types): migrate existing types to stable type compatibility --- ember-file-upload/src/system/drag-listener.ts | 5 ++--- .../components/file-dropzone-test.ts | 8 +++++--- .../tests/integration/mirage-handler-test.ts | 2 +- .../tests/integration/queue-listeners-test.ts | 6 ++++-- .../integration/services/file-queue-test.ts | 2 +- .../tests/unit/services/file-queue-test.ts | 19 +++++++++++++++---- 6 files changed, 28 insertions(+), 14 deletions(-) diff --git a/ember-file-upload/src/system/drag-listener.ts b/ember-file-upload/src/system/drag-listener.ts index fb944eaa0..752dff969 100644 --- a/ember-file-upload/src/system/drag-listener.ts +++ b/ember-file-upload/src/system/drag-listener.ts @@ -1,6 +1,5 @@ import { assert } from '@ember/debug'; -import { cancel, next } from '@ember/runloop'; -import { EmberRunTimer } from '@ember/runloop/types'; +import { type Timer, cancel, next } from '@ember/runloop'; import { DragEventListener, QueuedDragEvent, @@ -24,7 +23,7 @@ export default class DragListener { _handlers: DragListenerHandlers = {}; _handlersAttached = false; - _scheduled: EmberRunTimer | null = null; + _scheduled: Timer | null = null; constructor(dropzone: Element) { this._dropzone = dropzone; diff --git a/test-app/tests/integration/components/file-dropzone-test.ts b/test-app/tests/integration/components/file-dropzone-test.ts index 2373e05eb..f56764787 100644 --- a/test-app/tests/integration/components/file-dropzone-test.ts +++ b/test-app/tests/integration/components/file-dropzone-test.ts @@ -1,14 +1,14 @@ import { module, test } from 'qunit'; import { setupRenderingTest } from 'ember-qunit'; import { render, triggerEvent, TestContext } from '@ember/test-helpers'; -import hbs from 'htmlbars-inline-precompile'; +import { hbs } from 'ember-cli-htmlbars'; import { dragAndDrop, dragEnter, dragLeave, } from 'ember-file-upload/test-support'; import { Queue } from 'ember-file-upload'; -import type { UploadFile } from 'ember-file-upload'; +import type { FileQueueService, UploadFile } from 'ember-file-upload'; interface LocalTestContext extends TestContext { queue: Queue; @@ -22,7 +22,9 @@ module('Integration | Component | FileDropzone', function (hooks) { setupRenderingTest(hooks); hooks.beforeEach(function (this: LocalTestContext) { - const fileQueueService = this.owner.lookup('service:file-queue'); + const fileQueueService = this.owner.lookup( + 'service:file-queue' + ) as FileQueueService; this.queue = new Queue({ name: 'test', fileQueue: fileQueueService }); }); diff --git a/test-app/tests/integration/mirage-handler-test.ts b/test-app/tests/integration/mirage-handler-test.ts index bce7a6c5d..129d04854 100644 --- a/test-app/tests/integration/mirage-handler-test.ts +++ b/test-app/tests/integration/mirage-handler-test.ts @@ -1,7 +1,7 @@ import { module, test } from 'qunit'; import { setupRenderingTest } from 'ember-qunit'; import { render } from '@ember/test-helpers'; -import hbs from 'htmlbars-inline-precompile'; +import { hbs } from 'ember-cli-htmlbars'; import { uploadHandler } from 'ember-file-upload'; import { selectFiles } from 'ember-file-upload/test-support'; import { diff --git a/test-app/tests/integration/queue-listeners-test.ts b/test-app/tests/integration/queue-listeners-test.ts index 4da1b2025..486e05a9d 100644 --- a/test-app/tests/integration/queue-listeners-test.ts +++ b/test-app/tests/integration/queue-listeners-test.ts @@ -4,7 +4,7 @@ import { TestContext, render, settled } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; import { selectFiles } from 'ember-file-upload/test-support'; import { tracked } from '@glimmer/tracking'; -import type { Queue, UploadFile } from 'ember-file-upload'; +import type { FileQueueService, Queue, UploadFile } from 'ember-file-upload'; class State { @tracked firstComponent = true; @@ -23,7 +23,9 @@ module('Integration | queue listeners', function (hooks) { setupRenderingTest(hooks); const setupState = function (this: LocalTestContext) { - const fileQueueService = this.owner.lookup('service:file-queue'); + const fileQueueService = this.owner.lookup( + 'service:file-queue' + ) as FileQueueService; this.state = new State(); this.queue = fileQueueService.create('listener-test'); diff --git a/test-app/tests/integration/services/file-queue-test.ts b/test-app/tests/integration/services/file-queue-test.ts index ed252e9e5..b4d9faab9 100644 --- a/test-app/tests/integration/services/file-queue-test.ts +++ b/test-app/tests/integration/services/file-queue-test.ts @@ -12,7 +12,7 @@ module('Integration | Service | file queue', function (hooks) { setupRenderingTest(hooks); test('files is reactive', async function (this: LocalTestContext, assert) { - this.subject = this.owner.lookup('service:file-queue'); + this.subject = this.owner.lookup('service:file-queue') as FileQueueService; const existingQueue = this.subject.create('existing-queue'); const existingQueueFile = new UploadFile( diff --git a/test-app/tests/unit/services/file-queue-test.ts b/test-app/tests/unit/services/file-queue-test.ts index 807c4ffec..0aa620fef 100644 --- a/test-app/tests/unit/services/file-queue-test.ts +++ b/test-app/tests/unit/services/file-queue-test.ts @@ -1,6 +1,11 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; -import { FileSource, FileState, UploadFile } from 'ember-file-upload'; +import { + type FileQueueService, + FileSource, + FileState, + UploadFile, +} from 'ember-file-upload'; import { TestContext } from '@ember/test-helpers'; import { png } from 'test-app/tests/utils/file-data'; @@ -8,7 +13,9 @@ module('Unit | Service | file-queue', function (hooks) { setupTest(hooks); test('the size of the queue is the aggregate of all queues', function (this: TestContext, assert) { - const fileQueueService = this.owner.lookup('service:file-queue'); + const fileQueueService = this.owner.lookup( + 'service:file-queue' + ) as FileQueueService; const queue1 = fileQueueService.create('queue1'); const queue2 = fileQueueService.create('queue2'); fileQueueService.create('queue3'); @@ -46,7 +53,9 @@ module('Unit | Service | file-queue', function (hooks) { }); test('the uploaded size of the queue is the aggregate of all queues', function (this: TestContext, assert) { - const fileQueueService = this.owner.lookup('service:file-queue'); + const fileQueueService = this.owner.lookup( + 'service:file-queue' + ) as FileQueueService; const queue1 = fileQueueService.create('queue1'); assert.strictEqual(fileQueueService.files.length, 0); @@ -90,7 +99,9 @@ module('Unit | Service | file-queue', function (hooks) { }); test('the queue is emptied when all files are completed and flush is called', function (this: TestContext, assert) { - const fileQueueService = this.owner.lookup('service:file-queue'); + const fileQueueService = this.owner.lookup( + 'service:file-queue' + ) as FileQueueService; const queue = fileQueueService.create('queue'); const file = new File(png, 'test-filename.jpg');