From b8bfbcb3cb98946acd20fa701d14632b4af054fe Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 31 Jul 2014 12:05:47 -0400 Subject: [PATCH] ES6: Tests --- ...ctor_controller_test.js => avatar-selector-test.js.es6} | 0 ...count_controller_test.js => create-account-test.js.es6} | 0 .../{controller_test.js => discourse-test.js.es6} | 0 .../{flag_controller_test.js => flag-test.js.es6} | 0 .../{header_controller_test.js => header-test.js.es6} | 0 ...ication_controller_test.js => notification-test.js.es6} | 0 ...ations_controller_test.js => notifications-test.js.es6} | 0 .../{search_controller_test.js => search-test.js.es6} | 0 ...ry_controller_test.js => site-map-category-test.js.es6} | 0 .../{site_map_controller_test.js => site-map-test.js.es6} | 0 .../{topic_controller_test.js => topic-test.js.es6} | 0 ...opdown_controller_test.js => user-dropdown-test.js.es6} | 0 .../integration/{header-test.js => header-test.js.es6} | 0 .../integration/{static-test.js => static-test.js.es6} | 0 ...topic-discovery-test.js => topic-discovery-test.js.es6} | 0 .../integration/{topic-test.js => topic-test.js.es6} | 0 .../integration/{unknown-test.js => unknown-test.js.es6} | 0 .../integration/{user-test.js => user-test.js.es6} | 0 test/javascripts/test_helper.js | 7 +++++++ 19 files changed, 7 insertions(+) rename test/javascripts/controllers/{avatar_selector_controller_test.js => avatar-selector-test.js.es6} (100%) rename test/javascripts/controllers/{create_account_controller_test.js => create-account-test.js.es6} (100%) rename test/javascripts/controllers/{controller_test.js => discourse-test.js.es6} (100%) rename test/javascripts/controllers/{flag_controller_test.js => flag-test.js.es6} (100%) rename test/javascripts/controllers/{header_controller_test.js => header-test.js.es6} (100%) rename test/javascripts/controllers/{notification_controller_test.js => notification-test.js.es6} (100%) rename test/javascripts/controllers/{notifications_controller_test.js => notifications-test.js.es6} (100%) rename test/javascripts/controllers/{search_controller_test.js => search-test.js.es6} (100%) rename test/javascripts/controllers/{site_map_category_controller_test.js => site-map-category-test.js.es6} (100%) rename test/javascripts/controllers/{site_map_controller_test.js => site-map-test.js.es6} (100%) rename test/javascripts/controllers/{topic_controller_test.js => topic-test.js.es6} (100%) rename test/javascripts/controllers/{user_dropdown_controller_test.js => user-dropdown-test.js.es6} (100%) rename test/javascripts/integration/{header-test.js => header-test.js.es6} (100%) rename test/javascripts/integration/{static-test.js => static-test.js.es6} (100%) rename test/javascripts/integration/{topic-discovery-test.js => topic-discovery-test.js.es6} (100%) rename test/javascripts/integration/{topic-test.js => topic-test.js.es6} (100%) rename test/javascripts/integration/{unknown-test.js => unknown-test.js.es6} (100%) rename test/javascripts/integration/{user-test.js => user-test.js.es6} (100%) 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); + } +});