From 3fc5671e40ca170a068f3456403a750398b4ac94 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 16 Nov 2020 16:45:17 -0500 Subject: [PATCH] REFACTOR: Allow us to import `keyEvent` This change should be quite safe as it only adds extra support for imports rather than global variables. --- .../tests/acceptance/admin-site-settings-test.js | 8 +++++++- .../discourse/tests/acceptance/composer-hyperlink-test.js | 2 +- .../discourse/tests/acceptance/keyboard-shortcuts-test.js | 2 +- .../javascripts/discourse/tests/acceptance/modal-test.js | 2 +- .../tests/acceptance/plugin-keyboard-shortcut-test.js | 2 +- .../discourse/tests/acceptance/search-full-test.js | 2 +- .../javascripts/discourse/tests/acceptance/search-test.js | 2 +- .../javascripts/discourse/tests/acceptance/topic-test.js | 2 +- .../tests/integration/components/simple-list-test.js | 2 +- app/assets/javascripts/test-shims.js | 1 + 10 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js index 993039354c7..7481b03f0e4 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js @@ -1,6 +1,12 @@ import { queryAll } from "discourse/tests/helpers/qunit-helpers"; import { exists } from "discourse/tests/helpers/qunit-helpers"; -import { fillIn, click, visit, currentURL } from "@ember/test-helpers"; +import { + fillIn, + click, + keyEvent, + visit, + currentURL, +} from "@ember/test-helpers"; import { test } from "qunit"; import { acceptance, count } from "discourse/tests/helpers/qunit-helpers"; import siteSettingFixture from "discourse/tests/fixtures/site-settings"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-hyperlink-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-hyperlink-test.js index 21444ce3a14..76618865d98 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/composer-hyperlink-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/composer-hyperlink-test.js @@ -1,6 +1,6 @@ import { queryAll } from "discourse/tests/helpers/qunit-helpers"; import { exists } from "discourse/tests/helpers/qunit-helpers"; -import { click, fillIn, visit } from "@ember/test-helpers"; +import { click, fillIn, keyEvent, visit } from "@ember/test-helpers"; import { test } from "qunit"; import { acceptance } from "discourse/tests/helpers/qunit-helpers"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js b/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js index 235d1773a4f..a855d3e08e9 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/keyboard-shortcuts-test.js @@ -1,4 +1,4 @@ -import { visit, currentURL } from "@ember/test-helpers"; +import { keyEvent, visit, currentURL } from "@ember/test-helpers"; import { test } from "qunit"; import { acceptance } from "discourse/tests/helpers/qunit-helpers"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/modal-test.js index 2b22fec1b7d..71bb2720680 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/modal-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/modal-test.js @@ -1,5 +1,5 @@ import { queryAll } from "discourse/tests/helpers/qunit-helpers"; -import { click, visit } from "@ember/test-helpers"; +import { click, keyEvent, visit } from "@ember/test-helpers"; import { skip, test } from "qunit"; import I18n from "I18n"; import { run } from "@ember/runloop"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js index 053834dc7c6..ac3fb3320e2 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-keyboard-shortcut-test.js @@ -1,4 +1,4 @@ -import { visit } from "@ember/test-helpers"; +import { keyEvent, visit } from "@ember/test-helpers"; import { test } from "qunit"; import { acceptance } from "discourse/tests/helpers/qunit-helpers"; import { withPluginApi } from "discourse/lib/plugin-api"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js index cd0e411b07d..ba29fc060be 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js @@ -1,6 +1,6 @@ import { queryAll } from "discourse/tests/helpers/qunit-helpers"; import { exists } from "discourse/tests/helpers/qunit-helpers"; -import { visit, fillIn, click } from "@ember/test-helpers"; +import { keyEvent, visit, fillIn, click } from "@ember/test-helpers"; import { skip, test } from "qunit"; import selectKit from "discourse/tests/helpers/select-kit-helper"; import { diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-test.js index 8a38ca2f722..cab201b2e34 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/search-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/search-test.js @@ -1,6 +1,6 @@ import { queryAll } from "discourse/tests/helpers/qunit-helpers"; import { exists } from "discourse/tests/helpers/qunit-helpers"; -import { click, fillIn, visit } from "@ember/test-helpers"; +import { click, keyEvent, fillIn, visit } from "@ember/test-helpers"; import { test } from "qunit"; import selectKit from "discourse/tests/helpers/select-kit-helper"; import { acceptance } from "discourse/tests/helpers/qunit-helpers"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js index cc4ebc548dd..3a109cdd6a2 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/topic-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/topic-test.js @@ -1,6 +1,6 @@ import { queryAll } from "discourse/tests/helpers/qunit-helpers"; import { exists } from "discourse/tests/helpers/qunit-helpers"; -import { click, fillIn, visit } from "@ember/test-helpers"; +import { click, keyEvent, fillIn, visit } from "@ember/test-helpers"; import { test } from "qunit"; import I18n from "I18n"; import { withPluginApi } from "discourse/lib/plugin-api"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/simple-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/simple-list-test.js index be67b6beec7..bbbaa39a3f9 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/simple-list-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/simple-list-test.js @@ -1,7 +1,7 @@ import { queryAll } from "discourse/tests/helpers/qunit-helpers"; import { moduleForComponent } from "ember-qunit"; import componentTest from "discourse/tests/helpers/component-test"; -import { click, fillIn } from "@ember/test-helpers"; +import { click, keyEvent, fillIn } from "@ember/test-helpers"; moduleForComponent("simple-list", { integration: true }); diff --git a/app/assets/javascripts/test-shims.js b/app/assets/javascripts/test-shims.js index c8a6621ee34..1cb229415c0 100644 --- a/app/assets/javascripts/test-shims.js +++ b/app/assets/javascripts/test-shims.js @@ -37,6 +37,7 @@ define("@ember/test-helpers", () => { "currentRouteName", "fillIn", "setResolver", + "keyEvent", ].forEach((attr) => { helpers[attr] = function () { return window[attr](...arguments);