From dd62b88f78d036c0ee8f56c5c77af76a6575e178 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Mon, 11 Jul 2022 15:25:40 +0100 Subject: [PATCH] DEV: Switch from htmlbars-inline-precompile to ember-cli-htmlbars (#17424) See https://github.com/ember-cli/ember-cli-htmlbars#tagged-template-usage--migrating-from-htmlbars-inline-precompile --- .../discourse/tests/acceptance/custom-html-template-test.js | 2 +- app/assets/javascripts/discourse/tests/acceptance/modal-test.js | 2 +- .../tests/acceptance/plugin-outlet-connector-class-test.js | 2 +- .../discourse/tests/acceptance/plugin-outlet-decorator-test.js | 2 +- .../tests/acceptance/plugin-outlet-multi-template-test.js | 2 +- .../tests/acceptance/plugin-outlet-single-template-test.js | 2 +- .../discourse/tests/integration/components/ace-editor-test.js | 2 +- .../tests/integration/components/activation-controls-test.js | 2 +- .../discourse/tests/integration/components/admin-report-test.js | 2 +- .../tests/integration/components/admin-user-field-item-test.js | 2 +- .../tests/integration/components/avatar-uploader-test.js | 2 +- .../discourse/tests/integration/components/badge-button-test.js | 2 +- .../discourse/tests/integration/components/badge-title-test.js | 2 +- .../tests/integration/components/bookmark-icon-test.js | 2 +- .../discourse/tests/integration/components/bookmark-test.js | 2 +- .../tests/integration/components/category-badge-helper-test.js | 2 +- .../discourse/tests/integration/components/cook-text-test.js | 2 +- .../discourse/tests/integration/components/d-button-test.js | 2 +- .../discourse/tests/integration/components/d-editor-test.js | 2 +- .../tests/integration/components/d-icon-helper-test.js | 2 +- .../discourse/tests/integration/components/d-navigation-test.js | 2 +- .../discourse/tests/integration/components/d-popover-test.js | 2 +- .../discourse/tests/integration/components/date-input-test.js | 2 +- .../tests/integration/components/date-time-input-range-test.js | 2 +- .../tests/integration/components/date-time-input-test.js | 2 +- .../discourse/tests/integration/components/emoji-picker-test.js | 2 +- .../tests/integration/components/emoji-uploader-test.js | 2 +- .../discourse/tests/integration/components/empty-state-test.js | 2 +- .../discourse/tests/integration/components/flat-button-test.js | 2 +- .../tests/integration/components/group-list-setting-test.js | 2 +- .../integration/components/group-membership-button-test.js | 2 +- .../tests/integration/components/hidden-details-test.js | 2 +- .../tests/integration/components/highlighted-code-test.js | 2 +- .../tests/integration/components/html-safe-helper-test.js | 2 +- .../discourse/tests/integration/components/iframed-html-test.js | 2 +- .../discourse/tests/integration/components/input-size-test.js | 2 +- .../discourse/tests/integration/components/invite-panel-test.js | 2 +- .../discourse/tests/integration/components/load-more-test.js | 2 +- .../discourse/tests/integration/components/pending-post-test.js | 2 +- .../tests/integration/components/relative-time-picker-test.js | 2 +- .../tests/integration/components/secret-value-list-test.js | 2 +- .../tests/integration/components/select-kit/api-test.js | 2 +- .../integration/components/select-kit/category-chooser-test.js | 2 +- .../integration/components/select-kit/category-drop-test.js | 2 +- .../tests/integration/components/select-kit/combo-box-test.js | 2 +- .../components/select-kit/dropdown-select-box-test.js | 2 +- .../integration/components/select-kit/future-date-input-test.js | 2 +- .../integration/components/select-kit/list-setting-test.js | 2 +- .../integration/components/select-kit/mini-tag-chooser-test.js | 2 +- .../integration/components/select-kit/multi-select-test.js | 2 +- .../components/select-kit/notifications-button-test.js | 2 +- .../integration/components/select-kit/pinned-options-test.js | 2 +- .../integration/components/select-kit/single-select-test.js | 2 +- .../tests/integration/components/select-kit/tag-drop-test.js | 2 +- .../components/select-kit/topic-notifications-button-test.js | 2 +- .../components/select-kit/topic-notifications-options-test.js | 2 +- .../integration/components/select-kit/user-chooser-test.js | 2 +- .../discourse/tests/integration/components/simple-list-test.js | 2 +- .../discourse/tests/integration/components/site-header-test.js | 2 +- .../discourse/tests/integration/components/site-setting-test.js | 2 +- .../tests/integration/components/slow-mode-info-test.js | 2 +- .../tests/integration/components/software-update-prompt-test.js | 2 +- .../discourse/tests/integration/components/text-field-test.js | 2 +- .../tests/integration/components/themes-list-item-test.js | 2 +- .../discourse/tests/integration/components/themes-list-test.js | 2 +- .../discourse/tests/integration/components/time-input-test.js | 2 +- .../tests/integration/components/time-shortcut-picker-test.js | 2 +- .../tests/integration/components/topic-list-item-test.js | 2 +- .../discourse/tests/integration/components/topic-list-test.js | 2 +- .../tests/integration/components/uppy-image-uploader-test.js | 2 +- .../tests/integration/components/user-avatar-flair-test.js | 2 +- .../discourse/tests/integration/components/user-info-test.js | 2 +- .../tests/integration/components/user-selector-test.js | 2 +- .../discourse/tests/integration/components/value-list-test.js | 2 +- .../tests/integration/components/watched-word-uploader-test.js | 2 +- .../integration/components/widgets/actions-summary-test.js | 2 +- .../tests/integration/components/widgets/avatar-flair-test.js | 2 +- .../tests/integration/components/widgets/button-test.js | 2 +- .../components/widgets/default-notification-item-test.js | 2 +- .../tests/integration/components/widgets/hamburger-menu-test.js | 2 +- .../tests/integration/components/widgets/header-test.js | 2 +- .../tests/integration/components/widgets/home-logo-test.js | 2 +- .../tests/integration/components/widgets/post-links-test.js | 2 +- .../tests/integration/components/widgets/post-menu-test.js | 2 +- .../integration/components/widgets/post-small-action-test.js | 2 +- .../tests/integration/components/widgets/post-stream-test.js | 2 +- .../discourse/tests/integration/components/widgets/post-test.js | 2 +- .../tests/integration/components/widgets/poster-name-test.js | 2 +- .../integration/components/widgets/quick-access-item-test.js | 2 +- .../integration/components/widgets/small-user-list-test.js | 2 +- .../integration/components/widgets/topic-admin-menu-test.js | 2 +- .../integration/components/widgets/topic-participant-test.js | 2 +- .../tests/integration/components/widgets/topic-status-test.js | 2 +- .../tests/integration/components/widgets/user-menu-test.js | 2 +- .../integration/components/widgets/widget-dropdown-test.js | 2 +- .../tests/integration/components/widgets/widget-test.js | 2 +- .../tests/integration/components/wizard-invite-list-test.js | 2 +- .../javascripts/discourse/tests/unit/utils/decorators-test.js | 2 +- .../javascripts/discourse/tests/unit/utils/dom-utils-test.js | 2 +- 99 files changed, 99 insertions(+), 99 deletions(-) diff --git a/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js b/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js index 83cedd99afb..ac57b552a83 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/custom-html-template-test.js @@ -1,5 +1,5 @@ import { acceptance, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import { test } from "qunit"; import { visit } from "@ember/test-helpers"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/modal-test.js b/app/assets/javascripts/discourse/tests/acceptance/modal-test.js index d91cd0cc1c1..f4d9ada0ab4 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/modal-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/modal-test.js @@ -8,7 +8,7 @@ import { import { click, settled, triggerKeyEvent, visit } from "@ember/test-helpers"; import { test } from "qunit"; import I18n from "I18n"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import showModal from "discourse/lib/show-modal"; acceptance("Modal", function (needs) { diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js index d0c33d66663..8f44b4d76ea 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-connector-class-test.js @@ -7,7 +7,7 @@ import { import { click, visit } from "@ember/test-helpers"; import { action } from "@ember/object"; import { extraConnectorClass } from "discourse/lib/plugin-connectors"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import { test } from "qunit"; const PREFIX = "javascripts/single-test/connectors"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js index 1c65d6362c8..c421c477692 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-decorator-test.js @@ -3,7 +3,7 @@ import { exists, queryAll, } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import { test } from "qunit"; import { visit } from "@ember/test-helpers"; import { withPluginApi } from "discourse/lib/plugin-api"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js index 973e5d69108..8caa688682a 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-multi-template-test.js @@ -4,7 +4,7 @@ import { query, } from "discourse/tests/helpers/qunit-helpers"; import { clearCache } from "discourse/lib/plugin-connectors"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import { test } from "qunit"; import { visit } from "@ember/test-helpers"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js index c2465f84a9a..6647628d6b4 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/plugin-outlet-single-template-test.js @@ -3,7 +3,7 @@ import { count, query, } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import { test } from "qunit"; import { visit } from "@ember/test-helpers"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/ace-editor-test.js b/app/assets/javascripts/discourse/tests/integration/components/ace-editor-test.js index c049c8060ea..c70d2a37b60 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/ace-editor-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/ace-editor-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { count, exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | ace-editor", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/activation-controls-test.js b/app/assets/javascripts/discourse/tests/integration/components/activation-controls-test.js index dcffc1daa58..4816ca53491 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/activation-controls-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/activation-controls-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | activation-controls", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/admin-report-test.js b/app/assets/javascripts/discourse/tests/integration/components/admin-report-test.js index 88691761fe6..bf2abe505d3 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/admin-report-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/admin-report-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import { count, exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import pretender from "discourse/tests/helpers/create-pretender"; module("Integration | Component | admin-report", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/admin-user-field-item-test.js b/app/assets/javascripts/discourse/tests/integration/components/admin-user-field-item-test.js index d642d84f021..49e8e927f1a 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/admin-user-field-item-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/admin-user-field-item-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import I18n from "I18n"; module("Integration | Component | admin-user-field-item", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/avatar-uploader-test.js b/app/assets/javascripts/discourse/tests/integration/components/avatar-uploader-test.js index 6d1a3c2e302..a4ddcc622db 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/avatar-uploader-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/avatar-uploader-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { createFile } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import pretender from "discourse/tests/helpers/create-pretender"; module("Integration | Component | avatar-uploader", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/badge-button-test.js b/app/assets/javascripts/discourse/tests/integration/components/badge-button-test.js index 532b9ad4137..218902a2caf 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/badge-button-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/badge-button-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | badge-button", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/badge-title-test.js b/app/assets/javascripts/discourse/tests/integration/components/badge-title-test.js index 6b7d194f00c..3b421b9f21b 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/badge-title-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/badge-title-test.js @@ -1,7 +1,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import pretender from "discourse/tests/helpers/create-pretender"; import selectKit from "discourse/tests/helpers/select-kit-helper"; import EmberObject from "@ember/object"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/bookmark-icon-test.js b/app/assets/javascripts/discourse/tests/integration/components/bookmark-icon-test.js index 13fac3954a1..eeb58665f2c 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/bookmark-icon-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/bookmark-icon-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import Bookmark from "discourse/models/bookmark"; import I18n from "I18n"; import { formattedReminderTime } from "discourse/lib/bookmark"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/bookmark-test.js b/app/assets/javascripts/discourse/tests/integration/components/bookmark-test.js index 171d868f97d..f5243652b93 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/bookmark-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/bookmark-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | bookmark", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/category-badge-helper-test.js b/app/assets/javascripts/discourse/tests/integration/components/category-badge-helper-test.js index 01949976f35..44269f5a556 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/category-badge-helper-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/category-badge-helper-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import Category from "discourse/models/category"; module("Integration | Component | category-badge helper", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/cook-text-test.js b/app/assets/javascripts/discourse/tests/integration/components/cook-text-test.js index 8a434358411..16d79ac921a 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/cook-text-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/cook-text-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import pretender from "discourse/tests/helpers/create-pretender"; import { resetCache } from "pretty-text/upload-short-url"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-button-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-button-test.js index e843dcb31ea..b69293c2e2a 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/d-button-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/d-button-test.js @@ -3,7 +3,7 @@ import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render, triggerKeyEvent } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; import I18n from "I18n"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | d-button", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js index 51cb3aff347..a603d206758 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/d-editor-test.js @@ -11,7 +11,7 @@ import { getTextareaSelection, setTextareaSelection, } from "discourse/tests/helpers/textarea-selection-helper"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import I18n from "I18n"; import { clearToolbarCallbacks } from "discourse/components/d-editor"; import formatTextWithSelection from "discourse/tests/helpers/d-editor-helper"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-icon-helper-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-icon-helper-test.js index 3f98dc9c8b0..b7ed5f1675d 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/d-icon-helper-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/d-icon-helper-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | d-icon helper", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-navigation-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-navigation-test.js index af49541be0b..0e8f0181069 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/d-navigation-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/d-navigation-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import { count, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | d-navigation", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/d-popover-test.js b/app/assets/javascripts/discourse/tests/integration/components/d-popover-test.js index 0b021bf724d..321bf132f41 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/d-popover-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/d-popover-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render, triggerKeyEvent } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import { showPopover } from "discourse/lib/d-popover"; module("Integration | Component | d-popover", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/date-input-test.js b/app/assets/javascripts/discourse/tests/integration/components/date-input-test.js index 1238adce988..af0ce661bbc 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/date-input-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/date-input-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; function dateInput() { return query(".date-picker"); diff --git a/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js b/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js index 89c1db6a2d8..22f5ab0ecee 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/date-time-input-range-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; function fromDateInput() { return query(".from.d-date-time-input .date-picker"); diff --git a/app/assets/javascripts/discourse/tests/integration/components/date-time-input-test.js b/app/assets/javascripts/discourse/tests/integration/components/date-time-input-test.js index 803fc3d5db4..52cdbc6f242 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/date-time-input-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/date-time-input-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; function dateInput() { return query(".date-picker"); diff --git a/app/assets/javascripts/discourse/tests/integration/components/emoji-picker-test.js b/app/assets/javascripts/discourse/tests/integration/components/emoji-picker-test.js index 012f3cd2a99..b83a195a2b5 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/emoji-picker-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/emoji-picker-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | emoji-picker", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/emoji-uploader-test.js b/app/assets/javascripts/discourse/tests/integration/components/emoji-uploader-test.js index ddc1b00e307..daea0bd3783 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/emoji-uploader-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/emoji-uploader-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { fillIn, render } from "@ember/test-helpers"; import { createFile } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import pretender, { response } from "discourse/tests/helpers/create-pretender"; import selectKit from "discourse/tests/helpers/select-kit-helper"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/empty-state-test.js b/app/assets/javascripts/discourse/tests/integration/components/empty-state-test.js index b657e191853..13c766fd258 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/empty-state-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/empty-state-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | empty-state", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/flat-button-test.js b/app/assets/javascripts/discourse/tests/integration/components/flat-button-test.js index 7b838731014..69c94776227 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/flat-button-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/flat-button-test.js @@ -1,7 +1,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render, triggerKeyEvent } from "@ember/test-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | flat-button", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/group-list-setting-test.js b/app/assets/javascripts/discourse/tests/integration/components/group-list-setting-test.js index 03de1e1f605..21f2372f238 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/group-list-setting-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/group-list-setting-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import selectKit from "discourse/tests/helpers/select-kit-helper"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import EmberObject from "@ember/object"; module("Integration | Component | group-list site-setting", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/group-membership-button-test.js b/app/assets/javascripts/discourse/tests/integration/components/group-membership-button-test.js index f29e72ac5cd..582e1fa0534 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/group-membership-button-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/group-membership-button-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { count, exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | group-membership-button", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/hidden-details-test.js b/app/assets/javascripts/discourse/tests/integration/components/hidden-details-test.js index 3f7469260d1..88a5d86e5b2 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/hidden-details-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/hidden-details-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import I18n from "I18n"; module("Integration | Component | hidden-details", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/highlighted-code-test.js b/app/assets/javascripts/discourse/tests/integration/components/highlighted-code-test.js index 251e9d5a07b..112bb8c79be 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/highlighted-code-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/highlighted-code-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; const LONG_CODE_BLOCK = "puts a\n".repeat(15000); diff --git a/app/assets/javascripts/discourse/tests/integration/components/html-safe-helper-test.js b/app/assets/javascripts/discourse/tests/integration/components/html-safe-helper-test.js index 83960e8f560..35a5df3ea30 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/html-safe-helper-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/html-safe-helper-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | html-safe-helper", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/iframed-html-test.js b/app/assets/javascripts/discourse/tests/integration/components/iframed-html-test.js index 857e11e5467..1f4c8e669b4 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/iframed-html-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/iframed-html-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { queryAll } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | iframed-html", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/input-size-test.js b/app/assets/javascripts/discourse/tests/integration/components/input-size-test.js index 37d2c5ab85c..a1d8049056b 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/input-size-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/input-size-test.js @@ -2,7 +2,7 @@ import { module } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { chromeTest, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module( "Integration | Component | consistent input/dropdown/button sizes", diff --git a/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js b/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js index 59c3a091db7..81895d8fc6e 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import pretender from "discourse/tests/helpers/create-pretender"; import selectKit from "discourse/tests/helpers/select-kit-helper"; import User from "discourse/models/user"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/load-more-test.js b/app/assets/javascripts/discourse/tests/integration/components/load-more-test.js index 3dff04df1af..c14dc18de02 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/load-more-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/load-more-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { configureEyeline } from "discourse/lib/eyeline"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | load-more", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js b/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js index 2eb61d5b097..384954f2708 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import createStore from "discourse/tests/helpers/create-store"; module("Integration | Component | pending-post", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/relative-time-picker-test.js b/app/assets/javascripts/discourse/tests/integration/components/relative-time-picker-test.js index 8cb17c76857..5cc16d0ec17 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/relative-time-picker-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/relative-time-picker-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; module("Integration | Component | relative-time-picker", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/secret-value-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/secret-value-list-test.js index c58ba5ccfae..4e12c5750cb 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/secret-value-list-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/secret-value-list-test.js @@ -3,7 +3,7 @@ import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { blur, click, fillIn, render } from "@ember/test-helpers"; import { count, exists, query } from "discourse/tests/helpers/qunit-helpers"; import I18n from "I18n"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | secret-value-list", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/api-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/api-test.js index 5523c650ec3..7ee117c5aab 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/api-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/api-test.js @@ -7,7 +7,7 @@ import selectKit, { setDefaultState, } from "discourse/tests/helpers/select-kit-helper"; import { clearCallbacks } from "select-kit/mixins/plugin-api"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import { withPluginApi } from "discourse/lib/plugin-api"; module("Integration | Component | select-kit/api", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js index ea76287b5a5..426b914d6f3 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js @@ -3,7 +3,7 @@ import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import I18n from "I18n"; import createStore from "discourse/tests/helpers/create-store"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; module( diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-drop-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-drop-test.js index 96a66a1450f..452905f7c2e 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-drop-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-drop-test.js @@ -8,7 +8,7 @@ import { import Category from "discourse/models/category"; import DiscourseURL from "discourse/lib/url"; import I18n from "I18n"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; import { set } from "@ember/object"; import sinon from "sinon"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js index 7ddfa76f890..106985059b7 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/combo-box-test.js @@ -1,7 +1,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; const DEFAULT_CONTENT = [ diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/dropdown-select-box-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/dropdown-select-box-test.js index 3649cadf680..9c9d925316b 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/dropdown-select-box-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/dropdown-select-box-test.js @@ -1,7 +1,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; const DEFAULT_CONTENT = [ diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-test.js index 5f6ddf3949a..8d7af274cdb 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/future-date-input-test.js @@ -6,7 +6,7 @@ import { fakeTime, queryAll, } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; import I18n from "I18n"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/list-setting-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/list-setting-test.js index 5b6a0c283a8..0733ada7106 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/list-setting-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/list-setting-test.js @@ -1,7 +1,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; module("Integration | Component | select-kit/list-setting", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/mini-tag-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/mini-tag-chooser-test.js index e7eafd2d1b0..cbf53d5d31a 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/mini-tag-chooser-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/mini-tag-chooser-test.js @@ -3,7 +3,7 @@ import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { query, queryAll } from "discourse/tests/helpers/qunit-helpers"; import I18n from "I18n"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; module( diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js index a2aea61574a..53ad6810399 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/multi-select-test.js @@ -1,7 +1,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; const DEFAULT_CONTENT = [ diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/notifications-button-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/notifications-button-test.js index 561cf914741..70277a51d21 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/notifications-button-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/notifications-button-test.js @@ -4,7 +4,7 @@ import { render } from "@ember/test-helpers"; import selectKit, { setDefaultState, } from "discourse/tests/helpers/select-kit-helper"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module( "Integration | Component | select-kit/notifications-button", diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/pinned-options-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/pinned-options-test.js index 9caffe84c34..0d436f578cb 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/pinned-options-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/pinned-options-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import Topic from "discourse/models/topic"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; const buildTopic = function (pinned = true) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js index 3f2015b5381..5174fd3ceb4 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/single-select-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import I18n from "I18n"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; const DEFAULT_CONTENT = [ diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.js index d9f83109e80..385c94991e7 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import I18n from "I18n"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import pretender, { response } from "discourse/tests/helpers/create-pretender"; import selectKit from "discourse/tests/helpers/select-kit-helper"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js index 163d1208a41..1a507c33ec4 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js @@ -4,7 +4,7 @@ import { render } from "@ember/test-helpers"; import I18n from "I18n"; import Topic from "discourse/models/topic"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; const buildTopic = function (opts) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-options-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-options-test.js index 394a3f045ec..c0e55a3664c 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-options-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-options-test.js @@ -3,7 +3,7 @@ import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import I18n from "I18n"; import Topic from "discourse/models/topic"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; const buildTopic = function (archetype) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/user-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/user-chooser-test.js index 80d6d360ceb..f33b528b776 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/user-chooser-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/user-chooser-test.js @@ -1,7 +1,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; module("Integration | Component | select-kit/user-chooser", function (hooks) { 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 223ffe7eaba..e83071da237 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 @@ -8,7 +8,7 @@ import { triggerKeyEvent, } from "@ember/test-helpers"; import { count, exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | simple-list", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js b/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js index 7ec05275f63..199c05b079f 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/site-header-test.js @@ -3,7 +3,7 @@ import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import { count, exists } from "discourse/tests/helpers/qunit-helpers"; import pretender from "discourse/tests/helpers/create-pretender"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | site-header", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/site-setting-test.js b/app/assets/javascripts/discourse/tests/integration/components/site-setting-test.js index afc1e634b42..58b7c2dbfcc 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/site-setting-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/site-setting-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | site-setting", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/slow-mode-info-test.js b/app/assets/javascripts/discourse/tests/integration/components/slow-mode-info-test.js index 03c3ed04a7f..79313377936 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/slow-mode-info-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/slow-mode-info-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { count, exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | slow-mode-info", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/software-update-prompt-test.js b/app/assets/javascripts/discourse/tests/integration/components/software-update-prompt-test.js index 6fb93bacf2b..7c2dd6e9fb2 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/software-update-prompt-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/software-update-prompt-test.js @@ -6,7 +6,7 @@ import { exists, publishToMessageBus, } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import { later } from "@ember/runloop"; module("Integration | Component | software-update-prompt", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/text-field-test.js b/app/assets/javascripts/discourse/tests/integration/components/text-field-test.js index 3a56a9810aa..88fcd1ae229 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/text-field-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/text-field-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { fillIn, render } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import sinon from "sinon"; import I18n from "I18n"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/themes-list-item-test.js b/app/assets/javascripts/discourse/tests/integration/components/themes-list-item-test.js index ed875355619..a2d2483835e 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/themes-list-item-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/themes-list-item-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { count, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import I18n from "I18n"; import Theme from "admin/models/theme"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/themes-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/themes-list-test.js index aa4affe1d14..c2d3cce15ba 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/themes-list-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/themes-list-test.js @@ -7,7 +7,7 @@ import { query, queryAll, } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import Theme, { COMPONENTS, THEMES } from "admin/models/theme"; import I18n from "I18n"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/time-input-test.js b/app/assets/javascripts/discourse/tests/integration/components/time-input-test.js index 68a1e4450ca..60f5c0cbb84 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/time-input-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/time-input-test.js @@ -1,7 +1,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; function setTime(time) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/time-shortcut-picker-test.js b/app/assets/javascripts/discourse/tests/integration/components/time-shortcut-picker-test.js index a830cefaa59..d47c98c9716 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/time-shortcut-picker-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/time-shortcut-picker-test.js @@ -8,7 +8,7 @@ import { queryAll, } from "discourse/tests/helpers/qunit-helpers"; import I18n from "I18n"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | time-shortcut-picker", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/topic-list-item-test.js b/app/assets/javascripts/discourse/tests/integration/components/topic-list-item-test.js index 2fc1cf42099..e9b0348e128 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/topic-list-item-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/topic-list-item-test.js @@ -3,7 +3,7 @@ import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { queryAll } from "discourse/tests/helpers/qunit-helpers"; import Topic from "discourse/models/topic"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | topic-list-item", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/topic-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/topic-list-test.js index a44703cbf03..0e909f8bb25 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/topic-list-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/topic-list-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import Topic from "discourse/models/topic"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | topic-list", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/uppy-image-uploader-test.js b/app/assets/javascripts/discourse/tests/integration/components/uppy-image-uploader-test.js index 186463c0390..c891e246984 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/uppy-image-uploader-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/uppy-image-uploader-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import { count, exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | uppy-image-uploader", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js index 1b2d9d73cfe..06114f47f1c 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/user-avatar-flair-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import { resetFlair } from "discourse/lib/avatar-flair"; function setupSiteGroups(that) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-info-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-info-test.js index f911a669152..a204979770d 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/user-info-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/user-info-test.js @@ -1,7 +1,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; module("Integration | Component | user-info", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/user-selector-test.js b/app/assets/javascripts/discourse/tests/integration/components/user-selector-test.js index acbbbee747b..196eb88ead1 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/user-selector-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/user-selector-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; function paste(element, text) { let e = new Event("paste"); diff --git a/app/assets/javascripts/discourse/tests/integration/components/value-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/value-list-test.js index b7783701102..68098fb84e1 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/value-list-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/value-list-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { blur, click, fillIn, render } from "@ember/test-helpers"; import { count, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import selectKit from "discourse/tests/helpers/select-kit-helper"; module("Integration | Component | value-list", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/watched-word-uploader-test.js b/app/assets/javascripts/discourse/tests/integration/components/watched-word-uploader-test.js index 90651eb1ce7..4899bd9d455 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/watched-word-uploader-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/watched-word-uploader-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render, waitFor } from "@ember/test-helpers"; import { createFile } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import pretender, { response } from "discourse/tests/helpers/create-pretender"; module("Integration | Component | watched-word-uploader", function (hooks) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/actions-summary-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/actions-summary-test.js index 2a84f1fd82c..73e6783b0f5 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/actions-summary-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/actions-summary-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { count } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | Widget | actions-summary", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/avatar-flair-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/avatar-flair-test.js index 91e977ea9ff..210c6fde5d0 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/avatar-flair-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/avatar-flair-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | Widget | avatar-flair", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js index b8098a138d6..81bfad21ccb 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | Widget | button", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/default-notification-item-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/default-notification-item-test.js index 57ecf376448..509f09bcd66 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/default-notification-item-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/default-notification-item-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render, triggerEvent } from "@ember/test-helpers"; import { count, exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import pretender, { response } from "discourse/tests/helpers/create-pretender"; import EmberObject from "@ember/object"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/hamburger-menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/hamburger-menu-test.js index 605770ee66d..5f3858f23fd 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/hamburger-menu-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/hamburger-menu-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { count, exists, queryAll } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import { NotificationLevels } from "discourse/lib/notification-levels"; const topCategoryIds = [2, 3, 1]; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/header-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/header-test.js index 402faaf871b..7736316d245 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/header-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/header-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import { exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | Widget | header", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/home-logo-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/home-logo-test.js index 6cab1456f55..7f456d847f1 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/home-logo-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/home-logo-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { count, exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import Session from "discourse/models/session"; const bigLogo = "/images/d-logo-sketch.png?test"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-links-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-links-test.js index 6016d1298c0..f22f7e63429 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-links-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-links-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import { count } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | Widget | post-links", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-menu-test.js index d5a2f6a650f..776d942cb7c 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-menu-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-menu-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { count, exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import { resetPostMenuExtraButtons } from "discourse/widgets/post-menu"; import { withPluginApi } from "discourse/lib/plugin-api"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-small-action-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-small-action-test.js index 2bfa596bf6e..78323564497 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-small-action-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-small-action-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module( "Integration | Component | Widget | post-small-action", diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-stream-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-stream-test.js index 5bda0515aca..ad494ecedff 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-stream-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-stream-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { count } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import Post from "discourse/models/post"; import Topic from "discourse/models/topic"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-test.js index cd0c67c839c..650a9627a8a 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-test.js @@ -7,7 +7,7 @@ import { query, queryAll, } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import EmberObject from "@ember/object"; import I18n from "I18n"; import createStore from "discourse/tests/helpers/create-store"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/poster-name-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/poster-name-test.js index a1a240bb353..a162b360938 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/poster-name-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/poster-name-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | Widget | poster-name", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/quick-access-item-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/quick-access-item-test.js index 3477530da05..9e3dbb26168 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/quick-access-item-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/quick-access-item-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; const CONTENT_DIV_SELECTOR = "li > a > div"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/small-user-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/small-user-list-test.js index 2c072b9e055..de9ba7e9b6b 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/small-user-list-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/small-user-list-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { count, exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | Widget | small-user-list", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-admin-menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-admin-menu-test.js index 32aa23b855d..a5af0938f61 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-admin-menu-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-admin-menu-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import Category from "discourse/models/category"; import Topic from "discourse/models/topic"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-participant-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-participant-test.js index 418ed4379ef..b49ea9f2267 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-participant-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-participant-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { render } from "@ember/test-helpers"; import { exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module( "Integration | Component | Widget | topic-participant", diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-status-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-status-test.js index 808c5e14c8e..b75335bcac4 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-status-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-status-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import { exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import TopicStatusIcons from "discourse/helpers/topic-status-icons"; import createStore from "discourse/tests/helpers/create-store"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/user-menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/user-menu-test.js index 580be04c358..3989fd854eb 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/user-menu-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/user-menu-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import { exists, query, queryAll } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import sinon from "sinon"; import DiscourseURL from "discourse/lib/url"; import I18n from "I18n"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-dropdown-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-dropdown-test.js index 63a828c4a0b..5774e958354 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-dropdown-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-dropdown-test.js @@ -3,7 +3,7 @@ import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import { exists, query } from "discourse/tests/helpers/qunit-helpers"; import I18n from "I18n"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; const DEFAULT_CONTENT = { content: [ diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-test.js index e68baf73d70..f5406662703 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/widget-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, render } from "@ember/test-helpers"; import { count, exists, query } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import widgetHbs from "discourse/widgets/hbs-compiler"; import I18n from "I18n"; import { Promise } from "rsvp"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/wizard-invite-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/wizard-invite-list-test.js index ae2d7da5d3c..a48c830dc80 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/wizard-invite-list-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/wizard-invite-list-test.js @@ -2,7 +2,7 @@ import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { click, fillIn, render } from "@ember/test-helpers"; import { count, exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; module("Integration | Component | Wizard | invite-list", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js b/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js index 65239a6dbd4..2ec56a92b0b 100644 --- a/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js +++ b/app/assets/javascripts/discourse/tests/unit/utils/decorators-test.js @@ -7,7 +7,7 @@ import componentTest, { setupRenderingTest, } from "discourse/tests/helpers/component-test"; import { discourseModule, exists } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; const fooComponent = Component.extend({ classNames: ["foo-component"], diff --git a/app/assets/javascripts/discourse/tests/unit/utils/dom-utils-test.js b/app/assets/javascripts/discourse/tests/unit/utils/dom-utils-test.js index 9817eebde85..8b2f044a4d8 100644 --- a/app/assets/javascripts/discourse/tests/unit/utils/dom-utils-test.js +++ b/app/assets/javascripts/discourse/tests/unit/utils/dom-utils-test.js @@ -2,7 +2,7 @@ import componentTest, { setupRenderingTest, } from "discourse/tests/helpers/component-test"; import { discourseModule } from "discourse/tests/helpers/qunit-helpers"; -import hbs from "htmlbars-inline-precompile"; +import { hbs } from "ember-cli-htmlbars"; import domUtils from "discourse-common/utils/dom-utils"; discourseModule("utils:dom-utils", function (hooks) {