From 47a1170ec54d6510e61a1e39241120724c742570 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 3 Jul 2023 17:28:02 +0200 Subject: [PATCH] DEV: Merge js dirs; prefix tests (#484) --- .../{discourse-assign => discourse}/assigned-group-route-map.js | 0 .../assigned-messages-route-map.js | 0 .../assigns-activity-route-map.js | 0 .../javascripts/discourse/components/user-menu/assigns-list.js | 2 +- .../connectors/above-review-filters/assigned-to-filter.hbs | 0 .../connectors/above-review-filters/assigned-to-filter.js | 0 .../advanced-search-options-below/assigned-advanced-search.hbs | 0 .../advanced-search-options-below/assigned-advanced-search.js | 0 .../connectors/category-custom-settings/assign-settings.hbs | 0 .../connectors/category-custom-settings/assign-settings.js | 0 .../connectors/group-reports-nav-item/assigned-topic-list.hbs | 0 .../connectors/group-reports-nav-item/assigned-topic-list.js | 0 .../assignable-interaction-fields.hbs | 0 .../assignable-interaction-fields.js | 0 .../connectors/user-activity-bottom/assigned-list.hbs | 0 .../connectors/user-messages-nav/assigned-messages.hbs | 0 .../connectors/user-messages-nav/assigned-messages.js | 0 .../user-preferences-notifications/remind-assigns-frequency.hbs | 0 .../user-preferences-notifications/remind-assigns-frequency.js | 0 .../{discourse-assign => discourse}/controllers/assign-user.js | 0 .../controllers/group-assigned-show.js | 0 .../controllers/group-assigned.js | 0 .../controllers/user-activity-assigned.js | 0 .../initializers/extend-for-assigns.js | 0 .../lib/user-menu/assign-item.js | 0 .../pre-initializers/extend-category-for-assign.js | 0 .../routes/group-assigned-show.js | 0 .../{discourse-assign => discourse}/routes/group-assigned.js | 0 .../routes/user-activity-assigned.js | 0 .../routes/user-private-messages-assigned-index.js | 0 .../acceptance/user-private-messages-assigned-test.js | 2 +- .../{ => integration}/components/group-assigned-filter-test.js | 0 test/javascripts/{ => unit}/controllers/assign-user-test.js | 2 +- test/javascripts/unit/services/task-actions-test.js | 2 +- 34 files changed, 4 insertions(+), 4 deletions(-) rename assets/javascripts/{discourse-assign => discourse}/assigned-group-route-map.js (100%) rename assets/javascripts/{discourse-assign => discourse}/assigned-messages-route-map.js (100%) rename assets/javascripts/{discourse-assign => discourse}/assigns-activity-route-map.js (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/above-review-filters/assigned-to-filter.hbs (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/above-review-filters/assigned-to-filter.js (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/advanced-search-options-below/assigned-advanced-search.hbs (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/advanced-search-options-below/assigned-advanced-search.js (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/category-custom-settings/assign-settings.hbs (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/category-custom-settings/assign-settings.js (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/group-reports-nav-item/assigned-topic-list.hbs (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/group-reports-nav-item/assigned-topic-list.js (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/groups-interaction-custom-options/assignable-interaction-fields.js (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/user-activity-bottom/assigned-list.hbs (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/user-messages-nav/assigned-messages.hbs (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/user-messages-nav/assigned-messages.js (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/user-preferences-notifications/remind-assigns-frequency.hbs (100%) rename assets/javascripts/{discourse-assign => discourse}/connectors/user-preferences-notifications/remind-assigns-frequency.js (100%) rename assets/javascripts/{discourse-assign => discourse}/controllers/assign-user.js (100%) rename assets/javascripts/{discourse-assign => discourse}/controllers/group-assigned-show.js (100%) rename assets/javascripts/{discourse-assign => discourse}/controllers/group-assigned.js (100%) rename assets/javascripts/{discourse-assign => discourse}/controllers/user-activity-assigned.js (100%) rename assets/javascripts/{discourse-assign => discourse}/initializers/extend-for-assigns.js (100%) rename assets/javascripts/{discourse-assign => discourse}/lib/user-menu/assign-item.js (100%) rename assets/javascripts/{discourse-assign => discourse}/pre-initializers/extend-category-for-assign.js (100%) rename assets/javascripts/{discourse-assign => discourse}/routes/group-assigned-show.js (100%) rename assets/javascripts/{discourse-assign => discourse}/routes/group-assigned.js (100%) rename assets/javascripts/{discourse-assign => discourse}/routes/user-activity-assigned.js (100%) rename assets/javascripts/{discourse-assign => discourse}/routes/user-private-messages-assigned-index.js (100%) rename test/javascripts/{ => integration}/components/group-assigned-filter-test.js (100%) rename test/javascripts/{ => unit}/controllers/assign-user-test.js (93%) diff --git a/assets/javascripts/discourse-assign/assigned-group-route-map.js b/assets/javascripts/discourse/assigned-group-route-map.js similarity index 100% rename from assets/javascripts/discourse-assign/assigned-group-route-map.js rename to assets/javascripts/discourse/assigned-group-route-map.js diff --git a/assets/javascripts/discourse-assign/assigned-messages-route-map.js b/assets/javascripts/discourse/assigned-messages-route-map.js similarity index 100% rename from assets/javascripts/discourse-assign/assigned-messages-route-map.js rename to assets/javascripts/discourse/assigned-messages-route-map.js diff --git a/assets/javascripts/discourse-assign/assigns-activity-route-map.js b/assets/javascripts/discourse/assigns-activity-route-map.js similarity index 100% rename from assets/javascripts/discourse-assign/assigns-activity-route-map.js rename to assets/javascripts/discourse/assigns-activity-route-map.js diff --git a/assets/javascripts/discourse/components/user-menu/assigns-list.js b/assets/javascripts/discourse/components/user-menu/assigns-list.js index 552e104..0a67d86 100644 --- a/assets/javascripts/discourse/components/user-menu/assigns-list.js +++ b/assets/javascripts/discourse/components/user-menu/assigns-list.js @@ -1,7 +1,7 @@ import UserMenuNotificationsList from "discourse/components/user-menu/notifications-list"; import { ajax } from "discourse/lib/ajax"; import UserMenuNotificationItem from "discourse/lib/user-menu/notification-item"; -import UserMenuAssignItem from "discourse/plugins/discourse-assign/discourse-assign/lib/user-menu/assign-item"; +import UserMenuAssignItem from "../../lib/user-menu/assign-item"; import Notification from "discourse/models/notification"; import I18n from "I18n"; import showModal from "discourse/lib/show-modal"; diff --git a/assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.hbs b/assets/javascripts/discourse/connectors/above-review-filters/assigned-to-filter.hbs similarity index 100% rename from assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.hbs rename to assets/javascripts/discourse/connectors/above-review-filters/assigned-to-filter.hbs diff --git a/assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.js b/assets/javascripts/discourse/connectors/above-review-filters/assigned-to-filter.js similarity index 100% rename from assets/javascripts/discourse-assign/connectors/above-review-filters/assigned-to-filter.js rename to assets/javascripts/discourse/connectors/above-review-filters/assigned-to-filter.js diff --git a/assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.hbs b/assets/javascripts/discourse/connectors/advanced-search-options-below/assigned-advanced-search.hbs similarity index 100% rename from assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.hbs rename to assets/javascripts/discourse/connectors/advanced-search-options-below/assigned-advanced-search.hbs diff --git a/assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.js b/assets/javascripts/discourse/connectors/advanced-search-options-below/assigned-advanced-search.js similarity index 100% rename from assets/javascripts/discourse-assign/connectors/advanced-search-options-below/assigned-advanced-search.js rename to assets/javascripts/discourse/connectors/advanced-search-options-below/assigned-advanced-search.js diff --git a/assets/javascripts/discourse-assign/connectors/category-custom-settings/assign-settings.hbs b/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings.hbs similarity index 100% rename from assets/javascripts/discourse-assign/connectors/category-custom-settings/assign-settings.hbs rename to assets/javascripts/discourse/connectors/category-custom-settings/assign-settings.hbs diff --git a/assets/javascripts/discourse-assign/connectors/category-custom-settings/assign-settings.js b/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings.js similarity index 100% rename from assets/javascripts/discourse-assign/connectors/category-custom-settings/assign-settings.js rename to assets/javascripts/discourse/connectors/category-custom-settings/assign-settings.js diff --git a/assets/javascripts/discourse-assign/connectors/group-reports-nav-item/assigned-topic-list.hbs b/assets/javascripts/discourse/connectors/group-reports-nav-item/assigned-topic-list.hbs similarity index 100% rename from assets/javascripts/discourse-assign/connectors/group-reports-nav-item/assigned-topic-list.hbs rename to assets/javascripts/discourse/connectors/group-reports-nav-item/assigned-topic-list.hbs diff --git a/assets/javascripts/discourse-assign/connectors/group-reports-nav-item/assigned-topic-list.js b/assets/javascripts/discourse/connectors/group-reports-nav-item/assigned-topic-list.js similarity index 100% rename from assets/javascripts/discourse-assign/connectors/group-reports-nav-item/assigned-topic-list.js rename to assets/javascripts/discourse/connectors/group-reports-nav-item/assigned-topic-list.js diff --git a/assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs b/assets/javascripts/discourse/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs similarity index 100% rename from assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs rename to assets/javascripts/discourse/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs diff --git a/assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.js b/assets/javascripts/discourse/connectors/groups-interaction-custom-options/assignable-interaction-fields.js similarity index 100% rename from assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.js rename to assets/javascripts/discourse/connectors/groups-interaction-custom-options/assignable-interaction-fields.js diff --git a/assets/javascripts/discourse-assign/connectors/user-activity-bottom/assigned-list.hbs b/assets/javascripts/discourse/connectors/user-activity-bottom/assigned-list.hbs similarity index 100% rename from assets/javascripts/discourse-assign/connectors/user-activity-bottom/assigned-list.hbs rename to assets/javascripts/discourse/connectors/user-activity-bottom/assigned-list.hbs diff --git a/assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.hbs b/assets/javascripts/discourse/connectors/user-messages-nav/assigned-messages.hbs similarity index 100% rename from assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.hbs rename to assets/javascripts/discourse/connectors/user-messages-nav/assigned-messages.hbs diff --git a/assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.js b/assets/javascripts/discourse/connectors/user-messages-nav/assigned-messages.js similarity index 100% rename from assets/javascripts/discourse-assign/connectors/user-messages-nav/assigned-messages.js rename to assets/javascripts/discourse/connectors/user-messages-nav/assigned-messages.js diff --git a/assets/javascripts/discourse-assign/connectors/user-preferences-notifications/remind-assigns-frequency.hbs b/assets/javascripts/discourse/connectors/user-preferences-notifications/remind-assigns-frequency.hbs similarity index 100% rename from assets/javascripts/discourse-assign/connectors/user-preferences-notifications/remind-assigns-frequency.hbs rename to assets/javascripts/discourse/connectors/user-preferences-notifications/remind-assigns-frequency.hbs diff --git a/assets/javascripts/discourse-assign/connectors/user-preferences-notifications/remind-assigns-frequency.js b/assets/javascripts/discourse/connectors/user-preferences-notifications/remind-assigns-frequency.js similarity index 100% rename from assets/javascripts/discourse-assign/connectors/user-preferences-notifications/remind-assigns-frequency.js rename to assets/javascripts/discourse/connectors/user-preferences-notifications/remind-assigns-frequency.js diff --git a/assets/javascripts/discourse-assign/controllers/assign-user.js b/assets/javascripts/discourse/controllers/assign-user.js similarity index 100% rename from assets/javascripts/discourse-assign/controllers/assign-user.js rename to assets/javascripts/discourse/controllers/assign-user.js diff --git a/assets/javascripts/discourse-assign/controllers/group-assigned-show.js b/assets/javascripts/discourse/controllers/group-assigned-show.js similarity index 100% rename from assets/javascripts/discourse-assign/controllers/group-assigned-show.js rename to assets/javascripts/discourse/controllers/group-assigned-show.js diff --git a/assets/javascripts/discourse-assign/controllers/group-assigned.js b/assets/javascripts/discourse/controllers/group-assigned.js similarity index 100% rename from assets/javascripts/discourse-assign/controllers/group-assigned.js rename to assets/javascripts/discourse/controllers/group-assigned.js diff --git a/assets/javascripts/discourse-assign/controllers/user-activity-assigned.js b/assets/javascripts/discourse/controllers/user-activity-assigned.js similarity index 100% rename from assets/javascripts/discourse-assign/controllers/user-activity-assigned.js rename to assets/javascripts/discourse/controllers/user-activity-assigned.js diff --git a/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js b/assets/javascripts/discourse/initializers/extend-for-assigns.js similarity index 100% rename from assets/javascripts/discourse-assign/initializers/extend-for-assigns.js rename to assets/javascripts/discourse/initializers/extend-for-assigns.js diff --git a/assets/javascripts/discourse-assign/lib/user-menu/assign-item.js b/assets/javascripts/discourse/lib/user-menu/assign-item.js similarity index 100% rename from assets/javascripts/discourse-assign/lib/user-menu/assign-item.js rename to assets/javascripts/discourse/lib/user-menu/assign-item.js diff --git a/assets/javascripts/discourse-assign/pre-initializers/extend-category-for-assign.js b/assets/javascripts/discourse/pre-initializers/extend-category-for-assign.js similarity index 100% rename from assets/javascripts/discourse-assign/pre-initializers/extend-category-for-assign.js rename to assets/javascripts/discourse/pre-initializers/extend-category-for-assign.js diff --git a/assets/javascripts/discourse-assign/routes/group-assigned-show.js b/assets/javascripts/discourse/routes/group-assigned-show.js similarity index 100% rename from assets/javascripts/discourse-assign/routes/group-assigned-show.js rename to assets/javascripts/discourse/routes/group-assigned-show.js diff --git a/assets/javascripts/discourse-assign/routes/group-assigned.js b/assets/javascripts/discourse/routes/group-assigned.js similarity index 100% rename from assets/javascripts/discourse-assign/routes/group-assigned.js rename to assets/javascripts/discourse/routes/group-assigned.js diff --git a/assets/javascripts/discourse-assign/routes/user-activity-assigned.js b/assets/javascripts/discourse/routes/user-activity-assigned.js similarity index 100% rename from assets/javascripts/discourse-assign/routes/user-activity-assigned.js rename to assets/javascripts/discourse/routes/user-activity-assigned.js diff --git a/assets/javascripts/discourse-assign/routes/user-private-messages-assigned-index.js b/assets/javascripts/discourse/routes/user-private-messages-assigned-index.js similarity index 100% rename from assets/javascripts/discourse-assign/routes/user-private-messages-assigned-index.js rename to assets/javascripts/discourse/routes/user-private-messages-assigned-index.js diff --git a/test/javascripts/acceptance/user-private-messages-assigned-test.js b/test/javascripts/acceptance/user-private-messages-assigned-test.js index 315b1e0..0112b29 100644 --- a/test/javascripts/acceptance/user-private-messages-assigned-test.js +++ b/test/javascripts/acceptance/user-private-messages-assigned-test.js @@ -9,7 +9,7 @@ import { cloneJSON } from "discourse-common/lib/object"; import selectKit from "discourse/tests/helpers/select-kit-helper"; import { test } from "qunit"; -acceptance("User Private Messages | Discourse Assign", function (needs) { +acceptance("Discourse Assign | User Private Messages", function (needs) { needs.user({ can_assign: true, }); diff --git a/test/javascripts/components/group-assigned-filter-test.js b/test/javascripts/integration/components/group-assigned-filter-test.js similarity index 100% rename from test/javascripts/components/group-assigned-filter-test.js rename to test/javascripts/integration/components/group-assigned-filter-test.js diff --git a/test/javascripts/controllers/assign-user-test.js b/test/javascripts/unit/controllers/assign-user-test.js similarity index 93% rename from test/javascripts/controllers/assign-user-test.js rename to test/javascripts/unit/controllers/assign-user-test.js index 5bd41af..cb735d2 100644 --- a/test/javascripts/controllers/assign-user-test.js +++ b/test/javascripts/unit/controllers/assign-user-test.js @@ -4,7 +4,7 @@ import EmberObject from "@ember/object"; import pretender, { response } from "discourse/tests/helpers/create-pretender"; import { getOwner } from "discourse-common/lib/get-owner"; -module("Unit | Controller | assign-user", function (hooks) { +module("Discourse Assign | Unit | Controller | assign-user", function (hooks) { setupRenderingTest(hooks); test("assigning a user by selector does not close the modal", async function (assert) { diff --git a/test/javascripts/unit/services/task-actions-test.js b/test/javascripts/unit/services/task-actions-test.js index 4b6bab0..723fcb8 100644 --- a/test/javascripts/unit/services/task-actions-test.js +++ b/test/javascripts/unit/services/task-actions-test.js @@ -5,7 +5,7 @@ import * as showModal from "discourse/lib/show-modal"; import pretender, { response } from "discourse/tests/helpers/create-pretender"; import { getOwner } from "discourse-common/lib/get-owner"; -module("Unit | Service | task-actions", function (hooks) { +module("Discourse Assign | Unit | Service | task-actions", function (hooks) { setupTest(hooks); test("assign", function (assert) {