From 445d6ba45fe954fb7de11ce7b1392232160e2b63 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 29 Sep 2020 13:54:48 -0400 Subject: [PATCH] REFACTOR: Move qunit tests to a different directory structure This structure is closer to how ember-cli expects tests to be placed. It is not their final position, just the first step towards it. --- .../components/group-list-setting-test.js | 0 .../components/themes-list-item-test.js | 0 .../components/themes-list-test.js | 0 .../admin-customize-themes-show-test.js | 0 .../admin-customize-themes-test.js | 0 .../controllers/admin-user-badges-test.js | 0 .../admin/{ => unit}/models/theme-test.js | 0 .../components/ace-editor-test.js | 0 .../components/admin-report-test.js | 0 .../components/badge-title-test.js | 0 .../components/cook-text-test.js | 0 .../components/d-button-test.js | 0 .../components/d-editor-test.js | 0 .../components/d-icon-test.js | 0 .../components/date-input-test.js | 0 .../components/date-time-input-range-test.js | 0 .../components/date-time-input-test.js | 0 .../group-membership-button-test.js | 0 .../components/highlighted-code-test.js | 0 .../components/html-safe-helper-test.js | 0 .../components/iframed-html-test.js | 0 .../components/image-uploader-test.js | 0 .../components/keyboard-shortcuts-test.js | 0 .../components/load-more-test.js | 0 .../components/secret-value-list-test.js | 0 .../components/select-kit/api-test.js | 0 .../select-kit/category-chooser-test.js | 0 .../select-kit/category-drop-test.js | 0 .../components/select-kit/combo-box-test.js | 0 .../select-kit/dropdown-select-box-test.js | 0 .../select-kit/list-setting-test.js | 0 .../select-kit/mini-tag-chooser-test.js | 0 .../select-kit/multi-select-test.js | 0 .../select-kit/notifications-button-test.js | 0 .../select-kit/pinned-options-test.js | 0 .../select-kit/single-select-test.js | 0 .../components/select-kit/tag-drop-test.js | 0 .../topic-notifications-button-test.js | 0 .../topic-notifications-options-test.js | 0 .../select-kit/user-chooser-test.js | 0 .../components/share-button-test.js | 0 .../components/share-button.js | 0 .../components/simple-list-test.js | 0 .../components/text-field-test.js | 0 .../components/time-input-test.js | 0 .../components/user-selector-test.js | 0 .../components/value-list-test.js | 0 .../widgets/actions-summary-test.js | 0 .../widgets/avatar-flair-test.js | 0 .../{ => integration}/widgets/button-test.js | 0 .../widgets/default-notification-item-test.js | 0 .../widgets/hamburger-menu-test.js | 0 .../{ => integration}/widgets/header-test.js | 0 .../widgets/home-logo-test.js | 0 .../widgets/post-links-test.js | 0 .../widgets/post-menu-test.js | 0 .../widgets/post-stream-test.js | 0 .../{ => integration}/widgets/post-test.js | 0 .../widgets/poster-name-test.js | 0 .../widgets/quick-access-item-test.js | 0 .../widgets/small-user-list-test.js | 0 .../widgets/topic-admin-menu-test.js | 0 .../widgets/topic-participant-test.js | 0 .../widgets/topic-status-test.js | 0 .../widgets/user-menu-test.js | 0 .../widgets/widget-dropdown-test.js | 0 .../{ => integration}/widgets/widget-test.js | 0 test/javascripts/test_helper.js | 40 ++++++++++--------- .../controllers/avatar-selector-test.js | 0 .../{ => unit}/controllers/bookmark-test.js | 0 .../controllers/create-account-test.js | 0 .../{ => unit}/controllers/history-test.js | 0 .../controllers/preferences-account-test.js | 0 .../preferences-second-factor-test.js | 0 .../controllers/reorder-categories-test.js | 0 .../{ => unit}/controllers/topic-test.js | 0 .../{ => unit}/ember/resolver-test.js | 0 .../javascripts/{ => unit}/lib/bbcode-test.js | 0 .../{ => unit}/lib/bookmark-test.js | 0 .../{ => unit}/lib/break-string-test.js | 0 .../{ => unit}/lib/category-badge-test.js | 0 .../lib/click-track-edit-history-test.js | 0 .../lib/click-track-profile-page-test.js | 0 .../{ => unit}/lib/click-track-test.js | 0 .../{ => unit}/lib/computed-test.js | 0 .../{ => unit}/lib/emoji-store-test.js | 0 test/javascripts/{ => unit}/lib/emoji-test.js | 0 .../{ => unit}/lib/formatter-test.js | 0 .../{ => unit}/lib/get-url-test.js | 0 .../lib/highlight-search-test.js.es6 | 0 test/javascripts/{ => unit}/lib/i18n-test.js | 0 .../{ => unit}/lib/icon-library-test.js | 0 .../{ => unit}/lib/key-value-store-test.js | 0 .../{ => unit}/lib/link-mentions-test.js | 0 .../{ => unit}/lib/load-script-test.js | 0 .../{ => unit}/lib/oneboxer-test.js | 0 .../{ => unit}/lib/preload-store-test.js | 0 .../{ => unit}/lib/pretty-text-test.js | 0 .../{ => unit}/lib/sanitizer-test.js | 0 .../javascripts/{ => unit}/lib/search-test.js | 0 .../{ => unit}/lib/sharing-test.js | 0 .../{ => unit}/lib/text-direction-test.js | 0 .../{ => unit}/lib/to-markdown-test.js | 0 .../{ => unit}/lib/upload-short-url-test.js | 0 .../{ => unit}/lib/uploads-test.js | 0 test/javascripts/{ => unit}/lib/url-test.js | 0 .../{ => unit}/lib/user-search-test.js | 0 .../{ => unit}/lib/utilities-test.js | 0 .../{ => unit}/lib/white-lister-test.js | 0 .../localization-test.js | 0 .../mixins/grant-badge-controller-test.js | 0 .../{ => unit}/mixins/setting-object-test.js | 0 .../{ => unit}/mixins/singleton-test.js | 0 .../{ => unit}/models/badge-test.js | 0 .../{ => unit}/models/category-test.js | 0 .../{ => unit}/models/composer-test.js | 0 .../{ => unit}/models/email-log-test.js | 0 .../{ => unit}/models/group-test.js | 0 .../{ => unit}/models/invite-test.js | 0 .../{ => unit}/models/nav-item-test.js | 0 .../{ => unit}/models/post-stream-test.js | 0 .../{ => unit}/models/post-test.js | 0 .../{ => unit}/models/report-test.js | 0 .../{ => unit}/models/rest-model-test.js | 0 .../{ => unit}/models/result-set-test.js | 0 .../{ => unit}/models/session-test.js | 0 .../{ => unit}/models/site-test.js | 0 .../models/staff-action-log-test.js | 0 .../{ => unit}/models/store-test.js | 0 .../{ => unit}/models/topic-details-test.js | 0 .../{ => unit}/models/topic-test.js | 0 .../models/topic-tracking-state-test.js | 0 .../{ => unit}/models/user-action-test.js | 0 .../{ => unit}/models/user-badge-test.js | 0 .../{ => unit}/models/user-drafts-test.js | 0 .../{ => unit}/models/user-stream-test.js | 0 .../{ => unit}/models/user-test.js | 0 .../services/document-title-test.js | 0 .../{ => unit}/utils/decorators-test.js | 0 139 files changed, 21 insertions(+), 19 deletions(-) rename test/javascripts/admin/{ => integration}/components/group-list-setting-test.js (100%) rename test/javascripts/admin/{ => integration}/components/themes-list-item-test.js (100%) rename test/javascripts/admin/{ => integration}/components/themes-list-test.js (100%) rename test/javascripts/admin/{ => unit}/controllers/admin-customize-themes-show-test.js (100%) rename test/javascripts/admin/{ => unit}/controllers/admin-customize-themes-test.js (100%) rename test/javascripts/admin/{ => unit}/controllers/admin-user-badges-test.js (100%) rename test/javascripts/admin/{ => unit}/models/theme-test.js (100%) rename test/javascripts/{ => integration}/components/ace-editor-test.js (100%) rename test/javascripts/{ => integration}/components/admin-report-test.js (100%) rename test/javascripts/{ => integration}/components/badge-title-test.js (100%) rename test/javascripts/{ => integration}/components/cook-text-test.js (100%) rename test/javascripts/{ => integration}/components/d-button-test.js (100%) rename test/javascripts/{ => integration}/components/d-editor-test.js (100%) rename test/javascripts/{ => integration}/components/d-icon-test.js (100%) rename test/javascripts/{ => integration}/components/date-input-test.js (100%) rename test/javascripts/{ => integration}/components/date-time-input-range-test.js (100%) rename test/javascripts/{ => integration}/components/date-time-input-test.js (100%) rename test/javascripts/{ => integration}/components/group-membership-button-test.js (100%) rename test/javascripts/{ => integration}/components/highlighted-code-test.js (100%) rename test/javascripts/{ => integration}/components/html-safe-helper-test.js (100%) rename test/javascripts/{ => integration}/components/iframed-html-test.js (100%) rename test/javascripts/{ => integration}/components/image-uploader-test.js (100%) rename test/javascripts/{ => integration}/components/keyboard-shortcuts-test.js (100%) rename test/javascripts/{ => integration}/components/load-more-test.js (100%) rename test/javascripts/{ => integration}/components/secret-value-list-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/api-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/category-chooser-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/category-drop-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/combo-box-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/dropdown-select-box-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/list-setting-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/mini-tag-chooser-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/multi-select-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/notifications-button-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/pinned-options-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/single-select-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/tag-drop-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/topic-notifications-button-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/topic-notifications-options-test.js (100%) rename test/javascripts/{ => integration}/components/select-kit/user-chooser-test.js (100%) rename test/javascripts/{ => integration}/components/share-button-test.js (100%) rename test/javascripts/{ => integration}/components/share-button.js (100%) rename test/javascripts/{ => integration}/components/simple-list-test.js (100%) rename test/javascripts/{ => integration}/components/text-field-test.js (100%) rename test/javascripts/{ => integration}/components/time-input-test.js (100%) rename test/javascripts/{ => integration}/components/user-selector-test.js (100%) rename test/javascripts/{ => integration}/components/value-list-test.js (100%) rename test/javascripts/{ => integration}/widgets/actions-summary-test.js (100%) rename test/javascripts/{ => integration}/widgets/avatar-flair-test.js (100%) rename test/javascripts/{ => integration}/widgets/button-test.js (100%) rename test/javascripts/{ => integration}/widgets/default-notification-item-test.js (100%) rename test/javascripts/{ => integration}/widgets/hamburger-menu-test.js (100%) rename test/javascripts/{ => integration}/widgets/header-test.js (100%) rename test/javascripts/{ => integration}/widgets/home-logo-test.js (100%) rename test/javascripts/{ => integration}/widgets/post-links-test.js (100%) rename test/javascripts/{ => integration}/widgets/post-menu-test.js (100%) rename test/javascripts/{ => integration}/widgets/post-stream-test.js (100%) rename test/javascripts/{ => integration}/widgets/post-test.js (100%) rename test/javascripts/{ => integration}/widgets/poster-name-test.js (100%) rename test/javascripts/{ => integration}/widgets/quick-access-item-test.js (100%) rename test/javascripts/{ => integration}/widgets/small-user-list-test.js (100%) rename test/javascripts/{ => integration}/widgets/topic-admin-menu-test.js (100%) rename test/javascripts/{ => integration}/widgets/topic-participant-test.js (100%) rename test/javascripts/{ => integration}/widgets/topic-status-test.js (100%) rename test/javascripts/{ => integration}/widgets/user-menu-test.js (100%) rename test/javascripts/{ => integration}/widgets/widget-dropdown-test.js (100%) rename test/javascripts/{ => integration}/widgets/widget-test.js (100%) rename test/javascripts/{ => unit}/controllers/avatar-selector-test.js (100%) rename test/javascripts/{ => unit}/controllers/bookmark-test.js (100%) rename test/javascripts/{ => unit}/controllers/create-account-test.js (100%) rename test/javascripts/{ => unit}/controllers/history-test.js (100%) rename test/javascripts/{ => unit}/controllers/preferences-account-test.js (100%) rename test/javascripts/{ => unit}/controllers/preferences-second-factor-test.js (100%) rename test/javascripts/{ => unit}/controllers/reorder-categories-test.js (100%) rename test/javascripts/{ => unit}/controllers/topic-test.js (100%) rename test/javascripts/{ => unit}/ember/resolver-test.js (100%) rename test/javascripts/{ => unit}/lib/bbcode-test.js (100%) rename test/javascripts/{ => unit}/lib/bookmark-test.js (100%) rename test/javascripts/{ => unit}/lib/break-string-test.js (100%) rename test/javascripts/{ => unit}/lib/category-badge-test.js (100%) rename test/javascripts/{ => unit}/lib/click-track-edit-history-test.js (100%) rename test/javascripts/{ => unit}/lib/click-track-profile-page-test.js (100%) rename test/javascripts/{ => unit}/lib/click-track-test.js (100%) rename test/javascripts/{ => unit}/lib/computed-test.js (100%) rename test/javascripts/{ => unit}/lib/emoji-store-test.js (100%) rename test/javascripts/{ => unit}/lib/emoji-test.js (100%) rename test/javascripts/{ => unit}/lib/formatter-test.js (100%) rename test/javascripts/{ => unit}/lib/get-url-test.js (100%) rename test/javascripts/{ => unit}/lib/highlight-search-test.js.es6 (100%) rename test/javascripts/{ => unit}/lib/i18n-test.js (100%) rename test/javascripts/{ => unit}/lib/icon-library-test.js (100%) rename test/javascripts/{ => unit}/lib/key-value-store-test.js (100%) rename test/javascripts/{ => unit}/lib/link-mentions-test.js (100%) rename test/javascripts/{ => unit}/lib/load-script-test.js (100%) rename test/javascripts/{ => unit}/lib/oneboxer-test.js (100%) rename test/javascripts/{ => unit}/lib/preload-store-test.js (100%) rename test/javascripts/{ => unit}/lib/pretty-text-test.js (100%) rename test/javascripts/{ => unit}/lib/sanitizer-test.js (100%) rename test/javascripts/{ => unit}/lib/search-test.js (100%) rename test/javascripts/{ => unit}/lib/sharing-test.js (100%) rename test/javascripts/{ => unit}/lib/text-direction-test.js (100%) rename test/javascripts/{ => unit}/lib/to-markdown-test.js (100%) rename test/javascripts/{ => unit}/lib/upload-short-url-test.js (100%) rename test/javascripts/{ => unit}/lib/uploads-test.js (100%) rename test/javascripts/{ => unit}/lib/url-test.js (100%) rename test/javascripts/{ => unit}/lib/user-search-test.js (100%) rename test/javascripts/{ => unit}/lib/utilities-test.js (100%) rename test/javascripts/{ => unit}/lib/white-lister-test.js (100%) rename test/javascripts/{initializers => unit}/localization-test.js (100%) rename test/javascripts/{ => unit}/mixins/grant-badge-controller-test.js (100%) rename test/javascripts/{ => unit}/mixins/setting-object-test.js (100%) rename test/javascripts/{ => unit}/mixins/singleton-test.js (100%) rename test/javascripts/{ => unit}/models/badge-test.js (100%) rename test/javascripts/{ => unit}/models/category-test.js (100%) rename test/javascripts/{ => unit}/models/composer-test.js (100%) rename test/javascripts/{ => unit}/models/email-log-test.js (100%) rename test/javascripts/{ => unit}/models/group-test.js (100%) rename test/javascripts/{ => unit}/models/invite-test.js (100%) rename test/javascripts/{ => unit}/models/nav-item-test.js (100%) rename test/javascripts/{ => unit}/models/post-stream-test.js (100%) rename test/javascripts/{ => unit}/models/post-test.js (100%) rename test/javascripts/{ => unit}/models/report-test.js (100%) rename test/javascripts/{ => unit}/models/rest-model-test.js (100%) rename test/javascripts/{ => unit}/models/result-set-test.js (100%) rename test/javascripts/{ => unit}/models/session-test.js (100%) rename test/javascripts/{ => unit}/models/site-test.js (100%) rename test/javascripts/{ => unit}/models/staff-action-log-test.js (100%) rename test/javascripts/{ => unit}/models/store-test.js (100%) rename test/javascripts/{ => unit}/models/topic-details-test.js (100%) rename test/javascripts/{ => unit}/models/topic-test.js (100%) rename test/javascripts/{ => unit}/models/topic-tracking-state-test.js (100%) rename test/javascripts/{ => unit}/models/user-action-test.js (100%) rename test/javascripts/{ => unit}/models/user-badge-test.js (100%) rename test/javascripts/{ => unit}/models/user-drafts-test.js (100%) rename test/javascripts/{ => unit}/models/user-stream-test.js (100%) rename test/javascripts/{ => unit}/models/user-test.js (100%) rename test/javascripts/{ => unit}/services/document-title-test.js (100%) rename test/javascripts/{ => unit}/utils/decorators-test.js (100%) diff --git a/test/javascripts/admin/components/group-list-setting-test.js b/test/javascripts/admin/integration/components/group-list-setting-test.js similarity index 100% rename from test/javascripts/admin/components/group-list-setting-test.js rename to test/javascripts/admin/integration/components/group-list-setting-test.js diff --git a/test/javascripts/admin/components/themes-list-item-test.js b/test/javascripts/admin/integration/components/themes-list-item-test.js similarity index 100% rename from test/javascripts/admin/components/themes-list-item-test.js rename to test/javascripts/admin/integration/components/themes-list-item-test.js diff --git a/test/javascripts/admin/components/themes-list-test.js b/test/javascripts/admin/integration/components/themes-list-test.js similarity index 100% rename from test/javascripts/admin/components/themes-list-test.js rename to test/javascripts/admin/integration/components/themes-list-test.js diff --git a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js b/test/javascripts/admin/unit/controllers/admin-customize-themes-show-test.js similarity index 100% rename from test/javascripts/admin/controllers/admin-customize-themes-show-test.js rename to test/javascripts/admin/unit/controllers/admin-customize-themes-show-test.js diff --git a/test/javascripts/admin/controllers/admin-customize-themes-test.js b/test/javascripts/admin/unit/controllers/admin-customize-themes-test.js similarity index 100% rename from test/javascripts/admin/controllers/admin-customize-themes-test.js rename to test/javascripts/admin/unit/controllers/admin-customize-themes-test.js diff --git a/test/javascripts/admin/controllers/admin-user-badges-test.js b/test/javascripts/admin/unit/controllers/admin-user-badges-test.js similarity index 100% rename from test/javascripts/admin/controllers/admin-user-badges-test.js rename to test/javascripts/admin/unit/controllers/admin-user-badges-test.js diff --git a/test/javascripts/admin/models/theme-test.js b/test/javascripts/admin/unit/models/theme-test.js similarity index 100% rename from test/javascripts/admin/models/theme-test.js rename to test/javascripts/admin/unit/models/theme-test.js diff --git a/test/javascripts/components/ace-editor-test.js b/test/javascripts/integration/components/ace-editor-test.js similarity index 100% rename from test/javascripts/components/ace-editor-test.js rename to test/javascripts/integration/components/ace-editor-test.js diff --git a/test/javascripts/components/admin-report-test.js b/test/javascripts/integration/components/admin-report-test.js similarity index 100% rename from test/javascripts/components/admin-report-test.js rename to test/javascripts/integration/components/admin-report-test.js diff --git a/test/javascripts/components/badge-title-test.js b/test/javascripts/integration/components/badge-title-test.js similarity index 100% rename from test/javascripts/components/badge-title-test.js rename to test/javascripts/integration/components/badge-title-test.js diff --git a/test/javascripts/components/cook-text-test.js b/test/javascripts/integration/components/cook-text-test.js similarity index 100% rename from test/javascripts/components/cook-text-test.js rename to test/javascripts/integration/components/cook-text-test.js diff --git a/test/javascripts/components/d-button-test.js b/test/javascripts/integration/components/d-button-test.js similarity index 100% rename from test/javascripts/components/d-button-test.js rename to test/javascripts/integration/components/d-button-test.js diff --git a/test/javascripts/components/d-editor-test.js b/test/javascripts/integration/components/d-editor-test.js similarity index 100% rename from test/javascripts/components/d-editor-test.js rename to test/javascripts/integration/components/d-editor-test.js diff --git a/test/javascripts/components/d-icon-test.js b/test/javascripts/integration/components/d-icon-test.js similarity index 100% rename from test/javascripts/components/d-icon-test.js rename to test/javascripts/integration/components/d-icon-test.js diff --git a/test/javascripts/components/date-input-test.js b/test/javascripts/integration/components/date-input-test.js similarity index 100% rename from test/javascripts/components/date-input-test.js rename to test/javascripts/integration/components/date-input-test.js diff --git a/test/javascripts/components/date-time-input-range-test.js b/test/javascripts/integration/components/date-time-input-range-test.js similarity index 100% rename from test/javascripts/components/date-time-input-range-test.js rename to test/javascripts/integration/components/date-time-input-range-test.js diff --git a/test/javascripts/components/date-time-input-test.js b/test/javascripts/integration/components/date-time-input-test.js similarity index 100% rename from test/javascripts/components/date-time-input-test.js rename to test/javascripts/integration/components/date-time-input-test.js diff --git a/test/javascripts/components/group-membership-button-test.js b/test/javascripts/integration/components/group-membership-button-test.js similarity index 100% rename from test/javascripts/components/group-membership-button-test.js rename to test/javascripts/integration/components/group-membership-button-test.js diff --git a/test/javascripts/components/highlighted-code-test.js b/test/javascripts/integration/components/highlighted-code-test.js similarity index 100% rename from test/javascripts/components/highlighted-code-test.js rename to test/javascripts/integration/components/highlighted-code-test.js diff --git a/test/javascripts/components/html-safe-helper-test.js b/test/javascripts/integration/components/html-safe-helper-test.js similarity index 100% rename from test/javascripts/components/html-safe-helper-test.js rename to test/javascripts/integration/components/html-safe-helper-test.js diff --git a/test/javascripts/components/iframed-html-test.js b/test/javascripts/integration/components/iframed-html-test.js similarity index 100% rename from test/javascripts/components/iframed-html-test.js rename to test/javascripts/integration/components/iframed-html-test.js diff --git a/test/javascripts/components/image-uploader-test.js b/test/javascripts/integration/components/image-uploader-test.js similarity index 100% rename from test/javascripts/components/image-uploader-test.js rename to test/javascripts/integration/components/image-uploader-test.js diff --git a/test/javascripts/components/keyboard-shortcuts-test.js b/test/javascripts/integration/components/keyboard-shortcuts-test.js similarity index 100% rename from test/javascripts/components/keyboard-shortcuts-test.js rename to test/javascripts/integration/components/keyboard-shortcuts-test.js diff --git a/test/javascripts/components/load-more-test.js b/test/javascripts/integration/components/load-more-test.js similarity index 100% rename from test/javascripts/components/load-more-test.js rename to test/javascripts/integration/components/load-more-test.js diff --git a/test/javascripts/components/secret-value-list-test.js b/test/javascripts/integration/components/secret-value-list-test.js similarity index 100% rename from test/javascripts/components/secret-value-list-test.js rename to test/javascripts/integration/components/secret-value-list-test.js diff --git a/test/javascripts/components/select-kit/api-test.js b/test/javascripts/integration/components/select-kit/api-test.js similarity index 100% rename from test/javascripts/components/select-kit/api-test.js rename to test/javascripts/integration/components/select-kit/api-test.js diff --git a/test/javascripts/components/select-kit/category-chooser-test.js b/test/javascripts/integration/components/select-kit/category-chooser-test.js similarity index 100% rename from test/javascripts/components/select-kit/category-chooser-test.js rename to test/javascripts/integration/components/select-kit/category-chooser-test.js diff --git a/test/javascripts/components/select-kit/category-drop-test.js b/test/javascripts/integration/components/select-kit/category-drop-test.js similarity index 100% rename from test/javascripts/components/select-kit/category-drop-test.js rename to test/javascripts/integration/components/select-kit/category-drop-test.js diff --git a/test/javascripts/components/select-kit/combo-box-test.js b/test/javascripts/integration/components/select-kit/combo-box-test.js similarity index 100% rename from test/javascripts/components/select-kit/combo-box-test.js rename to test/javascripts/integration/components/select-kit/combo-box-test.js diff --git a/test/javascripts/components/select-kit/dropdown-select-box-test.js b/test/javascripts/integration/components/select-kit/dropdown-select-box-test.js similarity index 100% rename from test/javascripts/components/select-kit/dropdown-select-box-test.js rename to test/javascripts/integration/components/select-kit/dropdown-select-box-test.js diff --git a/test/javascripts/components/select-kit/list-setting-test.js b/test/javascripts/integration/components/select-kit/list-setting-test.js similarity index 100% rename from test/javascripts/components/select-kit/list-setting-test.js rename to test/javascripts/integration/components/select-kit/list-setting-test.js diff --git a/test/javascripts/components/select-kit/mini-tag-chooser-test.js b/test/javascripts/integration/components/select-kit/mini-tag-chooser-test.js similarity index 100% rename from test/javascripts/components/select-kit/mini-tag-chooser-test.js rename to test/javascripts/integration/components/select-kit/mini-tag-chooser-test.js diff --git a/test/javascripts/components/select-kit/multi-select-test.js b/test/javascripts/integration/components/select-kit/multi-select-test.js similarity index 100% rename from test/javascripts/components/select-kit/multi-select-test.js rename to test/javascripts/integration/components/select-kit/multi-select-test.js diff --git a/test/javascripts/components/select-kit/notifications-button-test.js b/test/javascripts/integration/components/select-kit/notifications-button-test.js similarity index 100% rename from test/javascripts/components/select-kit/notifications-button-test.js rename to test/javascripts/integration/components/select-kit/notifications-button-test.js diff --git a/test/javascripts/components/select-kit/pinned-options-test.js b/test/javascripts/integration/components/select-kit/pinned-options-test.js similarity index 100% rename from test/javascripts/components/select-kit/pinned-options-test.js rename to test/javascripts/integration/components/select-kit/pinned-options-test.js diff --git a/test/javascripts/components/select-kit/single-select-test.js b/test/javascripts/integration/components/select-kit/single-select-test.js similarity index 100% rename from test/javascripts/components/select-kit/single-select-test.js rename to test/javascripts/integration/components/select-kit/single-select-test.js diff --git a/test/javascripts/components/select-kit/tag-drop-test.js b/test/javascripts/integration/components/select-kit/tag-drop-test.js similarity index 100% rename from test/javascripts/components/select-kit/tag-drop-test.js rename to test/javascripts/integration/components/select-kit/tag-drop-test.js diff --git a/test/javascripts/components/select-kit/topic-notifications-button-test.js b/test/javascripts/integration/components/select-kit/topic-notifications-button-test.js similarity index 100% rename from test/javascripts/components/select-kit/topic-notifications-button-test.js rename to test/javascripts/integration/components/select-kit/topic-notifications-button-test.js diff --git a/test/javascripts/components/select-kit/topic-notifications-options-test.js b/test/javascripts/integration/components/select-kit/topic-notifications-options-test.js similarity index 100% rename from test/javascripts/components/select-kit/topic-notifications-options-test.js rename to test/javascripts/integration/components/select-kit/topic-notifications-options-test.js diff --git a/test/javascripts/components/select-kit/user-chooser-test.js b/test/javascripts/integration/components/select-kit/user-chooser-test.js similarity index 100% rename from test/javascripts/components/select-kit/user-chooser-test.js rename to test/javascripts/integration/components/select-kit/user-chooser-test.js diff --git a/test/javascripts/components/share-button-test.js b/test/javascripts/integration/components/share-button-test.js similarity index 100% rename from test/javascripts/components/share-button-test.js rename to test/javascripts/integration/components/share-button-test.js diff --git a/test/javascripts/components/share-button.js b/test/javascripts/integration/components/share-button.js similarity index 100% rename from test/javascripts/components/share-button.js rename to test/javascripts/integration/components/share-button.js diff --git a/test/javascripts/components/simple-list-test.js b/test/javascripts/integration/components/simple-list-test.js similarity index 100% rename from test/javascripts/components/simple-list-test.js rename to test/javascripts/integration/components/simple-list-test.js diff --git a/test/javascripts/components/text-field-test.js b/test/javascripts/integration/components/text-field-test.js similarity index 100% rename from test/javascripts/components/text-field-test.js rename to test/javascripts/integration/components/text-field-test.js diff --git a/test/javascripts/components/time-input-test.js b/test/javascripts/integration/components/time-input-test.js similarity index 100% rename from test/javascripts/components/time-input-test.js rename to test/javascripts/integration/components/time-input-test.js diff --git a/test/javascripts/components/user-selector-test.js b/test/javascripts/integration/components/user-selector-test.js similarity index 100% rename from test/javascripts/components/user-selector-test.js rename to test/javascripts/integration/components/user-selector-test.js diff --git a/test/javascripts/components/value-list-test.js b/test/javascripts/integration/components/value-list-test.js similarity index 100% rename from test/javascripts/components/value-list-test.js rename to test/javascripts/integration/components/value-list-test.js diff --git a/test/javascripts/widgets/actions-summary-test.js b/test/javascripts/integration/widgets/actions-summary-test.js similarity index 100% rename from test/javascripts/widgets/actions-summary-test.js rename to test/javascripts/integration/widgets/actions-summary-test.js diff --git a/test/javascripts/widgets/avatar-flair-test.js b/test/javascripts/integration/widgets/avatar-flair-test.js similarity index 100% rename from test/javascripts/widgets/avatar-flair-test.js rename to test/javascripts/integration/widgets/avatar-flair-test.js diff --git a/test/javascripts/widgets/button-test.js b/test/javascripts/integration/widgets/button-test.js similarity index 100% rename from test/javascripts/widgets/button-test.js rename to test/javascripts/integration/widgets/button-test.js diff --git a/test/javascripts/widgets/default-notification-item-test.js b/test/javascripts/integration/widgets/default-notification-item-test.js similarity index 100% rename from test/javascripts/widgets/default-notification-item-test.js rename to test/javascripts/integration/widgets/default-notification-item-test.js diff --git a/test/javascripts/widgets/hamburger-menu-test.js b/test/javascripts/integration/widgets/hamburger-menu-test.js similarity index 100% rename from test/javascripts/widgets/hamburger-menu-test.js rename to test/javascripts/integration/widgets/hamburger-menu-test.js diff --git a/test/javascripts/widgets/header-test.js b/test/javascripts/integration/widgets/header-test.js similarity index 100% rename from test/javascripts/widgets/header-test.js rename to test/javascripts/integration/widgets/header-test.js diff --git a/test/javascripts/widgets/home-logo-test.js b/test/javascripts/integration/widgets/home-logo-test.js similarity index 100% rename from test/javascripts/widgets/home-logo-test.js rename to test/javascripts/integration/widgets/home-logo-test.js diff --git a/test/javascripts/widgets/post-links-test.js b/test/javascripts/integration/widgets/post-links-test.js similarity index 100% rename from test/javascripts/widgets/post-links-test.js rename to test/javascripts/integration/widgets/post-links-test.js diff --git a/test/javascripts/widgets/post-menu-test.js b/test/javascripts/integration/widgets/post-menu-test.js similarity index 100% rename from test/javascripts/widgets/post-menu-test.js rename to test/javascripts/integration/widgets/post-menu-test.js diff --git a/test/javascripts/widgets/post-stream-test.js b/test/javascripts/integration/widgets/post-stream-test.js similarity index 100% rename from test/javascripts/widgets/post-stream-test.js rename to test/javascripts/integration/widgets/post-stream-test.js diff --git a/test/javascripts/widgets/post-test.js b/test/javascripts/integration/widgets/post-test.js similarity index 100% rename from test/javascripts/widgets/post-test.js rename to test/javascripts/integration/widgets/post-test.js diff --git a/test/javascripts/widgets/poster-name-test.js b/test/javascripts/integration/widgets/poster-name-test.js similarity index 100% rename from test/javascripts/widgets/poster-name-test.js rename to test/javascripts/integration/widgets/poster-name-test.js diff --git a/test/javascripts/widgets/quick-access-item-test.js b/test/javascripts/integration/widgets/quick-access-item-test.js similarity index 100% rename from test/javascripts/widgets/quick-access-item-test.js rename to test/javascripts/integration/widgets/quick-access-item-test.js diff --git a/test/javascripts/widgets/small-user-list-test.js b/test/javascripts/integration/widgets/small-user-list-test.js similarity index 100% rename from test/javascripts/widgets/small-user-list-test.js rename to test/javascripts/integration/widgets/small-user-list-test.js diff --git a/test/javascripts/widgets/topic-admin-menu-test.js b/test/javascripts/integration/widgets/topic-admin-menu-test.js similarity index 100% rename from test/javascripts/widgets/topic-admin-menu-test.js rename to test/javascripts/integration/widgets/topic-admin-menu-test.js diff --git a/test/javascripts/widgets/topic-participant-test.js b/test/javascripts/integration/widgets/topic-participant-test.js similarity index 100% rename from test/javascripts/widgets/topic-participant-test.js rename to test/javascripts/integration/widgets/topic-participant-test.js diff --git a/test/javascripts/widgets/topic-status-test.js b/test/javascripts/integration/widgets/topic-status-test.js similarity index 100% rename from test/javascripts/widgets/topic-status-test.js rename to test/javascripts/integration/widgets/topic-status-test.js diff --git a/test/javascripts/widgets/user-menu-test.js b/test/javascripts/integration/widgets/user-menu-test.js similarity index 100% rename from test/javascripts/widgets/user-menu-test.js rename to test/javascripts/integration/widgets/user-menu-test.js diff --git a/test/javascripts/widgets/widget-dropdown-test.js b/test/javascripts/integration/widgets/widget-dropdown-test.js similarity index 100% rename from test/javascripts/widgets/widget-dropdown-test.js rename to test/javascripts/integration/widgets/widget-dropdown-test.js diff --git a/test/javascripts/widgets/widget-test.js b/test/javascripts/integration/widgets/widget-test.js similarity index 100% rename from test/javascripts/widgets/widget-test.js rename to test/javascripts/integration/widgets/widget-test.js diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index 1a10683e56f..ef833ad84a7 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -15,7 +15,7 @@ //= require locales/en_US //= require discourse-loader -// Stuff we need to load first +// Our base application //= require vendor //= require discourse-shims //= require pretty-text-bundle @@ -28,15 +28,17 @@ //= require handlebars //= require ember-template-compiler +// Test helpers //= require sinon/pkg/sinon - -//= require helpers/assertions - +//= require_tree ./helpers //= require break_string -//= require helpers/qunit-helpers + +// Finally, the tests themselves //= require_tree ./fixtures -//= require_tree ./lib -//= require_tree . +//= require_tree ./acceptance +//= require_tree ./integration +//= require_tree ./unit +//= require_tree ./admin //= require plugin_tests //= require_self // @@ -55,7 +57,7 @@ sinon.config = { injectInto: null, properties: ["spy", "stub", "mock", "clock", "sandbox"], useFakeTimers: true, - useFakeServer: false + useFakeServer: false, }; let MessageBus = require("message-bus-client").default; @@ -110,13 +112,13 @@ function resetSite(siteSettings, extras) { return Site.resetCurrent(Site.create(siteAttrs)); } -QUnit.testStart(function(ctx) { +QUnit.testStart(function (ctx) { let settings = resetSettings(); server = createPretender.default; createPretender.applyDefaultHandlers(server); server.handlers = []; - server.prepareBody = function(body) { + server.prepareBody = function (body) { if (body && typeof body === "object") { return JSON.stringify(body); } @@ -124,12 +126,12 @@ QUnit.testStart(function(ctx) { }; if (QUnit.config.logAllRequests) { - server.handledRequest = function(verb, path, request) { + server.handledRequest = function (verb, path, request) { console.log("REQ: " + verb + " " + path); }; } - server.unhandledRequest = function(verb, path) { + server.unhandledRequest = function (verb, path) { if (QUnit.config.logAllRequests) { console.log("REQ: " + verb + " " + path + " missing"); } @@ -141,14 +143,14 @@ QUnit.testStart(function(ctx) { throw new Error(error); }; - server.checkPassthrough = request => + server.checkPassthrough = (request) => request.requestHeaders["Discourse-Script"]; if (ctx.module.startsWith(acceptanceModulePrefix)) { var helper = { parsePostData: createPretender.parsePostData, response: createPretender.response, - success: createPretender.success + success: createPretender.success, }; applyPretender( @@ -170,11 +172,11 @@ QUnit.testStart(function(ctx) { createHelperContext({ siteSettings: settings, capabilities: {}, - site + site, }); _DiscourseURL.redirectedTo = null; - _DiscourseURL.redirectTo = function(url) { + _DiscourseURL.redirectTo = function (url) { _DiscourseURL.redirectedTo = url; }; @@ -187,10 +189,10 @@ QUnit.testStart(function(ctx) { window.sandbox.stub(ScrollingDOMMethods, "unbindOnScroll"); // Unless we ever need to test this, let's leave it off. - $.fn.autocomplete = function() {}; + $.fn.autocomplete = function () {}; }); -QUnit.testDone(function() { +QUnit.testDone(function () { window.sandbox.restore(); // Destroy any modals @@ -224,7 +226,7 @@ var pluginPath = getUrlParameter("qunit_single_plugin") ? "/" + getUrlParameter("qunit_single_plugin") + "/" : "/plugins/"; -Object.keys(requirejs.entries).forEach(function(entry) { +Object.keys(requirejs.entries).forEach(function (entry) { var isTest = /\-test/.test(entry); var regex = new RegExp(pluginPath); var isPlugin = regex.test(entry); diff --git a/test/javascripts/controllers/avatar-selector-test.js b/test/javascripts/unit/controllers/avatar-selector-test.js similarity index 100% rename from test/javascripts/controllers/avatar-selector-test.js rename to test/javascripts/unit/controllers/avatar-selector-test.js diff --git a/test/javascripts/controllers/bookmark-test.js b/test/javascripts/unit/controllers/bookmark-test.js similarity index 100% rename from test/javascripts/controllers/bookmark-test.js rename to test/javascripts/unit/controllers/bookmark-test.js diff --git a/test/javascripts/controllers/create-account-test.js b/test/javascripts/unit/controllers/create-account-test.js similarity index 100% rename from test/javascripts/controllers/create-account-test.js rename to test/javascripts/unit/controllers/create-account-test.js diff --git a/test/javascripts/controllers/history-test.js b/test/javascripts/unit/controllers/history-test.js similarity index 100% rename from test/javascripts/controllers/history-test.js rename to test/javascripts/unit/controllers/history-test.js diff --git a/test/javascripts/controllers/preferences-account-test.js b/test/javascripts/unit/controllers/preferences-account-test.js similarity index 100% rename from test/javascripts/controllers/preferences-account-test.js rename to test/javascripts/unit/controllers/preferences-account-test.js diff --git a/test/javascripts/controllers/preferences-second-factor-test.js b/test/javascripts/unit/controllers/preferences-second-factor-test.js similarity index 100% rename from test/javascripts/controllers/preferences-second-factor-test.js rename to test/javascripts/unit/controllers/preferences-second-factor-test.js diff --git a/test/javascripts/controllers/reorder-categories-test.js b/test/javascripts/unit/controllers/reorder-categories-test.js similarity index 100% rename from test/javascripts/controllers/reorder-categories-test.js rename to test/javascripts/unit/controllers/reorder-categories-test.js diff --git a/test/javascripts/controllers/topic-test.js b/test/javascripts/unit/controllers/topic-test.js similarity index 100% rename from test/javascripts/controllers/topic-test.js rename to test/javascripts/unit/controllers/topic-test.js diff --git a/test/javascripts/ember/resolver-test.js b/test/javascripts/unit/ember/resolver-test.js similarity index 100% rename from test/javascripts/ember/resolver-test.js rename to test/javascripts/unit/ember/resolver-test.js diff --git a/test/javascripts/lib/bbcode-test.js b/test/javascripts/unit/lib/bbcode-test.js similarity index 100% rename from test/javascripts/lib/bbcode-test.js rename to test/javascripts/unit/lib/bbcode-test.js diff --git a/test/javascripts/lib/bookmark-test.js b/test/javascripts/unit/lib/bookmark-test.js similarity index 100% rename from test/javascripts/lib/bookmark-test.js rename to test/javascripts/unit/lib/bookmark-test.js diff --git a/test/javascripts/lib/break-string-test.js b/test/javascripts/unit/lib/break-string-test.js similarity index 100% rename from test/javascripts/lib/break-string-test.js rename to test/javascripts/unit/lib/break-string-test.js diff --git a/test/javascripts/lib/category-badge-test.js b/test/javascripts/unit/lib/category-badge-test.js similarity index 100% rename from test/javascripts/lib/category-badge-test.js rename to test/javascripts/unit/lib/category-badge-test.js diff --git a/test/javascripts/lib/click-track-edit-history-test.js b/test/javascripts/unit/lib/click-track-edit-history-test.js similarity index 100% rename from test/javascripts/lib/click-track-edit-history-test.js rename to test/javascripts/unit/lib/click-track-edit-history-test.js diff --git a/test/javascripts/lib/click-track-profile-page-test.js b/test/javascripts/unit/lib/click-track-profile-page-test.js similarity index 100% rename from test/javascripts/lib/click-track-profile-page-test.js rename to test/javascripts/unit/lib/click-track-profile-page-test.js diff --git a/test/javascripts/lib/click-track-test.js b/test/javascripts/unit/lib/click-track-test.js similarity index 100% rename from test/javascripts/lib/click-track-test.js rename to test/javascripts/unit/lib/click-track-test.js diff --git a/test/javascripts/lib/computed-test.js b/test/javascripts/unit/lib/computed-test.js similarity index 100% rename from test/javascripts/lib/computed-test.js rename to test/javascripts/unit/lib/computed-test.js diff --git a/test/javascripts/lib/emoji-store-test.js b/test/javascripts/unit/lib/emoji-store-test.js similarity index 100% rename from test/javascripts/lib/emoji-store-test.js rename to test/javascripts/unit/lib/emoji-store-test.js diff --git a/test/javascripts/lib/emoji-test.js b/test/javascripts/unit/lib/emoji-test.js similarity index 100% rename from test/javascripts/lib/emoji-test.js rename to test/javascripts/unit/lib/emoji-test.js diff --git a/test/javascripts/lib/formatter-test.js b/test/javascripts/unit/lib/formatter-test.js similarity index 100% rename from test/javascripts/lib/formatter-test.js rename to test/javascripts/unit/lib/formatter-test.js diff --git a/test/javascripts/lib/get-url-test.js b/test/javascripts/unit/lib/get-url-test.js similarity index 100% rename from test/javascripts/lib/get-url-test.js rename to test/javascripts/unit/lib/get-url-test.js diff --git a/test/javascripts/lib/highlight-search-test.js.es6 b/test/javascripts/unit/lib/highlight-search-test.js.es6 similarity index 100% rename from test/javascripts/lib/highlight-search-test.js.es6 rename to test/javascripts/unit/lib/highlight-search-test.js.es6 diff --git a/test/javascripts/lib/i18n-test.js b/test/javascripts/unit/lib/i18n-test.js similarity index 100% rename from test/javascripts/lib/i18n-test.js rename to test/javascripts/unit/lib/i18n-test.js diff --git a/test/javascripts/lib/icon-library-test.js b/test/javascripts/unit/lib/icon-library-test.js similarity index 100% rename from test/javascripts/lib/icon-library-test.js rename to test/javascripts/unit/lib/icon-library-test.js diff --git a/test/javascripts/lib/key-value-store-test.js b/test/javascripts/unit/lib/key-value-store-test.js similarity index 100% rename from test/javascripts/lib/key-value-store-test.js rename to test/javascripts/unit/lib/key-value-store-test.js diff --git a/test/javascripts/lib/link-mentions-test.js b/test/javascripts/unit/lib/link-mentions-test.js similarity index 100% rename from test/javascripts/lib/link-mentions-test.js rename to test/javascripts/unit/lib/link-mentions-test.js diff --git a/test/javascripts/lib/load-script-test.js b/test/javascripts/unit/lib/load-script-test.js similarity index 100% rename from test/javascripts/lib/load-script-test.js rename to test/javascripts/unit/lib/load-script-test.js diff --git a/test/javascripts/lib/oneboxer-test.js b/test/javascripts/unit/lib/oneboxer-test.js similarity index 100% rename from test/javascripts/lib/oneboxer-test.js rename to test/javascripts/unit/lib/oneboxer-test.js diff --git a/test/javascripts/lib/preload-store-test.js b/test/javascripts/unit/lib/preload-store-test.js similarity index 100% rename from test/javascripts/lib/preload-store-test.js rename to test/javascripts/unit/lib/preload-store-test.js diff --git a/test/javascripts/lib/pretty-text-test.js b/test/javascripts/unit/lib/pretty-text-test.js similarity index 100% rename from test/javascripts/lib/pretty-text-test.js rename to test/javascripts/unit/lib/pretty-text-test.js diff --git a/test/javascripts/lib/sanitizer-test.js b/test/javascripts/unit/lib/sanitizer-test.js similarity index 100% rename from test/javascripts/lib/sanitizer-test.js rename to test/javascripts/unit/lib/sanitizer-test.js diff --git a/test/javascripts/lib/search-test.js b/test/javascripts/unit/lib/search-test.js similarity index 100% rename from test/javascripts/lib/search-test.js rename to test/javascripts/unit/lib/search-test.js diff --git a/test/javascripts/lib/sharing-test.js b/test/javascripts/unit/lib/sharing-test.js similarity index 100% rename from test/javascripts/lib/sharing-test.js rename to test/javascripts/unit/lib/sharing-test.js diff --git a/test/javascripts/lib/text-direction-test.js b/test/javascripts/unit/lib/text-direction-test.js similarity index 100% rename from test/javascripts/lib/text-direction-test.js rename to test/javascripts/unit/lib/text-direction-test.js diff --git a/test/javascripts/lib/to-markdown-test.js b/test/javascripts/unit/lib/to-markdown-test.js similarity index 100% rename from test/javascripts/lib/to-markdown-test.js rename to test/javascripts/unit/lib/to-markdown-test.js diff --git a/test/javascripts/lib/upload-short-url-test.js b/test/javascripts/unit/lib/upload-short-url-test.js similarity index 100% rename from test/javascripts/lib/upload-short-url-test.js rename to test/javascripts/unit/lib/upload-short-url-test.js diff --git a/test/javascripts/lib/uploads-test.js b/test/javascripts/unit/lib/uploads-test.js similarity index 100% rename from test/javascripts/lib/uploads-test.js rename to test/javascripts/unit/lib/uploads-test.js diff --git a/test/javascripts/lib/url-test.js b/test/javascripts/unit/lib/url-test.js similarity index 100% rename from test/javascripts/lib/url-test.js rename to test/javascripts/unit/lib/url-test.js diff --git a/test/javascripts/lib/user-search-test.js b/test/javascripts/unit/lib/user-search-test.js similarity index 100% rename from test/javascripts/lib/user-search-test.js rename to test/javascripts/unit/lib/user-search-test.js diff --git a/test/javascripts/lib/utilities-test.js b/test/javascripts/unit/lib/utilities-test.js similarity index 100% rename from test/javascripts/lib/utilities-test.js rename to test/javascripts/unit/lib/utilities-test.js diff --git a/test/javascripts/lib/white-lister-test.js b/test/javascripts/unit/lib/white-lister-test.js similarity index 100% rename from test/javascripts/lib/white-lister-test.js rename to test/javascripts/unit/lib/white-lister-test.js diff --git a/test/javascripts/initializers/localization-test.js b/test/javascripts/unit/localization-test.js similarity index 100% rename from test/javascripts/initializers/localization-test.js rename to test/javascripts/unit/localization-test.js diff --git a/test/javascripts/mixins/grant-badge-controller-test.js b/test/javascripts/unit/mixins/grant-badge-controller-test.js similarity index 100% rename from test/javascripts/mixins/grant-badge-controller-test.js rename to test/javascripts/unit/mixins/grant-badge-controller-test.js diff --git a/test/javascripts/mixins/setting-object-test.js b/test/javascripts/unit/mixins/setting-object-test.js similarity index 100% rename from test/javascripts/mixins/setting-object-test.js rename to test/javascripts/unit/mixins/setting-object-test.js diff --git a/test/javascripts/mixins/singleton-test.js b/test/javascripts/unit/mixins/singleton-test.js similarity index 100% rename from test/javascripts/mixins/singleton-test.js rename to test/javascripts/unit/mixins/singleton-test.js diff --git a/test/javascripts/models/badge-test.js b/test/javascripts/unit/models/badge-test.js similarity index 100% rename from test/javascripts/models/badge-test.js rename to test/javascripts/unit/models/badge-test.js diff --git a/test/javascripts/models/category-test.js b/test/javascripts/unit/models/category-test.js similarity index 100% rename from test/javascripts/models/category-test.js rename to test/javascripts/unit/models/category-test.js diff --git a/test/javascripts/models/composer-test.js b/test/javascripts/unit/models/composer-test.js similarity index 100% rename from test/javascripts/models/composer-test.js rename to test/javascripts/unit/models/composer-test.js diff --git a/test/javascripts/models/email-log-test.js b/test/javascripts/unit/models/email-log-test.js similarity index 100% rename from test/javascripts/models/email-log-test.js rename to test/javascripts/unit/models/email-log-test.js diff --git a/test/javascripts/models/group-test.js b/test/javascripts/unit/models/group-test.js similarity index 100% rename from test/javascripts/models/group-test.js rename to test/javascripts/unit/models/group-test.js diff --git a/test/javascripts/models/invite-test.js b/test/javascripts/unit/models/invite-test.js similarity index 100% rename from test/javascripts/models/invite-test.js rename to test/javascripts/unit/models/invite-test.js diff --git a/test/javascripts/models/nav-item-test.js b/test/javascripts/unit/models/nav-item-test.js similarity index 100% rename from test/javascripts/models/nav-item-test.js rename to test/javascripts/unit/models/nav-item-test.js diff --git a/test/javascripts/models/post-stream-test.js b/test/javascripts/unit/models/post-stream-test.js similarity index 100% rename from test/javascripts/models/post-stream-test.js rename to test/javascripts/unit/models/post-stream-test.js diff --git a/test/javascripts/models/post-test.js b/test/javascripts/unit/models/post-test.js similarity index 100% rename from test/javascripts/models/post-test.js rename to test/javascripts/unit/models/post-test.js diff --git a/test/javascripts/models/report-test.js b/test/javascripts/unit/models/report-test.js similarity index 100% rename from test/javascripts/models/report-test.js rename to test/javascripts/unit/models/report-test.js diff --git a/test/javascripts/models/rest-model-test.js b/test/javascripts/unit/models/rest-model-test.js similarity index 100% rename from test/javascripts/models/rest-model-test.js rename to test/javascripts/unit/models/rest-model-test.js diff --git a/test/javascripts/models/result-set-test.js b/test/javascripts/unit/models/result-set-test.js similarity index 100% rename from test/javascripts/models/result-set-test.js rename to test/javascripts/unit/models/result-set-test.js diff --git a/test/javascripts/models/session-test.js b/test/javascripts/unit/models/session-test.js similarity index 100% rename from test/javascripts/models/session-test.js rename to test/javascripts/unit/models/session-test.js diff --git a/test/javascripts/models/site-test.js b/test/javascripts/unit/models/site-test.js similarity index 100% rename from test/javascripts/models/site-test.js rename to test/javascripts/unit/models/site-test.js diff --git a/test/javascripts/models/staff-action-log-test.js b/test/javascripts/unit/models/staff-action-log-test.js similarity index 100% rename from test/javascripts/models/staff-action-log-test.js rename to test/javascripts/unit/models/staff-action-log-test.js diff --git a/test/javascripts/models/store-test.js b/test/javascripts/unit/models/store-test.js similarity index 100% rename from test/javascripts/models/store-test.js rename to test/javascripts/unit/models/store-test.js diff --git a/test/javascripts/models/topic-details-test.js b/test/javascripts/unit/models/topic-details-test.js similarity index 100% rename from test/javascripts/models/topic-details-test.js rename to test/javascripts/unit/models/topic-details-test.js diff --git a/test/javascripts/models/topic-test.js b/test/javascripts/unit/models/topic-test.js similarity index 100% rename from test/javascripts/models/topic-test.js rename to test/javascripts/unit/models/topic-test.js diff --git a/test/javascripts/models/topic-tracking-state-test.js b/test/javascripts/unit/models/topic-tracking-state-test.js similarity index 100% rename from test/javascripts/models/topic-tracking-state-test.js rename to test/javascripts/unit/models/topic-tracking-state-test.js diff --git a/test/javascripts/models/user-action-test.js b/test/javascripts/unit/models/user-action-test.js similarity index 100% rename from test/javascripts/models/user-action-test.js rename to test/javascripts/unit/models/user-action-test.js diff --git a/test/javascripts/models/user-badge-test.js b/test/javascripts/unit/models/user-badge-test.js similarity index 100% rename from test/javascripts/models/user-badge-test.js rename to test/javascripts/unit/models/user-badge-test.js diff --git a/test/javascripts/models/user-drafts-test.js b/test/javascripts/unit/models/user-drafts-test.js similarity index 100% rename from test/javascripts/models/user-drafts-test.js rename to test/javascripts/unit/models/user-drafts-test.js diff --git a/test/javascripts/models/user-stream-test.js b/test/javascripts/unit/models/user-stream-test.js similarity index 100% rename from test/javascripts/models/user-stream-test.js rename to test/javascripts/unit/models/user-stream-test.js diff --git a/test/javascripts/models/user-test.js b/test/javascripts/unit/models/user-test.js similarity index 100% rename from test/javascripts/models/user-test.js rename to test/javascripts/unit/models/user-test.js diff --git a/test/javascripts/services/document-title-test.js b/test/javascripts/unit/services/document-title-test.js similarity index 100% rename from test/javascripts/services/document-title-test.js rename to test/javascripts/unit/services/document-title-test.js diff --git a/test/javascripts/utils/decorators-test.js b/test/javascripts/unit/utils/decorators-test.js similarity index 100% rename from test/javascripts/utils/decorators-test.js rename to test/javascripts/unit/utils/decorators-test.js