diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb index bbadfa84afa..4060b162250 100644 --- a/lib/discourse_js_processor.rb +++ b/lib/discourse_js_processor.rb @@ -36,24 +36,27 @@ class DiscourseJsProcessor return false unless filename.end_with?(".js") || filename.end_with?(".js.erb") relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '') - relative_path.start_with?("app/assets/javascripts/discourse/") || - relative_path.start_with?("app/assets/javascripts/admin/") || - relative_path.start_with?("app/assets/javascripts/pretty-text/") || - relative_path.start_with?("app/assets/javascripts/select-kit/") || - relative_path.start_with?("app/assets/javascripts/wizard/") || - relative_path.start_with?("app/assets/javascripts/discourse-common/") || - relative_path.start_with?("app/assets/javascripts/ember-addons/") || - relative_path.start_with?("app/assets/javascripts/confirm-new-email/") || - relative_path == "app/assets/javascripts/preload-store.js" || - relative_path == "app/assets/javascripts/preload-application-data.js" || - relative_path == "app/assets/javascripts/wizard-start.js" || - relative_path == "app/assets/javascripts/onpopstate-handler.js" || - relative_path == "app/assets/javascripts/discourse.js" || - relative_path == "app/assets/javascripts/google-tag-manager.js" || - relative_path == "app/assets/javascripts/google-universal-analytics.js" || - relative_path == "app/assets/javascripts/activate-account.js" || - relative_path == "app/assets/javascripts/auto-redirect.js" || - relative_path == "app/assets/javascripts/embed-application.js" + + js_root = "app/assets/javascripts" + test_root = "test/javascripts" + + return false if relative_path.start_with?("#{js_root}/locales/") + + return true if %w( + preload-store + preload-application-data + wizard-start + onpopstate-handler + discourse + google-tag-manager + google-universal-analytics.js + activate-account.js + auto-redirect.js + embed-application + ).any? { |f| relative_path == "#{js_root}/#{f}.js" } + + relative_path =~ /^#{js_root}\/[^\/]+\// || + relative_path =~ /^#{test_root}\/[^\/]+\// end def self.skip_module?(data) diff --git a/test/javascripts/acceptance/about-test.js.es6 b/test/javascripts/acceptance/about-test.js similarity index 100% rename from test/javascripts/acceptance/about-test.js.es6 rename to test/javascripts/acceptance/about-test.js diff --git a/test/javascripts/acceptance/account-created-test.js.es6 b/test/javascripts/acceptance/account-created-test.js similarity index 100% rename from test/javascripts/acceptance/account-created-test.js.es6 rename to test/javascripts/acceptance/account-created-test.js diff --git a/test/javascripts/acceptance/admin-emails-test.js.es6 b/test/javascripts/acceptance/admin-emails-test.js similarity index 100% rename from test/javascripts/acceptance/admin-emails-test.js.es6 rename to test/javascripts/acceptance/admin-emails-test.js diff --git a/test/javascripts/acceptance/admin-search-log-term-test.js.es6 b/test/javascripts/acceptance/admin-search-log-term-test.js similarity index 100% rename from test/javascripts/acceptance/admin-search-log-term-test.js.es6 rename to test/javascripts/acceptance/admin-search-log-term-test.js diff --git a/test/javascripts/acceptance/admin-search-logs-test.js.es6 b/test/javascripts/acceptance/admin-search-logs-test.js similarity index 100% rename from test/javascripts/acceptance/admin-search-logs-test.js.es6 rename to test/javascripts/acceptance/admin-search-logs-test.js diff --git a/test/javascripts/acceptance/admin-site-settings-test.js.es6 b/test/javascripts/acceptance/admin-site-settings-test.js similarity index 100% rename from test/javascripts/acceptance/admin-site-settings-test.js.es6 rename to test/javascripts/acceptance/admin-site-settings-test.js diff --git a/test/javascripts/acceptance/admin-site-text-test.js.es6 b/test/javascripts/acceptance/admin-site-text-test.js similarity index 100% rename from test/javascripts/acceptance/admin-site-text-test.js.es6 rename to test/javascripts/acceptance/admin-site-text-test.js diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js similarity index 100% rename from test/javascripts/acceptance/admin-suspend-user-test.js.es6 rename to test/javascripts/acceptance/admin-suspend-user-test.js diff --git a/test/javascripts/acceptance/admin-user-badges-test.js.es6 b/test/javascripts/acceptance/admin-user-badges-test.js similarity index 100% rename from test/javascripts/acceptance/admin-user-badges-test.js.es6 rename to test/javascripts/acceptance/admin-user-badges-test.js diff --git a/test/javascripts/acceptance/admin-user-emails-test.js.es6 b/test/javascripts/acceptance/admin-user-emails-test.js similarity index 100% rename from test/javascripts/acceptance/admin-user-emails-test.js.es6 rename to test/javascripts/acceptance/admin-user-emails-test.js diff --git a/test/javascripts/acceptance/admin-user-index-test.js.es6 b/test/javascripts/acceptance/admin-user-index-test.js similarity index 100% rename from test/javascripts/acceptance/admin-user-index-test.js.es6 rename to test/javascripts/acceptance/admin-user-index-test.js diff --git a/test/javascripts/acceptance/admin-users-list-test.js.es6 b/test/javascripts/acceptance/admin-users-list-test.js similarity index 100% rename from test/javascripts/acceptance/admin-users-list-test.js.es6 rename to test/javascripts/acceptance/admin-users-list-test.js diff --git a/test/javascripts/acceptance/admin-watched-words-test.js.es6 b/test/javascripts/acceptance/admin-watched-words-test.js similarity index 100% rename from test/javascripts/acceptance/admin-watched-words-test.js.es6 rename to test/javascripts/acceptance/admin-watched-words-test.js diff --git a/test/javascripts/acceptance/auth-complete-test.js.es6 b/test/javascripts/acceptance/auth-complete-test.js similarity index 100% rename from test/javascripts/acceptance/auth-complete-test.js.es6 rename to test/javascripts/acceptance/auth-complete-test.js diff --git a/test/javascripts/acceptance/badges-test.js.es6 b/test/javascripts/acceptance/badges-test.js similarity index 100% rename from test/javascripts/acceptance/badges-test.js.es6 rename to test/javascripts/acceptance/badges-test.js diff --git a/test/javascripts/acceptance/category-chooser-test.js.es6 b/test/javascripts/acceptance/category-chooser-test.js similarity index 100% rename from test/javascripts/acceptance/category-chooser-test.js.es6 rename to test/javascripts/acceptance/category-chooser-test.js diff --git a/test/javascripts/acceptance/category-edit-security-test.js.es6 b/test/javascripts/acceptance/category-edit-security-test.js similarity index 100% rename from test/javascripts/acceptance/category-edit-security-test.js.es6 rename to test/javascripts/acceptance/category-edit-security-test.js diff --git a/test/javascripts/acceptance/category-edit-test.js.es6 b/test/javascripts/acceptance/category-edit-test.js similarity index 100% rename from test/javascripts/acceptance/category-edit-test.js.es6 rename to test/javascripts/acceptance/category-edit-test.js diff --git a/test/javascripts/acceptance/category-hashtag-test.js.es6 b/test/javascripts/acceptance/category-hashtag-test.js similarity index 100% rename from test/javascripts/acceptance/category-hashtag-test.js.es6 rename to test/javascripts/acceptance/category-hashtag-test.js diff --git a/test/javascripts/acceptance/click-track-test.js.es6 b/test/javascripts/acceptance/click-track-test.js similarity index 100% rename from test/javascripts/acceptance/click-track-test.js.es6 rename to test/javascripts/acceptance/click-track-test.js diff --git a/test/javascripts/acceptance/composer-actions-test.js.es6 b/test/javascripts/acceptance/composer-actions-test.js similarity index 100% rename from test/javascripts/acceptance/composer-actions-test.js.es6 rename to test/javascripts/acceptance/composer-actions-test.js diff --git a/test/javascripts/acceptance/composer-attachment-test.js.es6 b/test/javascripts/acceptance/composer-attachment-test.js similarity index 100% rename from test/javascripts/acceptance/composer-attachment-test.js.es6 rename to test/javascripts/acceptance/composer-attachment-test.js diff --git a/test/javascripts/acceptance/composer-edit-conflict-test.js.es6 b/test/javascripts/acceptance/composer-edit-conflict-test.js similarity index 100% rename from test/javascripts/acceptance/composer-edit-conflict-test.js.es6 rename to test/javascripts/acceptance/composer-edit-conflict-test.js diff --git a/test/javascripts/acceptance/composer-hyperlink-test.js.es6 b/test/javascripts/acceptance/composer-hyperlink-test.js similarity index 100% rename from test/javascripts/acceptance/composer-hyperlink-test.js.es6 rename to test/javascripts/acceptance/composer-hyperlink-test.js diff --git a/test/javascripts/acceptance/composer-onebox-test.js.es6 b/test/javascripts/acceptance/composer-onebox-test.js similarity index 100% rename from test/javascripts/acceptance/composer-onebox-test.js.es6 rename to test/javascripts/acceptance/composer-onebox-test.js diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js similarity index 100% rename from test/javascripts/acceptance/composer-test.js.es6 rename to test/javascripts/acceptance/composer-test.js diff --git a/test/javascripts/acceptance/composer-topic-links-test.js.es6 b/test/javascripts/acceptance/composer-topic-links-test.js similarity index 100% rename from test/javascripts/acceptance/composer-topic-links-test.js.es6 rename to test/javascripts/acceptance/composer-topic-links-test.js diff --git a/test/javascripts/acceptance/composer-uncategorized-test.js.es6 b/test/javascripts/acceptance/composer-uncategorized-test.js similarity index 100% rename from test/javascripts/acceptance/composer-uncategorized-test.js.es6 rename to test/javascripts/acceptance/composer-uncategorized-test.js diff --git a/test/javascripts/acceptance/create-account-user-fields-test.js.es6 b/test/javascripts/acceptance/create-account-user-fields-test.js similarity index 100% rename from test/javascripts/acceptance/create-account-user-fields-test.js.es6 rename to test/javascripts/acceptance/create-account-user-fields-test.js diff --git a/test/javascripts/acceptance/custom-html-set-test.js.es6 b/test/javascripts/acceptance/custom-html-set-test.js similarity index 100% rename from test/javascripts/acceptance/custom-html-set-test.js.es6 rename to test/javascripts/acceptance/custom-html-set-test.js diff --git a/test/javascripts/acceptance/custom-html-template-test.js.es6 b/test/javascripts/acceptance/custom-html-template-test.js similarity index 100% rename from test/javascripts/acceptance/custom-html-template-test.js.es6 rename to test/javascripts/acceptance/custom-html-template-test.js diff --git a/test/javascripts/acceptance/dashboard-test.js.es6 b/test/javascripts/acceptance/dashboard-test.js similarity index 100% rename from test/javascripts/acceptance/dashboard-test.js.es6 rename to test/javascripts/acceptance/dashboard-test.js diff --git a/test/javascripts/acceptance/email-notice-test.js.es6 b/test/javascripts/acceptance/email-notice-test.js similarity index 100% rename from test/javascripts/acceptance/email-notice-test.js.es6 rename to test/javascripts/acceptance/email-notice-test.js diff --git a/test/javascripts/acceptance/emoji-picker-test.js.es6 b/test/javascripts/acceptance/emoji-picker-test.js similarity index 100% rename from test/javascripts/acceptance/emoji-picker-test.js.es6 rename to test/javascripts/acceptance/emoji-picker-test.js diff --git a/test/javascripts/acceptance/emoji-test.js.es6 b/test/javascripts/acceptance/emoji-test.js similarity index 100% rename from test/javascripts/acceptance/emoji-test.js.es6 rename to test/javascripts/acceptance/emoji-test.js diff --git a/test/javascripts/acceptance/enforce-second-factor-test.js.es6 b/test/javascripts/acceptance/enforce-second-factor-test.js similarity index 100% rename from test/javascripts/acceptance/enforce-second-factor-test.js.es6 rename to test/javascripts/acceptance/enforce-second-factor-test.js diff --git a/test/javascripts/acceptance/forgot-password-test.js.es6 b/test/javascripts/acceptance/forgot-password-test.js similarity index 100% rename from test/javascripts/acceptance/forgot-password-test.js.es6 rename to test/javascripts/acceptance/forgot-password-test.js diff --git a/test/javascripts/acceptance/group-card-mobile-test.js.es6 b/test/javascripts/acceptance/group-card-mobile-test.js similarity index 100% rename from test/javascripts/acceptance/group-card-mobile-test.js.es6 rename to test/javascripts/acceptance/group-card-mobile-test.js diff --git a/test/javascripts/acceptance/group-card-test.js.es6 b/test/javascripts/acceptance/group-card-test.js similarity index 100% rename from test/javascripts/acceptance/group-card-test.js.es6 rename to test/javascripts/acceptance/group-card-test.js diff --git a/test/javascripts/acceptance/group-index-test.js.es6 b/test/javascripts/acceptance/group-index-test.js similarity index 100% rename from test/javascripts/acceptance/group-index-test.js.es6 rename to test/javascripts/acceptance/group-index-test.js diff --git a/test/javascripts/acceptance/group-manage-interaction-test.js.es6 b/test/javascripts/acceptance/group-manage-interaction-test.js similarity index 100% rename from test/javascripts/acceptance/group-manage-interaction-test.js.es6 rename to test/javascripts/acceptance/group-manage-interaction-test.js diff --git a/test/javascripts/acceptance/group-manage-logs-test.js.es6 b/test/javascripts/acceptance/group-manage-logs-test.js similarity index 100% rename from test/javascripts/acceptance/group-manage-logs-test.js.es6 rename to test/javascripts/acceptance/group-manage-logs-test.js diff --git a/test/javascripts/acceptance/group-manage-membership-test.js.es6 b/test/javascripts/acceptance/group-manage-membership-test.js similarity index 100% rename from test/javascripts/acceptance/group-manage-membership-test.js.es6 rename to test/javascripts/acceptance/group-manage-membership-test.js diff --git a/test/javascripts/acceptance/group-manage-profile-test.js.es6 b/test/javascripts/acceptance/group-manage-profile-test.js similarity index 100% rename from test/javascripts/acceptance/group-manage-profile-test.js.es6 rename to test/javascripts/acceptance/group-manage-profile-test.js diff --git a/test/javascripts/acceptance/group-requests-test.js.es6 b/test/javascripts/acceptance/group-requests-test.js similarity index 100% rename from test/javascripts/acceptance/group-requests-test.js.es6 rename to test/javascripts/acceptance/group-requests-test.js diff --git a/test/javascripts/acceptance/group-test.js.es6 b/test/javascripts/acceptance/group-test.js similarity index 100% rename from test/javascripts/acceptance/group-test.js.es6 rename to test/javascripts/acceptance/group-test.js diff --git a/test/javascripts/acceptance/groups-index-test.js.es6 b/test/javascripts/acceptance/groups-index-test.js similarity index 100% rename from test/javascripts/acceptance/groups-index-test.js.es6 rename to test/javascripts/acceptance/groups-index-test.js diff --git a/test/javascripts/acceptance/groups-new-test.js.es6 b/test/javascripts/acceptance/groups-new-test.js similarity index 100% rename from test/javascripts/acceptance/groups-new-test.js.es6 rename to test/javascripts/acceptance/groups-new-test.js diff --git a/test/javascripts/acceptance/invite-accept-test.js.es6 b/test/javascripts/acceptance/invite-accept-test.js similarity index 100% rename from test/javascripts/acceptance/invite-accept-test.js.es6 rename to test/javascripts/acceptance/invite-accept-test.js diff --git a/test/javascripts/acceptance/invite-show-user-fields-test.js.es6 b/test/javascripts/acceptance/invite-show-user-fields-test.js similarity index 100% rename from test/javascripts/acceptance/invite-show-user-fields-test.js.es6 rename to test/javascripts/acceptance/invite-show-user-fields-test.js diff --git a/test/javascripts/acceptance/jump-to-test.js.es6 b/test/javascripts/acceptance/jump-to-test.js similarity index 100% rename from test/javascripts/acceptance/jump-to-test.js.es6 rename to test/javascripts/acceptance/jump-to-test.js diff --git a/test/javascripts/acceptance/keyboard-shortcuts-test.js.es6 b/test/javascripts/acceptance/keyboard-shortcuts-test.js similarity index 100% rename from test/javascripts/acceptance/keyboard-shortcuts-test.js.es6 rename to test/javascripts/acceptance/keyboard-shortcuts-test.js diff --git a/test/javascripts/acceptance/login-redirect-test.js.es6 b/test/javascripts/acceptance/login-redirect-test.js similarity index 100% rename from test/javascripts/acceptance/login-redirect-test.js.es6 rename to test/javascripts/acceptance/login-redirect-test.js diff --git a/test/javascripts/acceptance/login-required-test.js.es6 b/test/javascripts/acceptance/login-required-test.js similarity index 100% rename from test/javascripts/acceptance/login-required-test.js.es6 rename to test/javascripts/acceptance/login-required-test.js diff --git a/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6 b/test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js similarity index 100% rename from test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js.es6 rename to test/javascripts/acceptance/login-with-email-and-hide-email-address-taken-test.js diff --git a/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6 b/test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js similarity index 100% rename from test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js.es6 rename to test/javascripts/acceptance/login-with-email-and-no-social-logins-test.js diff --git a/test/javascripts/acceptance/login-with-email-disabled-test.js.es6 b/test/javascripts/acceptance/login-with-email-disabled-test.js similarity index 100% rename from test/javascripts/acceptance/login-with-email-disabled-test.js.es6 rename to test/javascripts/acceptance/login-with-email-disabled-test.js diff --git a/test/javascripts/acceptance/login-with-email-test.js.es6 b/test/javascripts/acceptance/login-with-email-test.js similarity index 100% rename from test/javascripts/acceptance/login-with-email-test.js.es6 rename to test/javascripts/acceptance/login-with-email-test.js diff --git a/test/javascripts/acceptance/mobile-discovery-test.js.es6 b/test/javascripts/acceptance/mobile-discovery-test.js similarity index 100% rename from test/javascripts/acceptance/mobile-discovery-test.js.es6 rename to test/javascripts/acceptance/mobile-discovery-test.js diff --git a/test/javascripts/acceptance/mobile-sign-in-test.js.es6 b/test/javascripts/acceptance/mobile-sign-in-test.js similarity index 100% rename from test/javascripts/acceptance/mobile-sign-in-test.js.es6 rename to test/javascripts/acceptance/mobile-sign-in-test.js diff --git a/test/javascripts/acceptance/mobile-users-test.js.es6 b/test/javascripts/acceptance/mobile-users-test.js similarity index 100% rename from test/javascripts/acceptance/mobile-users-test.js.es6 rename to test/javascripts/acceptance/mobile-users-test.js diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js similarity index 100% rename from test/javascripts/acceptance/modal-test.js.es6 rename to test/javascripts/acceptance/modal-test.js diff --git a/test/javascripts/acceptance/new-message-test.js.es6 b/test/javascripts/acceptance/new-message-test.js similarity index 100% rename from test/javascripts/acceptance/new-message-test.js.es6 rename to test/javascripts/acceptance/new-message-test.js diff --git a/test/javascripts/acceptance/new-topic-test.js.es6 b/test/javascripts/acceptance/new-topic-test.js similarity index 100% rename from test/javascripts/acceptance/new-topic-test.js.es6 rename to test/javascripts/acceptance/new-topic-test.js diff --git a/test/javascripts/acceptance/password-reset-test.js.es6 b/test/javascripts/acceptance/password-reset-test.js similarity index 100% rename from test/javascripts/acceptance/password-reset-test.js.es6 rename to test/javascripts/acceptance/password-reset-test.js diff --git a/test/javascripts/acceptance/personal-message-test.js.es6 b/test/javascripts/acceptance/personal-message-test.js similarity index 100% rename from test/javascripts/acceptance/personal-message-test.js.es6 rename to test/javascripts/acceptance/personal-message-test.js diff --git a/test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-connector-class-test.js similarity index 100% rename from test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6 rename to test/javascripts/acceptance/plugin-outlet-connector-class-test.js diff --git a/test/javascripts/acceptance/plugin-outlet-decorator-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-decorator-test.js similarity index 100% rename from test/javascripts/acceptance/plugin-outlet-decorator-test.js.es6 rename to test/javascripts/acceptance/plugin-outlet-decorator-test.js diff --git a/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-multi-template-test.js similarity index 100% rename from test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 rename to test/javascripts/acceptance/plugin-outlet-multi-template-test.js diff --git a/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-single-template-test.js similarity index 100% rename from test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 rename to test/javascripts/acceptance/plugin-outlet-single-template-test.js diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js similarity index 100% rename from test/javascripts/acceptance/preferences-test.js.es6 rename to test/javascripts/acceptance/preferences-test.js diff --git a/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6 b/test/javascripts/acceptance/raw-plugin-outlet-test.js similarity index 100% rename from test/javascripts/acceptance/raw-plugin-outlet-test.js.es6 rename to test/javascripts/acceptance/raw-plugin-outlet-test.js diff --git a/test/javascripts/acceptance/redirect-to-top-test.js.es6 b/test/javascripts/acceptance/redirect-to-top-test.js similarity index 100% rename from test/javascripts/acceptance/redirect-to-top-test.js.es6 rename to test/javascripts/acceptance/redirect-to-top-test.js diff --git a/test/javascripts/acceptance/reports-test.js.es6 b/test/javascripts/acceptance/reports-test.js similarity index 100% rename from test/javascripts/acceptance/reports-test.js.es6 rename to test/javascripts/acceptance/reports-test.js diff --git a/test/javascripts/acceptance/review-test.js.es6 b/test/javascripts/acceptance/review-test.js similarity index 100% rename from test/javascripts/acceptance/review-test.js.es6 rename to test/javascripts/acceptance/review-test.js diff --git a/test/javascripts/acceptance/search-full-test.js.es6 b/test/javascripts/acceptance/search-full-test.js similarity index 100% rename from test/javascripts/acceptance/search-full-test.js.es6 rename to test/javascripts/acceptance/search-full-test.js diff --git a/test/javascripts/acceptance/search-mobile-test.js.es6 b/test/javascripts/acceptance/search-mobile-test.js similarity index 100% rename from test/javascripts/acceptance/search-mobile-test.js.es6 rename to test/javascripts/acceptance/search-mobile-test.js diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js similarity index 100% rename from test/javascripts/acceptance/search-test.js.es6 rename to test/javascripts/acceptance/search-test.js diff --git a/test/javascripts/acceptance/share-and-invite-desktop-test.js.es6 b/test/javascripts/acceptance/share-and-invite-desktop-test.js similarity index 100% rename from test/javascripts/acceptance/share-and-invite-desktop-test.js.es6 rename to test/javascripts/acceptance/share-and-invite-desktop-test.js diff --git a/test/javascripts/acceptance/share-and-invite-mobile-test.js.es6 b/test/javascripts/acceptance/share-and-invite-mobile-test.js similarity index 100% rename from test/javascripts/acceptance/share-and-invite-mobile-test.js.es6 rename to test/javascripts/acceptance/share-and-invite-mobile-test.js diff --git a/test/javascripts/acceptance/shared-drafts-test.js.es6 b/test/javascripts/acceptance/shared-drafts-test.js similarity index 100% rename from test/javascripts/acceptance/shared-drafts-test.js.es6 rename to test/javascripts/acceptance/shared-drafts-test.js diff --git a/test/javascripts/acceptance/sign-in-test.js.es6 b/test/javascripts/acceptance/sign-in-test.js similarity index 100% rename from test/javascripts/acceptance/sign-in-test.js.es6 rename to test/javascripts/acceptance/sign-in-test.js diff --git a/test/javascripts/acceptance/static-test.js.es6 b/test/javascripts/acceptance/static-test.js similarity index 100% rename from test/javascripts/acceptance/static-test.js.es6 rename to test/javascripts/acceptance/static-test.js diff --git a/test/javascripts/acceptance/tag-groups-test.js.es6 b/test/javascripts/acceptance/tag-groups-test.js similarity index 100% rename from test/javascripts/acceptance/tag-groups-test.js.es6 rename to test/javascripts/acceptance/tag-groups-test.js diff --git a/test/javascripts/acceptance/tag-hashtag-test.js.es6 b/test/javascripts/acceptance/tag-hashtag-test.js similarity index 100% rename from test/javascripts/acceptance/tag-hashtag-test.js.es6 rename to test/javascripts/acceptance/tag-hashtag-test.js diff --git a/test/javascripts/acceptance/tags-intersection-test.js.es6 b/test/javascripts/acceptance/tags-intersection-test.js similarity index 100% rename from test/javascripts/acceptance/tags-intersection-test.js.es6 rename to test/javascripts/acceptance/tags-intersection-test.js diff --git a/test/javascripts/acceptance/tags-test.js.es6 b/test/javascripts/acceptance/tags-test.js similarity index 100% rename from test/javascripts/acceptance/tags-test.js.es6 rename to test/javascripts/acceptance/tags-test.js diff --git a/test/javascripts/acceptance/topic-anonymous-test.js.es6 b/test/javascripts/acceptance/topic-anonymous-test.js similarity index 100% rename from test/javascripts/acceptance/topic-anonymous-test.js.es6 rename to test/javascripts/acceptance/topic-anonymous-test.js diff --git a/test/javascripts/acceptance/topic-discovery-test.js.es6 b/test/javascripts/acceptance/topic-discovery-test.js similarity index 100% rename from test/javascripts/acceptance/topic-discovery-test.js.es6 rename to test/javascripts/acceptance/topic-discovery-test.js diff --git a/test/javascripts/acceptance/topic-edit-timer-test.js.es6 b/test/javascripts/acceptance/topic-edit-timer-test.js similarity index 100% rename from test/javascripts/acceptance/topic-edit-timer-test.js.es6 rename to test/javascripts/acceptance/topic-edit-timer-test.js diff --git a/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js.es6 b/test/javascripts/acceptance/topic-footer-buttons-mobile-test.js similarity index 100% rename from test/javascripts/acceptance/topic-footer-buttons-mobile-test.js.es6 rename to test/javascripts/acceptance/topic-footer-buttons-mobile-test.js diff --git a/test/javascripts/acceptance/topic-move-posts-test.js.es6 b/test/javascripts/acceptance/topic-move-posts-test.js similarity index 100% rename from test/javascripts/acceptance/topic-move-posts-test.js.es6 rename to test/javascripts/acceptance/topic-move-posts-test.js diff --git a/test/javascripts/acceptance/topic-notifications-button-test.js.es6 b/test/javascripts/acceptance/topic-notifications-button-test.js similarity index 100% rename from test/javascripts/acceptance/topic-notifications-button-test.js.es6 rename to test/javascripts/acceptance/topic-notifications-button-test.js diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js similarity index 100% rename from test/javascripts/acceptance/topic-test.js.es6 rename to test/javascripts/acceptance/topic-test.js diff --git a/test/javascripts/acceptance/unknown-test.js.es6 b/test/javascripts/acceptance/unknown-test.js similarity index 100% rename from test/javascripts/acceptance/unknown-test.js.es6 rename to test/javascripts/acceptance/unknown-test.js diff --git a/test/javascripts/acceptance/user-anonymous-test.js.es6 b/test/javascripts/acceptance/user-anonymous-test.js similarity index 100% rename from test/javascripts/acceptance/user-anonymous-test.js.es6 rename to test/javascripts/acceptance/user-anonymous-test.js diff --git a/test/javascripts/acceptance/user-card-mobile-test.js.es6 b/test/javascripts/acceptance/user-card-mobile-test.js similarity index 100% rename from test/javascripts/acceptance/user-card-mobile-test.js.es6 rename to test/javascripts/acceptance/user-card-mobile-test.js diff --git a/test/javascripts/acceptance/user-card-test.js.es6 b/test/javascripts/acceptance/user-card-test.js similarity index 100% rename from test/javascripts/acceptance/user-card-test.js.es6 rename to test/javascripts/acceptance/user-card-test.js diff --git a/test/javascripts/acceptance/user-drafts-stream-test.js.es6 b/test/javascripts/acceptance/user-drafts-stream-test.js similarity index 100% rename from test/javascripts/acceptance/user-drafts-stream-test.js.es6 rename to test/javascripts/acceptance/user-drafts-stream-test.js diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js similarity index 100% rename from test/javascripts/acceptance/user-test.js.es6 rename to test/javascripts/acceptance/user-test.js diff --git a/test/javascripts/acceptance/users-test.js.es6 b/test/javascripts/acceptance/users-test.js similarity index 100% rename from test/javascripts/acceptance/users-test.js.es6 rename to test/javascripts/acceptance/users-test.js diff --git a/test/javascripts/admin/components/group-list-setting-test.js.es6 b/test/javascripts/admin/components/group-list-setting-test.js similarity index 100% rename from test/javascripts/admin/components/group-list-setting-test.js.es6 rename to test/javascripts/admin/components/group-list-setting-test.js diff --git a/test/javascripts/admin/components/themes-list-item-test.js.es6 b/test/javascripts/admin/components/themes-list-item-test.js similarity index 100% rename from test/javascripts/admin/components/themes-list-item-test.js.es6 rename to test/javascripts/admin/components/themes-list-item-test.js diff --git a/test/javascripts/admin/components/themes-list-test.js.es6 b/test/javascripts/admin/components/themes-list-test.js similarity index 100% rename from test/javascripts/admin/components/themes-list-test.js.es6 rename to test/javascripts/admin/components/themes-list-test.js diff --git a/test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-show-test.js similarity index 100% rename from test/javascripts/admin/controllers/admin-customize-themes-show-test.js.es6 rename to test/javascripts/admin/controllers/admin-customize-themes-show-test.js diff --git a/test/javascripts/admin/controllers/admin-customize-themes-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-test.js similarity index 100% rename from test/javascripts/admin/controllers/admin-customize-themes-test.js.es6 rename to test/javascripts/admin/controllers/admin-customize-themes-test.js diff --git a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6 b/test/javascripts/admin/controllers/admin-user-badges-test.js similarity index 100% rename from test/javascripts/admin/controllers/admin-user-badges-test.js.es6 rename to test/javascripts/admin/controllers/admin-user-badges-test.js diff --git a/test/javascripts/admin/models/theme-test.js.es6 b/test/javascripts/admin/models/theme-test.js similarity index 100% rename from test/javascripts/admin/models/theme-test.js.es6 rename to test/javascripts/admin/models/theme-test.js diff --git a/test/javascripts/components/ace-editor-test.js.es6 b/test/javascripts/components/ace-editor-test.js similarity index 100% rename from test/javascripts/components/ace-editor-test.js.es6 rename to test/javascripts/components/ace-editor-test.js diff --git a/test/javascripts/components/admin-report-test.js.es6 b/test/javascripts/components/admin-report-test.js similarity index 100% rename from test/javascripts/components/admin-report-test.js.es6 rename to test/javascripts/components/admin-report-test.js diff --git a/test/javascripts/components/badge-title-test.js.es6 b/test/javascripts/components/badge-title-test.js similarity index 100% rename from test/javascripts/components/badge-title-test.js.es6 rename to test/javascripts/components/badge-title-test.js diff --git a/test/javascripts/components/d-button-test.js.es6 b/test/javascripts/components/d-button-test.js similarity index 100% rename from test/javascripts/components/d-button-test.js.es6 rename to test/javascripts/components/d-button-test.js diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js similarity index 100% rename from test/javascripts/components/d-editor-test.js.es6 rename to test/javascripts/components/d-editor-test.js diff --git a/test/javascripts/components/d-icon-test.js.es6 b/test/javascripts/components/d-icon-test.js similarity index 100% rename from test/javascripts/components/d-icon-test.js.es6 rename to test/javascripts/components/d-icon-test.js diff --git a/test/javascripts/components/date-input-test.js.es6 b/test/javascripts/components/date-input-test.js similarity index 100% rename from test/javascripts/components/date-input-test.js.es6 rename to test/javascripts/components/date-input-test.js diff --git a/test/javascripts/components/date-time-input-range-test.js.es6 b/test/javascripts/components/date-time-input-range-test.js similarity index 100% rename from test/javascripts/components/date-time-input-range-test.js.es6 rename to test/javascripts/components/date-time-input-range-test.js diff --git a/test/javascripts/components/date-time-input-test.js.es6 b/test/javascripts/components/date-time-input-test.js similarity index 100% rename from test/javascripts/components/date-time-input-test.js.es6 rename to test/javascripts/components/date-time-input-test.js diff --git a/test/javascripts/components/group-membership-button-test.js.es6 b/test/javascripts/components/group-membership-button-test.js similarity index 100% rename from test/javascripts/components/group-membership-button-test.js.es6 rename to test/javascripts/components/group-membership-button-test.js diff --git a/test/javascripts/components/html-safe-helper-test.js.es6 b/test/javascripts/components/html-safe-helper-test.js similarity index 100% rename from test/javascripts/components/html-safe-helper-test.js.es6 rename to test/javascripts/components/html-safe-helper-test.js diff --git a/test/javascripts/components/iframed-html-test.js.es6 b/test/javascripts/components/iframed-html-test.js similarity index 100% rename from test/javascripts/components/iframed-html-test.js.es6 rename to test/javascripts/components/iframed-html-test.js diff --git a/test/javascripts/components/image-uploader-test.js.es6 b/test/javascripts/components/image-uploader-test.js similarity index 100% rename from test/javascripts/components/image-uploader-test.js.es6 rename to test/javascripts/components/image-uploader-test.js diff --git a/test/javascripts/components/keyboard-shortcuts-test.js.es6 b/test/javascripts/components/keyboard-shortcuts-test.js similarity index 100% rename from test/javascripts/components/keyboard-shortcuts-test.js.es6 rename to test/javascripts/components/keyboard-shortcuts-test.js diff --git a/test/javascripts/components/load-more-test.js.es6 b/test/javascripts/components/load-more-test.js similarity index 100% rename from test/javascripts/components/load-more-test.js.es6 rename to test/javascripts/components/load-more-test.js diff --git a/test/javascripts/components/secret-value-list-test.js.es6 b/test/javascripts/components/secret-value-list-test.js similarity index 100% rename from test/javascripts/components/secret-value-list-test.js.es6 rename to test/javascripts/components/secret-value-list-test.js diff --git a/test/javascripts/components/select-kit/category-chooser-test.js.es6 b/test/javascripts/components/select-kit/category-chooser-test.js similarity index 100% rename from test/javascripts/components/select-kit/category-chooser-test.js.es6 rename to test/javascripts/components/select-kit/category-chooser-test.js diff --git a/test/javascripts/components/select-kit/category-drop-test.js.es6 b/test/javascripts/components/select-kit/category-drop-test.js similarity index 100% rename from test/javascripts/components/select-kit/category-drop-test.js.es6 rename to test/javascripts/components/select-kit/category-drop-test.js diff --git a/test/javascripts/components/select-kit/combo-box-test.js.es6 b/test/javascripts/components/select-kit/combo-box-test.js similarity index 100% rename from test/javascripts/components/select-kit/combo-box-test.js.es6 rename to test/javascripts/components/select-kit/combo-box-test.js diff --git a/test/javascripts/components/select-kit/dropdown-select-box-test.js.es6 b/test/javascripts/components/select-kit/dropdown-select-box-test.js similarity index 100% rename from test/javascripts/components/select-kit/dropdown-select-box-test.js.es6 rename to test/javascripts/components/select-kit/dropdown-select-box-test.js diff --git a/test/javascripts/components/select-kit/list-setting-test.js.es6 b/test/javascripts/components/select-kit/list-setting-test.js similarity index 100% rename from test/javascripts/components/select-kit/list-setting-test.js.es6 rename to test/javascripts/components/select-kit/list-setting-test.js diff --git a/test/javascripts/components/select-kit/mini-tag-chooser-test.js.es6 b/test/javascripts/components/select-kit/mini-tag-chooser-test.js similarity index 100% rename from test/javascripts/components/select-kit/mini-tag-chooser-test.js.es6 rename to test/javascripts/components/select-kit/mini-tag-chooser-test.js diff --git a/test/javascripts/components/select-kit/multi-select-test.js.es6 b/test/javascripts/components/select-kit/multi-select-test.js similarity index 100% rename from test/javascripts/components/select-kit/multi-select-test.js.es6 rename to test/javascripts/components/select-kit/multi-select-test.js diff --git a/test/javascripts/components/select-kit/notifications-button-test.js.es6 b/test/javascripts/components/select-kit/notifications-button-test.js similarity index 100% rename from test/javascripts/components/select-kit/notifications-button-test.js.es6 rename to test/javascripts/components/select-kit/notifications-button-test.js diff --git a/test/javascripts/components/select-kit/pinned-options-test.js.es6 b/test/javascripts/components/select-kit/pinned-options-test.js similarity index 100% rename from test/javascripts/components/select-kit/pinned-options-test.js.es6 rename to test/javascripts/components/select-kit/pinned-options-test.js diff --git a/test/javascripts/components/select-kit/select-kit-test-helper.js.es6 b/test/javascripts/components/select-kit/select-kit-test-helper.js similarity index 100% rename from test/javascripts/components/select-kit/select-kit-test-helper.js.es6 rename to test/javascripts/components/select-kit/select-kit-test-helper.js diff --git a/test/javascripts/components/select-kit/single-select-test.js.es6 b/test/javascripts/components/select-kit/single-select-test.js similarity index 100% rename from test/javascripts/components/select-kit/single-select-test.js.es6 rename to test/javascripts/components/select-kit/single-select-test.js diff --git a/test/javascripts/components/select-kit/tag-drop-test.js.es6 b/test/javascripts/components/select-kit/tag-drop-test.js similarity index 100% rename from test/javascripts/components/select-kit/tag-drop-test.js.es6 rename to test/javascripts/components/select-kit/tag-drop-test.js diff --git a/test/javascripts/components/select-kit/topic-notifications-button-test.js.es6 b/test/javascripts/components/select-kit/topic-notifications-button-test.js similarity index 100% rename from test/javascripts/components/select-kit/topic-notifications-button-test.js.es6 rename to test/javascripts/components/select-kit/topic-notifications-button-test.js diff --git a/test/javascripts/components/select-kit/topic-notifications-options-test.js.es6 b/test/javascripts/components/select-kit/topic-notifications-options-test.js similarity index 100% rename from test/javascripts/components/select-kit/topic-notifications-options-test.js.es6 rename to test/javascripts/components/select-kit/topic-notifications-options-test.js diff --git a/test/javascripts/components/select-kit/user-chooser-test.js.es6 b/test/javascripts/components/select-kit/user-chooser-test.js similarity index 100% rename from test/javascripts/components/select-kit/user-chooser-test.js.es6 rename to test/javascripts/components/select-kit/user-chooser-test.js diff --git a/test/javascripts/components/share-button-test.js.es6 b/test/javascripts/components/share-button-test.js similarity index 100% rename from test/javascripts/components/share-button-test.js.es6 rename to test/javascripts/components/share-button-test.js diff --git a/test/javascripts/components/share-button.js.es6 b/test/javascripts/components/share-button.js similarity index 100% rename from test/javascripts/components/share-button.js.es6 rename to test/javascripts/components/share-button.js diff --git a/test/javascripts/components/text-field-test.js.es6 b/test/javascripts/components/text-field-test.js similarity index 100% rename from test/javascripts/components/text-field-test.js.es6 rename to test/javascripts/components/text-field-test.js diff --git a/test/javascripts/components/text-overflow-test.js.es6 b/test/javascripts/components/text-overflow-test.js similarity index 100% rename from test/javascripts/components/text-overflow-test.js.es6 rename to test/javascripts/components/text-overflow-test.js diff --git a/test/javascripts/components/time-input-test.js.es6 b/test/javascripts/components/time-input-test.js similarity index 100% rename from test/javascripts/components/time-input-test.js.es6 rename to test/javascripts/components/time-input-test.js diff --git a/test/javascripts/components/user-selector-test.js.es6 b/test/javascripts/components/user-selector-test.js similarity index 100% rename from test/javascripts/components/user-selector-test.js.es6 rename to test/javascripts/components/user-selector-test.js diff --git a/test/javascripts/components/value-list-test.js.es6 b/test/javascripts/components/value-list-test.js similarity index 100% rename from test/javascripts/components/value-list-test.js.es6 rename to test/javascripts/components/value-list-test.js diff --git a/test/javascripts/controllers/avatar-selector-test.js.es6 b/test/javascripts/controllers/avatar-selector-test.js similarity index 100% rename from test/javascripts/controllers/avatar-selector-test.js.es6 rename to test/javascripts/controllers/avatar-selector-test.js diff --git a/test/javascripts/controllers/bookmark-test.js.es6 b/test/javascripts/controllers/bookmark-test.js similarity index 100% rename from test/javascripts/controllers/bookmark-test.js.es6 rename to test/javascripts/controllers/bookmark-test.js diff --git a/test/javascripts/controllers/create-account-test.js.es6 b/test/javascripts/controllers/create-account-test.js similarity index 100% rename from test/javascripts/controllers/create-account-test.js.es6 rename to test/javascripts/controllers/create-account-test.js diff --git a/test/javascripts/controllers/group-test.js.es6 b/test/javascripts/controllers/group-test.js similarity index 100% rename from test/javascripts/controllers/group-test.js.es6 rename to test/javascripts/controllers/group-test.js diff --git a/test/javascripts/controllers/history-test.js.es6 b/test/javascripts/controllers/history-test.js similarity index 100% rename from test/javascripts/controllers/history-test.js.es6 rename to test/javascripts/controllers/history-test.js diff --git a/test/javascripts/controllers/preferences-account-test.js.es6 b/test/javascripts/controllers/preferences-account-test.js similarity index 100% rename from test/javascripts/controllers/preferences-account-test.js.es6 rename to test/javascripts/controllers/preferences-account-test.js diff --git a/test/javascripts/controllers/preferences-second-factor-test.js.es6 b/test/javascripts/controllers/preferences-second-factor-test.js similarity index 100% rename from test/javascripts/controllers/preferences-second-factor-test.js.es6 rename to test/javascripts/controllers/preferences-second-factor-test.js diff --git a/test/javascripts/controllers/reorder-categories-test.js.es6 b/test/javascripts/controllers/reorder-categories-test.js similarity index 100% rename from test/javascripts/controllers/reorder-categories-test.js.es6 rename to test/javascripts/controllers/reorder-categories-test.js diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js similarity index 100% rename from test/javascripts/controllers/topic-test.js.es6 rename to test/javascripts/controllers/topic-test.js diff --git a/test/javascripts/ember/resolver-test.js.es6 b/test/javascripts/ember/resolver-test.js similarity index 100% rename from test/javascripts/ember/resolver-test.js.es6 rename to test/javascripts/ember/resolver-test.js diff --git a/test/javascripts/fixtures/about.js.es6 b/test/javascripts/fixtures/about.js similarity index 100% rename from test/javascripts/fixtures/about.js.es6 rename to test/javascripts/fixtures/about.js diff --git a/test/javascripts/fixtures/badges_fixture.js.es6 b/test/javascripts/fixtures/badges_fixture.js similarity index 100% rename from test/javascripts/fixtures/badges_fixture.js.es6 rename to test/javascripts/fixtures/badges_fixture.js diff --git a/test/javascripts/fixtures/category-fixtures.js.es6 b/test/javascripts/fixtures/category-fixtures.js similarity index 100% rename from test/javascripts/fixtures/category-fixtures.js.es6 rename to test/javascripts/fixtures/category-fixtures.js diff --git a/test/javascripts/fixtures/concerns/notification-types.js.es6.erb b/test/javascripts/fixtures/concerns/notification-types.js.erb similarity index 100% rename from test/javascripts/fixtures/concerns/notification-types.js.es6.erb rename to test/javascripts/fixtures/concerns/notification-types.js.erb diff --git a/test/javascripts/fixtures/dashboard-general.js.es6 b/test/javascripts/fixtures/dashboard-general.js similarity index 100% rename from test/javascripts/fixtures/dashboard-general.js.es6 rename to test/javascripts/fixtures/dashboard-general.js diff --git a/test/javascripts/fixtures/dashboard.js.es6 b/test/javascripts/fixtures/dashboard.js similarity index 100% rename from test/javascripts/fixtures/dashboard.js.es6 rename to test/javascripts/fixtures/dashboard.js diff --git a/test/javascripts/fixtures/directory-fixtures.js.es6 b/test/javascripts/fixtures/directory-fixtures.js similarity index 100% rename from test/javascripts/fixtures/directory-fixtures.js.es6 rename to test/javascripts/fixtures/directory-fixtures.js diff --git a/test/javascripts/fixtures/discovery_fixtures.js.es6 b/test/javascripts/fixtures/discovery_fixtures.js similarity index 100% rename from test/javascripts/fixtures/discovery_fixtures.js.es6 rename to test/javascripts/fixtures/discovery_fixtures.js diff --git a/test/javascripts/fixtures/draft.js.es6 b/test/javascripts/fixtures/draft.js similarity index 100% rename from test/javascripts/fixtures/draft.js.es6 rename to test/javascripts/fixtures/draft.js diff --git a/test/javascripts/fixtures/drafts.js.es6 b/test/javascripts/fixtures/drafts.js similarity index 100% rename from test/javascripts/fixtures/drafts.js.es6 rename to test/javascripts/fixtures/drafts.js diff --git a/test/javascripts/fixtures/group-fixtures.js.es6 b/test/javascripts/fixtures/group-fixtures.js similarity index 100% rename from test/javascripts/fixtures/group-fixtures.js.es6 rename to test/javascripts/fixtures/group-fixtures.js diff --git a/test/javascripts/fixtures/groups-fixtures.js.es6 b/test/javascripts/fixtures/groups-fixtures.js similarity index 100% rename from test/javascripts/fixtures/groups-fixtures.js.es6 rename to test/javascripts/fixtures/groups-fixtures.js diff --git a/test/javascripts/fixtures/notification_fixtures.js.es6 b/test/javascripts/fixtures/notification_fixtures.js similarity index 100% rename from test/javascripts/fixtures/notification_fixtures.js.es6 rename to test/javascripts/fixtures/notification_fixtures.js diff --git a/test/javascripts/fixtures/poll.js.es6 b/test/javascripts/fixtures/poll.js similarity index 100% rename from test/javascripts/fixtures/poll.js.es6 rename to test/javascripts/fixtures/poll.js diff --git a/test/javascripts/fixtures/post.js.es6 b/test/javascripts/fixtures/post.js similarity index 100% rename from test/javascripts/fixtures/post.js.es6 rename to test/javascripts/fixtures/post.js diff --git a/test/javascripts/fixtures/private_messages_fixtures.js.es6 b/test/javascripts/fixtures/private_messages_fixtures.js similarity index 100% rename from test/javascripts/fixtures/private_messages_fixtures.js.es6 rename to test/javascripts/fixtures/private_messages_fixtures.js diff --git a/test/javascripts/fixtures/problems.js.es6 b/test/javascripts/fixtures/problems.js similarity index 100% rename from test/javascripts/fixtures/problems.js.es6 rename to test/javascripts/fixtures/problems.js diff --git a/test/javascripts/fixtures/reports.js.es6 b/test/javascripts/fixtures/reports.js similarity index 100% rename from test/javascripts/fixtures/reports.js.es6 rename to test/javascripts/fixtures/reports.js diff --git a/test/javascripts/fixtures/reports_bulk.js.es6 b/test/javascripts/fixtures/reports_bulk.js similarity index 100% rename from test/javascripts/fixtures/reports_bulk.js.es6 rename to test/javascripts/fixtures/reports_bulk.js diff --git a/test/javascripts/fixtures/search-fixtures.js.es6 b/test/javascripts/fixtures/search-fixtures.js similarity index 100% rename from test/javascripts/fixtures/search-fixtures.js.es6 rename to test/javascripts/fixtures/search-fixtures.js diff --git a/test/javascripts/fixtures/session-fixtures.js.es6 b/test/javascripts/fixtures/session-fixtures.js similarity index 100% rename from test/javascripts/fixtures/session-fixtures.js.es6 rename to test/javascripts/fixtures/session-fixtures.js diff --git a/test/javascripts/fixtures/site-fixtures.js.es6 b/test/javascripts/fixtures/site-fixtures.js similarity index 100% rename from test/javascripts/fixtures/site-fixtures.js.es6 rename to test/javascripts/fixtures/site-fixtures.js diff --git a/test/javascripts/fixtures/site_settings.js.es6 b/test/javascripts/fixtures/site_settings.js similarity index 100% rename from test/javascripts/fixtures/site_settings.js.es6 rename to test/javascripts/fixtures/site_settings.js diff --git a/test/javascripts/fixtures/static_fixtures.js.es6 b/test/javascripts/fixtures/static_fixtures.js similarity index 100% rename from test/javascripts/fixtures/static_fixtures.js.es6 rename to test/javascripts/fixtures/static_fixtures.js diff --git a/test/javascripts/fixtures/top_fixture.js.es6 b/test/javascripts/fixtures/top_fixture.js similarity index 100% rename from test/javascripts/fixtures/top_fixture.js.es6 rename to test/javascripts/fixtures/top_fixture.js diff --git a/test/javascripts/fixtures/topic.js.es6 b/test/javascripts/fixtures/topic.js similarity index 100% rename from test/javascripts/fixtures/topic.js.es6 rename to test/javascripts/fixtures/topic.js diff --git a/test/javascripts/fixtures/user-badges.js.es6 b/test/javascripts/fixtures/user-badges.js similarity index 100% rename from test/javascripts/fixtures/user-badges.js.es6 rename to test/javascripts/fixtures/user-badges.js diff --git a/test/javascripts/fixtures/user_fixtures.js.es6 b/test/javascripts/fixtures/user_fixtures.js similarity index 100% rename from test/javascripts/fixtures/user_fixtures.js.es6 rename to test/javascripts/fixtures/user_fixtures.js diff --git a/test/javascripts/fixtures/watched-words-fixtures.js.es6 b/test/javascripts/fixtures/watched-words-fixtures.js similarity index 100% rename from test/javascripts/fixtures/watched-words-fixtures.js.es6 rename to test/javascripts/fixtures/watched-words-fixtures.js diff --git a/test/javascripts/helpers/assertions.js b/test/javascripts/helpers/assertions.js index 95d7b2a7dd5..81fbd40b1bc 100644 --- a/test/javascripts/helpers/assertions.js +++ b/test/javascripts/helpers/assertions.js @@ -1,5 +1,4 @@ -/* exported exists, count, present, blank, containsInstance, not, visible, invisible */ - +// discourse-skip-module function exists(selector) { return count(selector) > 0; } @@ -13,8 +12,10 @@ function visible(selector) { } function invisible(selector) { - var $items = find(selector + ":visible"); - return $items.length === 0 || - $items.css("opacity") === "0" || - $items.css("visibility") === "hidden"; + const $items = find(selector + ":visible"); + return ( + $items.length === 0 || + $items.css("opacity") === "0" || + $items.css("visibility") === "hidden" + ); } diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js similarity index 100% rename from test/javascripts/helpers/component-test.js.es6 rename to test/javascripts/helpers/component-test.js diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js similarity index 100% rename from test/javascripts/helpers/create-pretender.js.es6 rename to test/javascripts/helpers/create-pretender.js diff --git a/test/javascripts/helpers/create-store.js.es6 b/test/javascripts/helpers/create-store.js similarity index 100% rename from test/javascripts/helpers/create-store.js.es6 rename to test/javascripts/helpers/create-store.js diff --git a/test/javascripts/helpers/d-editor-helper.js.es6 b/test/javascripts/helpers/d-editor-helper.js similarity index 100% rename from test/javascripts/helpers/d-editor-helper.js.es6 rename to test/javascripts/helpers/d-editor-helper.js diff --git a/test/javascripts/helpers/fixture-pretender.js.es6 b/test/javascripts/helpers/fixture-pretender.js similarity index 100% rename from test/javascripts/helpers/fixture-pretender.js.es6 rename to test/javascripts/helpers/fixture-pretender.js diff --git a/test/javascripts/helpers/html-helper.js.es6 b/test/javascripts/helpers/html-helper.js similarity index 100% rename from test/javascripts/helpers/html-helper.js.es6 rename to test/javascripts/helpers/html-helper.js diff --git a/test/javascripts/helpers/init-ember-qunit.js b/test/javascripts/helpers/init-ember-qunit.js deleted file mode 100644 index 32d0184e7d9..00000000000 --- a/test/javascripts/helpers/init-ember-qunit.js +++ /dev/null @@ -1,2 +0,0 @@ -var buildResolver = require('discourse-common/resolver').buildResolver; -window.setResolver(buildResolver('discourse').create({ namespace: Discourse })); diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js similarity index 100% rename from test/javascripts/helpers/qunit-helpers.js.es6 rename to test/javascripts/helpers/qunit-helpers.js diff --git a/test/javascripts/helpers/review-pretender.js.es6 b/test/javascripts/helpers/review-pretender.js similarity index 100% rename from test/javascripts/helpers/review-pretender.js.es6 rename to test/javascripts/helpers/review-pretender.js diff --git a/test/javascripts/helpers/select-kit-helper.js.es6 b/test/javascripts/helpers/select-kit-helper.js similarity index 100% rename from test/javascripts/helpers/select-kit-helper.js.es6 rename to test/javascripts/helpers/select-kit-helper.js diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js index 621aa3d6acc..c39424b0dfc 100644 --- a/test/javascripts/helpers/site-settings.js +++ b/test/javascripts/helpers/site-settings.js @@ -1,4 +1,5 @@ -/*jshint maxlen:10000000 */ +// discourse-skip-module + Discourse.SiteSettingsOriginal = { title: "QUnit Discourse Tests", site_logo_url: "/assets/logo.png", @@ -12,8 +13,10 @@ Discourse.SiteSettingsOriginal = { ga_universal_tracking_code: "", ga_universal_domain_name: "auto", top_menu: "latest|new|unread|categories|top", - post_menu: "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply", - post_menu_hidden_items: "flag|bookmark|bookmarkWithReminder|edit|delete|admin", + post_menu: + "like|share|flag|edit|bookmark|bookmarkWithReminder|delete|admin|reply", + post_menu_hidden_items: + "flag|bookmark|bookmarkWithReminder|edit|delete|admin", share_links: "twitter|facebook|email", category_colors: "BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|27AA5B|B3B5B4|E45735", @@ -102,6 +105,7 @@ Discourse.SiteSettingsOriginal = { unicode_usernames: false, secure_media: false }; + Discourse.SiteSettings = jQuery.extend( true, {}, diff --git a/test/javascripts/helpers/site.js.es6 b/test/javascripts/helpers/site.js similarity index 100% rename from test/javascripts/helpers/site.js.es6 rename to test/javascripts/helpers/site.js diff --git a/test/javascripts/helpers/store-pretender.js.es6 b/test/javascripts/helpers/store-pretender.js similarity index 100% rename from test/javascripts/helpers/store-pretender.js.es6 rename to test/javascripts/helpers/store-pretender.js diff --git a/test/javascripts/helpers/textarea-selection-helper.js.es6 b/test/javascripts/helpers/textarea-selection-helper.js similarity index 100% rename from test/javascripts/helpers/textarea-selection-helper.js.es6 rename to test/javascripts/helpers/textarea-selection-helper.js diff --git a/test/javascripts/helpers/widget-test.js.es6 b/test/javascripts/helpers/widget-test.js similarity index 100% rename from test/javascripts/helpers/widget-test.js.es6 rename to test/javascripts/helpers/widget-test.js diff --git a/test/javascripts/initializers/localization-test.js.es6 b/test/javascripts/initializers/localization-test.js similarity index 100% rename from test/javascripts/initializers/localization-test.js.es6 rename to test/javascripts/initializers/localization-test.js diff --git a/test/javascripts/lib/bbcode-test.js.es6 b/test/javascripts/lib/bbcode-test.js similarity index 100% rename from test/javascripts/lib/bbcode-test.js.es6 rename to test/javascripts/lib/bbcode-test.js diff --git a/test/javascripts/lib/break-string-test.js.es6 b/test/javascripts/lib/break-string-test.js similarity index 100% rename from test/javascripts/lib/break-string-test.js.es6 rename to test/javascripts/lib/break-string-test.js diff --git a/test/javascripts/lib/category-badge-test.js.es6 b/test/javascripts/lib/category-badge-test.js similarity index 100% rename from test/javascripts/lib/category-badge-test.js.es6 rename to test/javascripts/lib/category-badge-test.js diff --git a/test/javascripts/lib/click-track-edit-history-test.js.es6 b/test/javascripts/lib/click-track-edit-history-test.js similarity index 100% rename from test/javascripts/lib/click-track-edit-history-test.js.es6 rename to test/javascripts/lib/click-track-edit-history-test.js diff --git a/test/javascripts/lib/click-track-profile-page-test.js.es6 b/test/javascripts/lib/click-track-profile-page-test.js similarity index 100% rename from test/javascripts/lib/click-track-profile-page-test.js.es6 rename to test/javascripts/lib/click-track-profile-page-test.js diff --git a/test/javascripts/lib/click-track-test.js.es6 b/test/javascripts/lib/click-track-test.js similarity index 100% rename from test/javascripts/lib/click-track-test.js.es6 rename to test/javascripts/lib/click-track-test.js diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js similarity index 100% rename from test/javascripts/lib/computed-test.js.es6 rename to test/javascripts/lib/computed-test.js diff --git a/test/javascripts/lib/discourse-test.js.es6 b/test/javascripts/lib/discourse-test.js similarity index 100% rename from test/javascripts/lib/discourse-test.js.es6 rename to test/javascripts/lib/discourse-test.js diff --git a/test/javascripts/lib/emoji-store-test.js.es6 b/test/javascripts/lib/emoji-store-test.js similarity index 100% rename from test/javascripts/lib/emoji-store-test.js.es6 rename to test/javascripts/lib/emoji-store-test.js diff --git a/test/javascripts/lib/emoji-test.js.es6 b/test/javascripts/lib/emoji-test.js similarity index 100% rename from test/javascripts/lib/emoji-test.js.es6 rename to test/javascripts/lib/emoji-test.js diff --git a/test/javascripts/lib/formatter-test.js.es6 b/test/javascripts/lib/formatter-test.js similarity index 100% rename from test/javascripts/lib/formatter-test.js.es6 rename to test/javascripts/lib/formatter-test.js diff --git a/test/javascripts/lib/highlight-text-test.js.es6 b/test/javascripts/lib/highlight-text-test.js similarity index 100% rename from test/javascripts/lib/highlight-text-test.js.es6 rename to test/javascripts/lib/highlight-text-test.js diff --git a/test/javascripts/lib/i18n-test.js.es6 b/test/javascripts/lib/i18n-test.js similarity index 100% rename from test/javascripts/lib/i18n-test.js.es6 rename to test/javascripts/lib/i18n-test.js diff --git a/test/javascripts/lib/icon-library-test.js.es6 b/test/javascripts/lib/icon-library-test.js similarity index 100% rename from test/javascripts/lib/icon-library-test.js.es6 rename to test/javascripts/lib/icon-library-test.js diff --git a/test/javascripts/lib/key-value-store-test.js.es6 b/test/javascripts/lib/key-value-store-test.js similarity index 100% rename from test/javascripts/lib/key-value-store-test.js.es6 rename to test/javascripts/lib/key-value-store-test.js diff --git a/test/javascripts/lib/link-mentions-test.js.es6 b/test/javascripts/lib/link-mentions-test.js similarity index 100% rename from test/javascripts/lib/link-mentions-test.js.es6 rename to test/javascripts/lib/link-mentions-test.js diff --git a/test/javascripts/lib/load-script-test.js.es6 b/test/javascripts/lib/load-script-test.js similarity index 100% rename from test/javascripts/lib/load-script-test.js.es6 rename to test/javascripts/lib/load-script-test.js diff --git a/test/javascripts/lib/oneboxer-test.js.es6 b/test/javascripts/lib/oneboxer-test.js similarity index 100% rename from test/javascripts/lib/oneboxer-test.js.es6 rename to test/javascripts/lib/oneboxer-test.js diff --git a/test/javascripts/lib/preload-store-test.js.es6 b/test/javascripts/lib/preload-store-test.js similarity index 100% rename from test/javascripts/lib/preload-store-test.js.es6 rename to test/javascripts/lib/preload-store-test.js diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js similarity index 100% rename from test/javascripts/lib/pretty-text-test.js.es6 rename to test/javascripts/lib/pretty-text-test.js diff --git a/test/javascripts/lib/sanitizer-test.js.es6 b/test/javascripts/lib/sanitizer-test.js similarity index 100% rename from test/javascripts/lib/sanitizer-test.js.es6 rename to test/javascripts/lib/sanitizer-test.js diff --git a/test/javascripts/lib/screen-track-test.js.es6 b/test/javascripts/lib/screen-track-test.js similarity index 100% rename from test/javascripts/lib/screen-track-test.js.es6 rename to test/javascripts/lib/screen-track-test.js diff --git a/test/javascripts/lib/search-test.js.es6 b/test/javascripts/lib/search-test.js similarity index 100% rename from test/javascripts/lib/search-test.js.es6 rename to test/javascripts/lib/search-test.js diff --git a/test/javascripts/lib/sharing-test.js.es6 b/test/javascripts/lib/sharing-test.js similarity index 100% rename from test/javascripts/lib/sharing-test.js.es6 rename to test/javascripts/lib/sharing-test.js diff --git a/test/javascripts/lib/text-direction-test.js.es6 b/test/javascripts/lib/text-direction-test.js similarity index 100% rename from test/javascripts/lib/text-direction-test.js.es6 rename to test/javascripts/lib/text-direction-test.js diff --git a/test/javascripts/lib/to-markdown-test.js.es6 b/test/javascripts/lib/to-markdown-test.js similarity index 100% rename from test/javascripts/lib/to-markdown-test.js.es6 rename to test/javascripts/lib/to-markdown-test.js diff --git a/test/javascripts/lib/tooltip-test.js.es6 b/test/javascripts/lib/tooltip-test.js similarity index 100% rename from test/javascripts/lib/tooltip-test.js.es6 rename to test/javascripts/lib/tooltip-test.js diff --git a/test/javascripts/lib/upload-short-url-test.js.es6 b/test/javascripts/lib/upload-short-url-test.js similarity index 100% rename from test/javascripts/lib/upload-short-url-test.js.es6 rename to test/javascripts/lib/upload-short-url-test.js diff --git a/test/javascripts/lib/uploads-test.js.es6 b/test/javascripts/lib/uploads-test.js similarity index 100% rename from test/javascripts/lib/uploads-test.js.es6 rename to test/javascripts/lib/uploads-test.js diff --git a/test/javascripts/lib/url-test.js.es6 b/test/javascripts/lib/url-test.js similarity index 100% rename from test/javascripts/lib/url-test.js.es6 rename to test/javascripts/lib/url-test.js diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js similarity index 100% rename from test/javascripts/lib/user-search-test.js.es6 rename to test/javascripts/lib/user-search-test.js diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js similarity index 100% rename from test/javascripts/lib/utilities-test.js.es6 rename to test/javascripts/lib/utilities-test.js diff --git a/test/javascripts/lib/white-lister-test.js.es6 b/test/javascripts/lib/white-lister-test.js similarity index 100% rename from test/javascripts/lib/white-lister-test.js.es6 rename to test/javascripts/lib/white-lister-test.js diff --git a/test/javascripts/mixins/grant-badge-controller-test.js.es6 b/test/javascripts/mixins/grant-badge-controller-test.js similarity index 100% rename from test/javascripts/mixins/grant-badge-controller-test.js.es6 rename to test/javascripts/mixins/grant-badge-controller-test.js diff --git a/test/javascripts/mixins/setting-object-test.js.es6 b/test/javascripts/mixins/setting-object-test.js similarity index 100% rename from test/javascripts/mixins/setting-object-test.js.es6 rename to test/javascripts/mixins/setting-object-test.js diff --git a/test/javascripts/mixins/singleton-test.js.es6 b/test/javascripts/mixins/singleton-test.js similarity index 100% rename from test/javascripts/mixins/singleton-test.js.es6 rename to test/javascripts/mixins/singleton-test.js diff --git a/test/javascripts/models/badge-test.js.es6 b/test/javascripts/models/badge-test.js similarity index 100% rename from test/javascripts/models/badge-test.js.es6 rename to test/javascripts/models/badge-test.js diff --git a/test/javascripts/models/category-test.js.es6 b/test/javascripts/models/category-test.js similarity index 100% rename from test/javascripts/models/category-test.js.es6 rename to test/javascripts/models/category-test.js diff --git a/test/javascripts/models/composer-test.js.es6 b/test/javascripts/models/composer-test.js similarity index 100% rename from test/javascripts/models/composer-test.js.es6 rename to test/javascripts/models/composer-test.js diff --git a/test/javascripts/models/email-log-test.js.es6 b/test/javascripts/models/email-log-test.js similarity index 100% rename from test/javascripts/models/email-log-test.js.es6 rename to test/javascripts/models/email-log-test.js diff --git a/test/javascripts/models/group-test.js.es6 b/test/javascripts/models/group-test.js similarity index 100% rename from test/javascripts/models/group-test.js.es6 rename to test/javascripts/models/group-test.js diff --git a/test/javascripts/models/invite-test.js.es6 b/test/javascripts/models/invite-test.js similarity index 100% rename from test/javascripts/models/invite-test.js.es6 rename to test/javascripts/models/invite-test.js diff --git a/test/javascripts/models/nav-item-test.js.es6 b/test/javascripts/models/nav-item-test.js similarity index 100% rename from test/javascripts/models/nav-item-test.js.es6 rename to test/javascripts/models/nav-item-test.js diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js similarity index 100% rename from test/javascripts/models/post-stream-test.js.es6 rename to test/javascripts/models/post-stream-test.js diff --git a/test/javascripts/models/post-test.js.es6 b/test/javascripts/models/post-test.js similarity index 100% rename from test/javascripts/models/post-test.js.es6 rename to test/javascripts/models/post-test.js diff --git a/test/javascripts/models/report-test.js.es6 b/test/javascripts/models/report-test.js similarity index 100% rename from test/javascripts/models/report-test.js.es6 rename to test/javascripts/models/report-test.js diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js similarity index 100% rename from test/javascripts/models/rest-model-test.js.es6 rename to test/javascripts/models/rest-model-test.js diff --git a/test/javascripts/models/result-set-test.js.es6 b/test/javascripts/models/result-set-test.js similarity index 100% rename from test/javascripts/models/result-set-test.js.es6 rename to test/javascripts/models/result-set-test.js diff --git a/test/javascripts/models/session-test.js.es6 b/test/javascripts/models/session-test.js similarity index 100% rename from test/javascripts/models/session-test.js.es6 rename to test/javascripts/models/session-test.js diff --git a/test/javascripts/models/site-test.js.es6 b/test/javascripts/models/site-test.js similarity index 100% rename from test/javascripts/models/site-test.js.es6 rename to test/javascripts/models/site-test.js diff --git a/test/javascripts/models/staff-action-log-test.js.es6 b/test/javascripts/models/staff-action-log-test.js similarity index 100% rename from test/javascripts/models/staff-action-log-test.js.es6 rename to test/javascripts/models/staff-action-log-test.js diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js similarity index 100% rename from test/javascripts/models/store-test.js.es6 rename to test/javascripts/models/store-test.js diff --git a/test/javascripts/models/topic-details-test.js.es6 b/test/javascripts/models/topic-details-test.js similarity index 100% rename from test/javascripts/models/topic-details-test.js.es6 rename to test/javascripts/models/topic-details-test.js diff --git a/test/javascripts/models/topic-test.js.es6 b/test/javascripts/models/topic-test.js similarity index 100% rename from test/javascripts/models/topic-test.js.es6 rename to test/javascripts/models/topic-test.js diff --git a/test/javascripts/models/topic-tracking-state-test.js.es6 b/test/javascripts/models/topic-tracking-state-test.js similarity index 100% rename from test/javascripts/models/topic-tracking-state-test.js.es6 rename to test/javascripts/models/topic-tracking-state-test.js diff --git a/test/javascripts/models/user-action-test.js.es6 b/test/javascripts/models/user-action-test.js similarity index 100% rename from test/javascripts/models/user-action-test.js.es6 rename to test/javascripts/models/user-action-test.js diff --git a/test/javascripts/models/user-badge-test.js.es6 b/test/javascripts/models/user-badge-test.js similarity index 100% rename from test/javascripts/models/user-badge-test.js.es6 rename to test/javascripts/models/user-badge-test.js diff --git a/test/javascripts/models/user-drafts-test.js.es6 b/test/javascripts/models/user-drafts-test.js similarity index 100% rename from test/javascripts/models/user-drafts-test.js.es6 rename to test/javascripts/models/user-drafts-test.js diff --git a/test/javascripts/models/user-stream-test.js.es6 b/test/javascripts/models/user-stream-test.js similarity index 100% rename from test/javascripts/models/user-stream-test.js.es6 rename to test/javascripts/models/user-stream-test.js diff --git a/test/javascripts/models/user-test.js.es6 b/test/javascripts/models/user-test.js similarity index 100% rename from test/javascripts/models/user-test.js.es6 rename to test/javascripts/models/user-test.js diff --git a/test/javascripts/utils/decorators-test.js.es6 b/test/javascripts/utils/decorators-test.js similarity index 100% rename from test/javascripts/utils/decorators-test.js.es6 rename to test/javascripts/utils/decorators-test.js diff --git a/test/javascripts/widgets/actions-summary-test.js.es6 b/test/javascripts/widgets/actions-summary-test.js similarity index 100% rename from test/javascripts/widgets/actions-summary-test.js.es6 rename to test/javascripts/widgets/actions-summary-test.js diff --git a/test/javascripts/widgets/avatar-flair-test.js.es6 b/test/javascripts/widgets/avatar-flair-test.js similarity index 100% rename from test/javascripts/widgets/avatar-flair-test.js.es6 rename to test/javascripts/widgets/avatar-flair-test.js diff --git a/test/javascripts/widgets/button-test.js.es6 b/test/javascripts/widgets/button-test.js similarity index 100% rename from test/javascripts/widgets/button-test.js.es6 rename to test/javascripts/widgets/button-test.js diff --git a/test/javascripts/widgets/default-notification-item-test.js.es6 b/test/javascripts/widgets/default-notification-item-test.js similarity index 100% rename from test/javascripts/widgets/default-notification-item-test.js.es6 rename to test/javascripts/widgets/default-notification-item-test.js diff --git a/test/javascripts/widgets/hamburger-menu-test.js.es6 b/test/javascripts/widgets/hamburger-menu-test.js similarity index 100% rename from test/javascripts/widgets/hamburger-menu-test.js.es6 rename to test/javascripts/widgets/hamburger-menu-test.js diff --git a/test/javascripts/widgets/header-test.js.es6 b/test/javascripts/widgets/header-test.js similarity index 100% rename from test/javascripts/widgets/header-test.js.es6 rename to test/javascripts/widgets/header-test.js diff --git a/test/javascripts/widgets/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js similarity index 100% rename from test/javascripts/widgets/home-logo-test.js.es6 rename to test/javascripts/widgets/home-logo-test.js diff --git a/test/javascripts/widgets/post-links-test.js.es6 b/test/javascripts/widgets/post-links-test.js similarity index 100% rename from test/javascripts/widgets/post-links-test.js.es6 rename to test/javascripts/widgets/post-links-test.js diff --git a/test/javascripts/widgets/post-stream-test.js.es6 b/test/javascripts/widgets/post-stream-test.js similarity index 100% rename from test/javascripts/widgets/post-stream-test.js.es6 rename to test/javascripts/widgets/post-stream-test.js diff --git a/test/javascripts/widgets/post-test.js.es6 b/test/javascripts/widgets/post-test.js similarity index 100% rename from test/javascripts/widgets/post-test.js.es6 rename to test/javascripts/widgets/post-test.js diff --git a/test/javascripts/widgets/poster-name-test.js.es6 b/test/javascripts/widgets/poster-name-test.js similarity index 100% rename from test/javascripts/widgets/poster-name-test.js.es6 rename to test/javascripts/widgets/poster-name-test.js diff --git a/test/javascripts/widgets/quick-access-item-test.js.es6 b/test/javascripts/widgets/quick-access-item-test.js similarity index 100% rename from test/javascripts/widgets/quick-access-item-test.js.es6 rename to test/javascripts/widgets/quick-access-item-test.js diff --git a/test/javascripts/widgets/topic-admin-menu-test.js.es6 b/test/javascripts/widgets/topic-admin-menu-test.js similarity index 100% rename from test/javascripts/widgets/topic-admin-menu-test.js.es6 rename to test/javascripts/widgets/topic-admin-menu-test.js diff --git a/test/javascripts/widgets/topic-participant-test.js.es6 b/test/javascripts/widgets/topic-participant-test.js similarity index 100% rename from test/javascripts/widgets/topic-participant-test.js.es6 rename to test/javascripts/widgets/topic-participant-test.js diff --git a/test/javascripts/widgets/topic-status-test.js.es6 b/test/javascripts/widgets/topic-status-test.js similarity index 100% rename from test/javascripts/widgets/topic-status-test.js.es6 rename to test/javascripts/widgets/topic-status-test.js diff --git a/test/javascripts/widgets/user-menu-test.js.es6 b/test/javascripts/widgets/user-menu-test.js similarity index 100% rename from test/javascripts/widgets/user-menu-test.js.es6 rename to test/javascripts/widgets/user-menu-test.js diff --git a/test/javascripts/widgets/widget-test.js.es6 b/test/javascripts/widgets/widget-test.js similarity index 100% rename from test/javascripts/widgets/widget-test.js.es6 rename to test/javascripts/widgets/widget-test.js