From 20956f63d2aa3bd1380b5003f107ce1335b99d9e Mon Sep 17 00:00:00 2001 From: Jason Madsen Date: Fri, 4 Apr 2014 14:30:47 -0600 Subject: [PATCH] assume qunit is a global on page test runners like karma and testem bring qunit onto the page for you, making integration with a modular test suite ridiculous. --- dist/amd/module-for.js | 10 +++++----- dist/amd/test.js | 8 ++++---- dist/cjs/module-for.js | 2 +- dist/cjs/test.js | 2 +- dist/globals/main.js | 4 ++-- dist/named-amd/main.js | 18 +++++++++--------- lib/module-for.js | 2 +- lib/test.js | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dist/amd/module-for.js b/dist/amd/module-for.js index a5e965dc..7536da6c 100644 --- a/dist/amd/module-for.js +++ b/dist/amd/module-for.js @@ -1,11 +1,11 @@ define( - ["ember","qunit","./test-context","./isolated-container","exports"], - function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) { + ["ember","./test-context","./isolated-container","exports"], + function(__dependency1__, __dependency2__, __dependency3__, __exports__) { "use strict"; var Ember = __dependency1__["default"] || __dependency1__; - var QUnit = __dependency2__["default"] || __dependency2__; - var testContext = __dependency3__["default"] || __dependency3__; - var isolatedContainer = __dependency4__["default"] || __dependency4__; + //import QUnit from 'qunit'; // Assumed global in runner + var testContext = __dependency2__["default"] || __dependency2__; + var isolatedContainer = __dependency3__["default"] || __dependency3__; __exports__["default"] = function moduleFor(fullName, description, callbacks, delegate) { var container; diff --git a/dist/amd/test.js b/dist/amd/test.js index ecefb3b9..b5c9a974 100644 --- a/dist/amd/test.js +++ b/dist/amd/test.js @@ -1,10 +1,10 @@ define( - ["ember","qunit","./test-context","exports"], - function(__dependency1__, __dependency2__, __dependency3__, __exports__) { + ["ember","./test-context","exports"], + function(__dependency1__, __dependency2__, __exports__) { "use strict"; var Ember = __dependency1__["default"] || __dependency1__; - var QUnit = __dependency2__["default"] || __dependency2__; - var testContext = __dependency3__["default"] || __dependency3__; + //import QUnit from 'qunit'; // Assumed global in runner + var testContext = __dependency2__["default"] || __dependency2__; function resetViews() { Ember.View.views = {}; diff --git a/dist/cjs/module-for.js b/dist/cjs/module-for.js index 2ff3ebcb..c8ecdf92 100644 --- a/dist/cjs/module-for.js +++ b/dist/cjs/module-for.js @@ -1,6 +1,6 @@ "use strict"; var Ember = require("ember")["default"] || require("ember"); -var QUnit = require("qunit")["default"] || require("qunit"); +//import QUnit from 'qunit'; // Assumed global in runner var testContext = require("./test-context")["default"] || require("./test-context"); var isolatedContainer = require("./isolated-container")["default"] || require("./isolated-container"); diff --git a/dist/cjs/test.js b/dist/cjs/test.js index 06dda72e..67fa2841 100644 --- a/dist/cjs/test.js +++ b/dist/cjs/test.js @@ -1,6 +1,6 @@ "use strict"; var Ember = require("ember")["default"] || require("ember"); -var QUnit = require("qunit")["default"] || require("qunit"); +//import QUnit from 'qunit'; // Assumed global in runner var testContext = require("./test-context")["default"] || require("./test-context"); function resetViews() { diff --git a/dist/globals/main.js b/dist/globals/main.js index e722e411..aed447e6 100644 --- a/dist/globals/main.js +++ b/dist/globals/main.js @@ -111,7 +111,7 @@ exports["default"] = function moduleForModel(name, description, callbacks) { },{"./module-for":5}],5:[function(_dereq_,module,exports){ "use strict"; var Ember = window.Ember["default"] || window.Ember; -var QUnit = window.QUnit["default"] || window.QUnit; +//import QUnit from 'qunit'; // Assumed global in runner var testContext = _dereq_("./test-context")["default"] || _dereq_("./test-context"); var isolatedContainer = _dereq_("./isolated-container")["default"] || _dereq_("./isolated-container"); @@ -227,7 +227,7 @@ exports.get = get; },{}],8:[function(_dereq_,module,exports){ "use strict"; var Ember = window.Ember["default"] || window.Ember; -var QUnit = window.QUnit["default"] || window.QUnit; +//import QUnit from 'qunit'; // Assumed global in runner var testContext = _dereq_("./test-context")["default"] || _dereq_("./test-context"); function resetViews() { diff --git a/dist/named-amd/main.js b/dist/named-amd/main.js index 3ab0f5e0..725b8b99 100644 --- a/dist/named-amd/main.js +++ b/dist/named-amd/main.js @@ -117,13 +117,13 @@ define("ember-qunit/isolated-container", }); } });define("ember-qunit/module-for", - ["ember","qunit","./test-context","./isolated-container","exports"], - function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) { + ["ember","./test-context","./isolated-container","exports"], + function(__dependency1__, __dependency2__, __dependency3__, __exports__) { "use strict"; var Ember = __dependency1__["default"] || __dependency1__; - var QUnit = __dependency2__["default"] || __dependency2__; - var testContext = __dependency3__["default"] || __dependency3__; - var isolatedContainer = __dependency4__["default"] || __dependency4__; + //import QUnit from 'qunit'; // Assumed global in runner + var testContext = __dependency2__["default"] || __dependency2__; + var isolatedContainer = __dependency3__["default"] || __dependency3__; __exports__["default"] = function moduleFor(fullName, description, callbacks, delegate) { var container; @@ -239,12 +239,12 @@ define("ember-qunit/isolated-container", __exports__.get = get; });define("ember-qunit/test", - ["ember","qunit","./test-context","exports"], - function(__dependency1__, __dependency2__, __dependency3__, __exports__) { + ["ember","./test-context","exports"], + function(__dependency1__, __dependency2__, __exports__) { "use strict"; var Ember = __dependency1__["default"] || __dependency1__; - var QUnit = __dependency2__["default"] || __dependency2__; - var testContext = __dependency3__["default"] || __dependency3__; + //import QUnit from 'qunit'; // Assumed global in runner + var testContext = __dependency2__["default"] || __dependency2__; function resetViews() { Ember.View.views = {}; diff --git a/lib/module-for.js b/lib/module-for.js index de27d2a0..6155c53f 100644 --- a/lib/module-for.js +++ b/lib/module-for.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import QUnit from 'qunit'; +//import QUnit from 'qunit'; // Assumed global in runner import testContext from './test-context'; import isolatedContainer from './isolated-container'; diff --git a/lib/test.js b/lib/test.js index 0c700271..cd13d1bb 100644 --- a/lib/test.js +++ b/lib/test.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import QUnit from 'qunit'; +//import QUnit from 'qunit'; // Assumed global in runner import testContext from './test-context'; function resetViews() {