Removed bad JS tests, upgrade QUnit + ember-qunit

This commit is contained in:
Robin Ward
2015-05-13 14:12:54 -04:00
parent 4df868a420
commit 01d4085125
13 changed files with 1062 additions and 465 deletions

View File

@ -34,7 +34,6 @@
//= require admin
//= require_tree ../../app/assets/javascripts/defer
//= require sinon-1.7.1
//= require sinon-qunit-1.0.0
//= require jshint
@ -50,15 +49,6 @@
//
//= require ../../public/javascripts/jquery.magnific-popup-min.js
// sinon settings
sinon.config = {
injectIntoThis: true,
injectInto: null,
properties: ["spy", "stub", "mock", "clock", "sandbox"],
useFakeTimers: false,
useFakeServer: false
};
window.assetPath = function(url) {
if (url.indexOf('defer') === 0) {
return "/assets/" + url;
@ -103,7 +93,6 @@ QUnit.testStart(function(ctx) {
PreloadStore.reset();
window.sandbox = sinon.sandbox.create();
window.sandbox.stub(Discourse.ScrollingDOMMethods, "bindOnScroll");
window.sandbox.stub(Discourse.ScrollingDOMMethods, "unbindOnScroll");