Add ES6 support to more files

This commit is contained in:
Robin Ward
2015-08-10 17:11:27 -04:00
parent 766903c430
commit e2e3e7c0e0
78 changed files with 419 additions and 387 deletions

View File

@ -1,6 +1,9 @@
var testMouseTrap;
import DiscourseURL from 'discourse/lib/url';
module("Discourse.KeyboardShortcuts", {
var testMouseTrap;
import KeyboardShortcuts from 'discourse/lib/keyboard-shortcuts';
module("lib:keyboard-shortcuts", {
setup: function() {
var _bindings = {};
@ -23,7 +26,7 @@ module("Discourse.KeyboardShortcuts", {
}
};
sandbox.stub(Discourse.URL, "routeTo");
sandbox.stub(DiscourseURL, "routeTo");
$("#qunit-fixture").html([
"<article class='topic-post selected'>",
@ -64,20 +67,20 @@ module("Discourse.KeyboardShortcuts", {
}
});
var pathBindings = Discourse.KeyboardShortcuts.PATH_BINDINGS;
var pathBindings = KeyboardShortcuts.PATH_BINDINGS;
_.each(pathBindings, function(path, binding) {
var testName = binding + " goes to " + path;
test(testName, function() {
Discourse.KeyboardShortcuts.bindEvents(testMouseTrap);
KeyboardShortcuts.bindEvents(testMouseTrap);
testMouseTrap.trigger(binding);
ok(Discourse.URL.routeTo.calledWith(path));
ok(DiscourseURL.routeTo.calledWith(path));
});
});
var clickBindings = Discourse.KeyboardShortcuts.CLICK_BINDINGS;
var clickBindings = KeyboardShortcuts.CLICK_BINDINGS;
_.each(clickBindings, function(selector, binding) {
var bindings = binding.split(",");
@ -85,7 +88,7 @@ _.each(clickBindings, function(selector, binding) {
var testName = binding + " clicks on " + selector;
test(testName, function() {
Discourse.KeyboardShortcuts.bindEvents(testMouseTrap);
KeyboardShortcuts.bindEvents(testMouseTrap);
$(selector).on("click", function() {
ok(true, selector + " was clicked");
});
@ -96,32 +99,32 @@ _.each(clickBindings, function(selector, binding) {
});
});
var functionBindings = Discourse.KeyboardShortcuts.FUNCTION_BINDINGS;
var functionBindings = KeyboardShortcuts.FUNCTION_BINDINGS;
_.each(functionBindings, function(func, binding) {
var testName = binding + " calls " + func;
test(testName, function() {
sandbox.stub(Discourse.KeyboardShortcuts, func, function() {
sandbox.stub(KeyboardShortcuts, func, function() {
ok(true, func + " is called when " + binding + " is triggered");
});
Discourse.KeyboardShortcuts.bindEvents(testMouseTrap);
KeyboardShortcuts.bindEvents(testMouseTrap);
testMouseTrap.trigger(binding);
});
});
test("selectDown calls _moveSelection with 1", function() {
var spy = sandbox.spy(Discourse.KeyboardShortcuts, '_moveSelection');
var spy = sandbox.spy(KeyboardShortcuts, '_moveSelection');
Discourse.KeyboardShortcuts.selectDown();
KeyboardShortcuts.selectDown();
ok(spy.calledWith(1), "_moveSelection is called with 1");
});
test("selectUp calls _moveSelection with -1", function() {
var spy = sandbox.spy(Discourse.KeyboardShortcuts, '_moveSelection');
var spy = sandbox.spy(KeyboardShortcuts, '_moveSelection');
Discourse.KeyboardShortcuts.selectUp();
KeyboardShortcuts.selectUp();
ok(spy.calledWith(-1), "_moveSelection is called with -1");
});
@ -131,20 +134,20 @@ test("goBack calls history.back", function() {
called = true;
});
Discourse.KeyboardShortcuts.goBack();
KeyboardShortcuts.goBack();
ok(called, "history.back is called");
});
test("nextSection calls _changeSection with 1", function() {
var spy = sandbox.spy(Discourse.KeyboardShortcuts, '_changeSection');
var spy = sandbox.spy(KeyboardShortcuts, '_changeSection');
Discourse.KeyboardShortcuts.nextSection();
KeyboardShortcuts.nextSection();
ok(spy.calledWith(1), "_changeSection is called with 1");
});
test("prevSection calls _changeSection with -1", function() {
var spy = sandbox.spy(Discourse.KeyboardShortcuts, '_changeSection');
var spy = sandbox.spy(KeyboardShortcuts, '_changeSection');
Discourse.KeyboardShortcuts.prevSection();
KeyboardShortcuts.prevSection();
ok(spy.calledWith(-1), "_changeSection is called with -1");
});