diff --git a/test/javascripts/controllers/avatar_selector_controller_test.js b/test/javascripts/controllers/avatar-selector-test.js.es6 similarity index 100% rename from test/javascripts/controllers/avatar_selector_controller_test.js rename to test/javascripts/controllers/avatar-selector-test.js.es6 diff --git a/test/javascripts/controllers/create_account_controller_test.js b/test/javascripts/controllers/create-account-test.js.es6 similarity index 100% rename from test/javascripts/controllers/create_account_controller_test.js rename to test/javascripts/controllers/create-account-test.js.es6 diff --git a/test/javascripts/controllers/controller_test.js b/test/javascripts/controllers/discourse-test.js.es6 similarity index 100% rename from test/javascripts/controllers/controller_test.js rename to test/javascripts/controllers/discourse-test.js.es6 diff --git a/test/javascripts/controllers/flag_controller_test.js b/test/javascripts/controllers/flag-test.js.es6 similarity index 100% rename from test/javascripts/controllers/flag_controller_test.js rename to test/javascripts/controllers/flag-test.js.es6 diff --git a/test/javascripts/controllers/header_controller_test.js b/test/javascripts/controllers/header-test.js.es6 similarity index 100% rename from test/javascripts/controllers/header_controller_test.js rename to test/javascripts/controllers/header-test.js.es6 diff --git a/test/javascripts/controllers/notification_controller_test.js b/test/javascripts/controllers/notification-test.js.es6 similarity index 100% rename from test/javascripts/controllers/notification_controller_test.js rename to test/javascripts/controllers/notification-test.js.es6 diff --git a/test/javascripts/controllers/notifications_controller_test.js b/test/javascripts/controllers/notifications-test.js.es6 similarity index 100% rename from test/javascripts/controllers/notifications_controller_test.js rename to test/javascripts/controllers/notifications-test.js.es6 diff --git a/test/javascripts/controllers/search_controller_test.js b/test/javascripts/controllers/search-test.js.es6 similarity index 100% rename from test/javascripts/controllers/search_controller_test.js rename to test/javascripts/controllers/search-test.js.es6 diff --git a/test/javascripts/controllers/site_map_category_controller_test.js b/test/javascripts/controllers/site-map-category-test.js.es6 similarity index 100% rename from test/javascripts/controllers/site_map_category_controller_test.js rename to test/javascripts/controllers/site-map-category-test.js.es6 diff --git a/test/javascripts/controllers/site_map_controller_test.js b/test/javascripts/controllers/site-map-test.js.es6 similarity index 100% rename from test/javascripts/controllers/site_map_controller_test.js rename to test/javascripts/controllers/site-map-test.js.es6 diff --git a/test/javascripts/controllers/topic_controller_test.js b/test/javascripts/controllers/topic-test.js.es6 similarity index 100% rename from test/javascripts/controllers/topic_controller_test.js rename to test/javascripts/controllers/topic-test.js.es6 diff --git a/test/javascripts/controllers/user_dropdown_controller_test.js b/test/javascripts/controllers/user-dropdown-test.js.es6 similarity index 100% rename from test/javascripts/controllers/user_dropdown_controller_test.js rename to test/javascripts/controllers/user-dropdown-test.js.es6 diff --git a/test/javascripts/integration/header-test.js b/test/javascripts/integration/header-test.js.es6 similarity index 100% rename from test/javascripts/integration/header-test.js rename to test/javascripts/integration/header-test.js.es6 diff --git a/test/javascripts/integration/static-test.js b/test/javascripts/integration/static-test.js.es6 similarity index 100% rename from test/javascripts/integration/static-test.js rename to test/javascripts/integration/static-test.js.es6 diff --git a/test/javascripts/integration/topic-discovery-test.js b/test/javascripts/integration/topic-discovery-test.js.es6 similarity index 100% rename from test/javascripts/integration/topic-discovery-test.js rename to test/javascripts/integration/topic-discovery-test.js.es6 diff --git a/test/javascripts/integration/topic-test.js b/test/javascripts/integration/topic-test.js.es6 similarity index 100% rename from test/javascripts/integration/topic-test.js rename to test/javascripts/integration/topic-test.js.es6 diff --git a/test/javascripts/integration/unknown-test.js b/test/javascripts/integration/unknown-test.js.es6 similarity index 100% rename from test/javascripts/integration/unknown-test.js rename to test/javascripts/integration/unknown-test.js.es6 diff --git a/test/javascripts/integration/user-test.js b/test/javascripts/integration/user-test.js.es6 similarity index 100% rename from test/javascripts/integration/user-test.js rename to test/javascripts/integration/user-test.js.es6 diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index a0028c82b7e..ba5a9b36798 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -114,3 +114,10 @@ QUnit.testDone(function() { Ember.run.debounce = origDebounce; window.sandbox.restore(); }); + +// Load ES6 tests +Ember.keys(requirejs.entries).forEach(function(entry) { + if ((/\-test/).test(entry)) { + require(entry, null, null, true); + } +});