ember-source 1.13.13 → 2.0.0.beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/dist/ember-template-compiler.js +2454 -3074
- data/dist/ember-testing.js +139 -131
- data/dist/ember.debug.js +4796 -10211
- data/dist/ember.js +4796 -10211
- data/dist/ember.min.js +15 -15
- data/dist/ember.prod.js +4339 -9655
- data/dist/version-test.js +13 -0
- metadata +5 -4
data/dist/ember-testing.js
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* Portions Copyright 2008-2011 Apple Inc. All rights reserved.
|
|
6
6
|
* @license Licensed under MIT license
|
|
7
7
|
* See https://raw.github.com/emberjs/ember.js/master/LICENSE
|
|
8
|
-
* @version
|
|
8
|
+
* @version 2.0.0-beta.2
|
|
9
9
|
*/
|
|
10
10
|
|
|
11
11
|
(function() {
|
|
@@ -36,7 +36,7 @@ var mainContext = this;
|
|
|
36
36
|
value.callback = callback;
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
-
|
|
39
|
+
registry[name] = value;
|
|
40
40
|
};
|
|
41
41
|
|
|
42
42
|
requirejs = eriuqer = requireModule = function(name) {
|
|
@@ -114,11 +114,7 @@ var mainContext = this;
|
|
|
114
114
|
}
|
|
115
115
|
})();
|
|
116
116
|
|
|
117
|
-
enifed(
|
|
118
|
-
/*global __fail__*/
|
|
119
|
-
|
|
120
|
-
"use strict";
|
|
121
|
-
|
|
117
|
+
enifed('ember-debug', ['exports', 'ember-metal/core', 'ember-metal/features', 'ember-metal/error', 'ember-metal/logger', 'ember-debug/deprecation-manager', 'ember-metal/environment'], function (exports, _emberMetalCore, _emberMetalFeatures, _emberMetalError, _emberMetalLogger, _emberDebugDeprecationManager, _emberMetalEnvironment) {
|
|
122
118
|
exports._warnIfUsingStrippedFeatureFlags = _warnIfUsingStrippedFeatureFlags;
|
|
123
119
|
|
|
124
120
|
/**
|
|
@@ -156,7 +152,7 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
156
152
|
its return value will be used as condition.
|
|
157
153
|
@public
|
|
158
154
|
*/
|
|
159
|
-
_emberMetalCore
|
|
155
|
+
_emberMetalCore.default.assert = function (desc, test) {
|
|
160
156
|
var throwAssertion;
|
|
161
157
|
|
|
162
158
|
if (isPlainFunction(test)) {
|
|
@@ -166,7 +162,7 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
166
162
|
}
|
|
167
163
|
|
|
168
164
|
if (throwAssertion) {
|
|
169
|
-
throw new _emberMetalError
|
|
165
|
+
throw new _emberMetalError.default('Assertion Failed: ' + desc);
|
|
170
166
|
}
|
|
171
167
|
};
|
|
172
168
|
|
|
@@ -180,11 +176,11 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
180
176
|
will be displayed.
|
|
181
177
|
@public
|
|
182
178
|
*/
|
|
183
|
-
_emberMetalCore
|
|
179
|
+
_emberMetalCore.default.warn = function (message, test) {
|
|
184
180
|
if (!test) {
|
|
185
|
-
_emberMetalLogger
|
|
186
|
-
if ('trace' in _emberMetalLogger
|
|
187
|
-
_emberMetalLogger
|
|
181
|
+
_emberMetalLogger.default.warn('WARNING: ' + message);
|
|
182
|
+
if ('trace' in _emberMetalLogger.default) {
|
|
183
|
+
_emberMetalLogger.default.trace();
|
|
188
184
|
}
|
|
189
185
|
}
|
|
190
186
|
};
|
|
@@ -201,8 +197,8 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
201
197
|
@param {String} message A debug message to display.
|
|
202
198
|
@public
|
|
203
199
|
*/
|
|
204
|
-
_emberMetalCore
|
|
205
|
-
_emberMetalLogger
|
|
200
|
+
_emberMetalCore.default.debug = function (message) {
|
|
201
|
+
_emberMetalLogger.default.debug('DEBUG: ' + message);
|
|
206
202
|
};
|
|
207
203
|
|
|
208
204
|
/**
|
|
@@ -222,11 +218,11 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
222
218
|
The `id` should be namespaced by dots, e.g. "view.helper.select".
|
|
223
219
|
@public
|
|
224
220
|
*/
|
|
225
|
-
_emberMetalCore
|
|
226
|
-
if (_emberMetalCore
|
|
227
|
-
_emberDebugDeprecationManager
|
|
221
|
+
_emberMetalCore.default.deprecate = function (message, test, options) {
|
|
222
|
+
if (_emberMetalCore.default.ENV.RAISE_ON_DEPRECATION) {
|
|
223
|
+
_emberDebugDeprecationManager.default.setDefaultLevel(_emberDebugDeprecationManager.deprecationLevels.RAISE);
|
|
228
224
|
}
|
|
229
|
-
if (_emberDebugDeprecationManager
|
|
225
|
+
if (_emberDebugDeprecationManager.default.getLevel(options && options.id) === _emberDebugDeprecationManager.deprecationLevels.SILENCE) {
|
|
230
226
|
return;
|
|
231
227
|
}
|
|
232
228
|
|
|
@@ -243,11 +239,11 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
243
239
|
}
|
|
244
240
|
|
|
245
241
|
if (options && options.id) {
|
|
246
|
-
message = message + (
|
|
242
|
+
message = message + (' [deprecation id: ' + options.id + ']');
|
|
247
243
|
}
|
|
248
244
|
|
|
249
|
-
if (_emberDebugDeprecationManager
|
|
250
|
-
throw new _emberMetalError
|
|
245
|
+
if (_emberDebugDeprecationManager.default.getLevel(options && options.id) === _emberDebugDeprecationManager.deprecationLevels.RAISE) {
|
|
246
|
+
throw new _emberMetalError.default(message);
|
|
251
247
|
}
|
|
252
248
|
|
|
253
249
|
var error;
|
|
@@ -260,13 +256,13 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
260
256
|
}
|
|
261
257
|
|
|
262
258
|
if (arguments.length === 3) {
|
|
263
|
-
_emberMetalCore
|
|
259
|
+
_emberMetalCore.default.assert('options argument to Ember.deprecate should be an object', options && typeof options === 'object');
|
|
264
260
|
if (options.url) {
|
|
265
261
|
message += ' See ' + options.url + ' for more details.';
|
|
266
262
|
}
|
|
267
263
|
}
|
|
268
264
|
|
|
269
|
-
if (_emberMetalCore
|
|
265
|
+
if (_emberMetalCore.default.LOG_STACKTRACE_ON_DEPRECATION && error.stack) {
|
|
270
266
|
var stack;
|
|
271
267
|
var stackStr = '';
|
|
272
268
|
|
|
@@ -279,11 +275,11 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
279
275
|
stack = error.stack.replace(/(?:\n@:0)?\s+$/m, '').replace(/^\(/gm, '{anonymous}(').split('\n');
|
|
280
276
|
}
|
|
281
277
|
|
|
282
|
-
stackStr =
|
|
278
|
+
stackStr = '\n ' + stack.slice(2).join('\n ');
|
|
283
279
|
message = message + stackStr;
|
|
284
280
|
}
|
|
285
281
|
|
|
286
|
-
_emberMetalLogger
|
|
282
|
+
_emberMetalLogger.default.warn('DEPRECATION: ' + message);
|
|
287
283
|
};
|
|
288
284
|
|
|
289
285
|
/**
|
|
@@ -306,7 +302,7 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
306
302
|
@return {Function} a new function that wrapped the original function with a deprecation warning
|
|
307
303
|
@private
|
|
308
304
|
*/
|
|
309
|
-
_emberMetalCore
|
|
305
|
+
_emberMetalCore.default.deprecateFunc = function () {
|
|
310
306
|
for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
|
|
311
307
|
args[_key] = arguments[_key];
|
|
312
308
|
}
|
|
@@ -319,13 +315,13 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
319
315
|
|
|
320
316
|
return {
|
|
321
317
|
v: function () {
|
|
322
|
-
_emberMetalCore
|
|
318
|
+
_emberMetalCore.default.deprecate(message, false, options);
|
|
323
319
|
return func.apply(this, arguments);
|
|
324
320
|
}
|
|
325
321
|
};
|
|
326
322
|
})();
|
|
327
323
|
|
|
328
|
-
if (typeof _ret ===
|
|
324
|
+
if (typeof _ret === 'object') return _ret.v;
|
|
329
325
|
} else {
|
|
330
326
|
var _ret2 = (function () {
|
|
331
327
|
var message = args[0];
|
|
@@ -333,13 +329,13 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
333
329
|
|
|
334
330
|
return {
|
|
335
331
|
v: function () {
|
|
336
|
-
_emberMetalCore
|
|
332
|
+
_emberMetalCore.default.deprecate(message);
|
|
337
333
|
return func.apply(this, arguments);
|
|
338
334
|
}
|
|
339
335
|
};
|
|
340
336
|
})();
|
|
341
337
|
|
|
342
|
-
if (typeof _ret2 ===
|
|
338
|
+
if (typeof _ret2 === 'object') return _ret2.v;
|
|
343
339
|
}
|
|
344
340
|
};
|
|
345
341
|
|
|
@@ -362,7 +358,7 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
362
358
|
@since 1.5.0
|
|
363
359
|
@public
|
|
364
360
|
*/
|
|
365
|
-
_emberMetalCore
|
|
361
|
+
_emberMetalCore.default.runInDebug = function (func) {
|
|
366
362
|
func();
|
|
367
363
|
};
|
|
368
364
|
|
|
@@ -379,32 +375,31 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
379
375
|
|
|
380
376
|
function _warnIfUsingStrippedFeatureFlags(FEATURES, featuresWereStripped) {
|
|
381
377
|
if (featuresWereStripped) {
|
|
382
|
-
_emberMetalCore
|
|
383
|
-
_emberMetalCore
|
|
378
|
+
_emberMetalCore.default.warn('Ember.ENV.ENABLE_ALL_FEATURES is only available in canary builds.', !_emberMetalCore.default.ENV.ENABLE_ALL_FEATURES);
|
|
379
|
+
_emberMetalCore.default.warn('Ember.ENV.ENABLE_OPTIONAL_FEATURES is only available in canary builds.', !_emberMetalCore.default.ENV.ENABLE_OPTIONAL_FEATURES);
|
|
384
380
|
|
|
385
381
|
for (var key in FEATURES) {
|
|
386
382
|
if (FEATURES.hasOwnProperty(key) && key !== 'isEnabled') {
|
|
387
|
-
_emberMetalCore
|
|
383
|
+
_emberMetalCore.default.warn('FEATURE["' + key + '"] is set as enabled, but FEATURE flags are only available in canary builds.', !FEATURES[key]);
|
|
388
384
|
}
|
|
389
385
|
}
|
|
390
386
|
}
|
|
391
387
|
}
|
|
392
388
|
|
|
393
|
-
if (!_emberMetalCore
|
|
389
|
+
if (!_emberMetalCore.default.testing) {
|
|
394
390
|
// Complain if they're using FEATURE flags in builds other than canary
|
|
395
|
-
|
|
391
|
+
_emberMetalFeatures.FEATURES['features-stripped-test'] = true;
|
|
396
392
|
var featuresWereStripped = true;
|
|
397
393
|
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
_warnIfUsingStrippedFeatureFlags(_emberMetalCore["default"].ENV.FEATURES, featuresWereStripped);
|
|
394
|
+
delete _emberMetalFeatures.FEATURES['features-stripped-test'];
|
|
395
|
+
_warnIfUsingStrippedFeatureFlags(_emberMetalCore.default.ENV.FEATURES, featuresWereStripped);
|
|
401
396
|
|
|
402
397
|
// Inform the developer about the Ember Inspector if not installed.
|
|
403
|
-
var isFirefox = _emberMetalEnvironment
|
|
404
|
-
var isChrome = _emberMetalEnvironment
|
|
398
|
+
var isFirefox = _emberMetalEnvironment.default.isFirefox;
|
|
399
|
+
var isChrome = _emberMetalEnvironment.default.isChrome;
|
|
405
400
|
|
|
406
401
|
if (typeof window !== 'undefined' && (isFirefox || isChrome) && window.addEventListener) {
|
|
407
|
-
window.addEventListener(
|
|
402
|
+
window.addEventListener('load', function () {
|
|
408
403
|
if (document.documentElement && document.documentElement.dataset && !document.documentElement.dataset.emberExtension) {
|
|
409
404
|
var downloadURL;
|
|
410
405
|
|
|
@@ -414,15 +409,15 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
414
409
|
downloadURL = 'https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/';
|
|
415
410
|
}
|
|
416
411
|
|
|
417
|
-
_emberMetalCore
|
|
412
|
+
_emberMetalCore.default.debug('For more advanced debugging, install the Ember Inspector from ' + downloadURL);
|
|
418
413
|
}
|
|
419
414
|
}, false);
|
|
420
415
|
}
|
|
421
416
|
}
|
|
422
417
|
|
|
423
|
-
_emberMetalCore
|
|
418
|
+
_emberMetalCore.default.Debug = {
|
|
424
419
|
_addDeprecationLevel: function (id, level) {
|
|
425
|
-
_emberDebugDeprecationManager
|
|
420
|
+
_emberDebugDeprecationManager.default.setLevel(id, level);
|
|
426
421
|
},
|
|
427
422
|
_deprecationLevels: _emberDebugDeprecationManager.deprecationLevels
|
|
428
423
|
};
|
|
@@ -438,12 +433,11 @@ enifed("ember-debug", ["exports", "ember-metal/core", "ember-metal/error", "embe
|
|
|
438
433
|
var runningNonEmberDebugJS = false;
|
|
439
434
|
exports.runningNonEmberDebugJS = runningNonEmberDebugJS;
|
|
440
435
|
if (runningNonEmberDebugJS) {
|
|
441
|
-
_emberMetalCore
|
|
436
|
+
_emberMetalCore.default.warn('Please use `ember.debug.js` instead of `ember.js` for development and debugging.');
|
|
442
437
|
}
|
|
443
438
|
});
|
|
439
|
+
/*global __fail__*/
|
|
444
440
|
enifed('ember-debug/deprecation-manager', ['exports', 'ember-metal/dictionary', 'ember-metal/utils'], function (exports, _emberMetalDictionary, _emberMetalUtils) {
|
|
445
|
-
'use strict';
|
|
446
|
-
|
|
447
441
|
var deprecationLevels = {
|
|
448
442
|
RAISE: _emberMetalUtils.symbol('RAISE'),
|
|
449
443
|
LOG: _emberMetalUtils.symbol('LOG'),
|
|
@@ -451,9 +445,9 @@ enifed('ember-debug/deprecation-manager', ['exports', 'ember-metal/dictionary',
|
|
|
451
445
|
};
|
|
452
446
|
|
|
453
447
|
exports.deprecationLevels = deprecationLevels;
|
|
454
|
-
exports
|
|
448
|
+
exports.default = {
|
|
455
449
|
defaultLevel: deprecationLevels.LOG,
|
|
456
|
-
individualLevels: _emberMetalDictionary
|
|
450
|
+
individualLevels: _emberMetalDictionary.default(null),
|
|
457
451
|
setDefaultLevel: function (level) {
|
|
458
452
|
this.defaultLevel = level;
|
|
459
453
|
},
|
|
@@ -469,9 +463,7 @@ enifed('ember-debug/deprecation-manager', ['exports', 'ember-metal/dictionary',
|
|
|
469
463
|
}
|
|
470
464
|
};
|
|
471
465
|
});
|
|
472
|
-
enifed(
|
|
473
|
-
"use strict";
|
|
474
|
-
|
|
466
|
+
enifed('ember-testing', ['exports', 'ember-metal/core', 'ember-testing/initializers', 'ember-testing/support', 'ember-testing/setup_for_testing', 'ember-testing/test', 'ember-testing/adapters/adapter', 'ember-testing/adapters/qunit', 'ember-testing/helpers'], function (exports, _emberMetalCore, _emberTestingInitializers, _emberTestingSupport, _emberTestingSetup_for_testing, _emberTestingTest, _emberTestingAdaptersAdapter, _emberTestingAdaptersQunit, _emberTestingHelpers) {
|
|
475
467
|
// adds helpers to helpers object in Test
|
|
476
468
|
|
|
477
469
|
/**
|
|
@@ -479,15 +471,14 @@ enifed("ember-testing", ["exports", "ember-metal/core", "ember-testing/initializ
|
|
|
479
471
|
@submodule ember-testing
|
|
480
472
|
*/
|
|
481
473
|
|
|
482
|
-
_emberMetalCore
|
|
483
|
-
_emberMetalCore
|
|
484
|
-
_emberMetalCore
|
|
485
|
-
_emberMetalCore
|
|
474
|
+
_emberMetalCore.default.Test = _emberTestingTest.default;
|
|
475
|
+
_emberMetalCore.default.Test.Adapter = _emberTestingAdaptersAdapter.default;
|
|
476
|
+
_emberMetalCore.default.Test.QUnitAdapter = _emberTestingAdaptersQunit.default;
|
|
477
|
+
_emberMetalCore.default.setupForTesting = _emberTestingSetup_for_testing.default;
|
|
486
478
|
});
|
|
487
479
|
// to setup initializer
|
|
488
480
|
// to handle various edge cases
|
|
489
|
-
enifed(
|
|
490
|
-
"use strict";
|
|
481
|
+
enifed('ember-testing/adapters/adapter', ['exports', 'ember-runtime/system/object'], function (exports, _emberRuntimeSystemObject) {
|
|
491
482
|
|
|
492
483
|
function K() {
|
|
493
484
|
return this;
|
|
@@ -506,7 +497,7 @@ enifed("ember-testing/adapters/adapter", ["exports", "ember-runtime/system/objec
|
|
|
506
497
|
@namespace Ember.Test
|
|
507
498
|
@public
|
|
508
499
|
*/
|
|
509
|
-
var Adapter = _emberRuntimeSystemObject
|
|
500
|
+
var Adapter = _emberRuntimeSystemObject.default.extend({
|
|
510
501
|
/**
|
|
511
502
|
This callback will be called whenever an async operation is about to start.
|
|
512
503
|
Override this to call your framework's methods that handle async
|
|
@@ -542,10 +533,9 @@ enifed("ember-testing/adapters/adapter", ["exports", "ember-runtime/system/objec
|
|
|
542
533
|
}
|
|
543
534
|
});
|
|
544
535
|
|
|
545
|
-
exports
|
|
536
|
+
exports.default = Adapter;
|
|
546
537
|
});
|
|
547
|
-
enifed(
|
|
548
|
-
"use strict";
|
|
538
|
+
enifed('ember-testing/adapters/qunit', ['exports', 'ember-testing/adapters/adapter', 'ember-metal/utils'], function (exports, _emberTestingAdaptersAdapter, _emberMetalUtils) {
|
|
549
539
|
|
|
550
540
|
/**
|
|
551
541
|
This class implements the methods defined by Ember.Test.Adapter for the
|
|
@@ -556,7 +546,7 @@ enifed("ember-testing/adapters/qunit", ["exports", "ember-testing/adapters/adapt
|
|
|
556
546
|
@extends Ember.Test.Adapter
|
|
557
547
|
@public
|
|
558
548
|
*/
|
|
559
|
-
exports
|
|
549
|
+
exports.default = _emberTestingAdaptersAdapter.default.extend({
|
|
560
550
|
asyncStart: function () {
|
|
561
551
|
QUnit.stop();
|
|
562
552
|
},
|
|
@@ -568,16 +558,15 @@ enifed("ember-testing/adapters/qunit", ["exports", "ember-testing/adapters/adapt
|
|
|
568
558
|
}
|
|
569
559
|
});
|
|
570
560
|
});
|
|
571
|
-
enifed(
|
|
572
|
-
"use strict";
|
|
561
|
+
enifed('ember-testing/helpers', ['exports', 'ember-metal/core', 'ember-metal/features', 'ember-metal/property_get', 'ember-metal/error', 'ember-metal/run_loop', 'ember-views/system/jquery', 'ember-testing/test', 'ember-runtime/ext/rsvp'], function (exports, _emberMetalCore, _emberMetalFeatures, _emberMetalProperty_get, _emberMetalError, _emberMetalRun_loop, _emberViewsSystemJquery, _emberTestingTest, _emberRuntimeExtRsvp) {
|
|
573
562
|
|
|
574
563
|
/**
|
|
575
564
|
@module ember
|
|
576
565
|
@submodule ember-testing
|
|
577
566
|
*/
|
|
578
567
|
|
|
579
|
-
var helper = _emberTestingTest
|
|
580
|
-
var asyncHelper = _emberTestingTest
|
|
568
|
+
var helper = _emberTestingTest.default.registerHelper;
|
|
569
|
+
var asyncHelper = _emberTestingTest.default.registerAsyncHelper;
|
|
581
570
|
|
|
582
571
|
function currentRouteName(app) {
|
|
583
572
|
var appController = app.__container__.lookup('controller:application');
|
|
@@ -598,15 +587,15 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
598
587
|
}
|
|
599
588
|
|
|
600
589
|
function pauseTest() {
|
|
601
|
-
_emberTestingTest
|
|
602
|
-
return new _emberMetalCore
|
|
590
|
+
_emberTestingTest.default.adapter.asyncStart();
|
|
591
|
+
return new _emberMetalCore.default.RSVP.Promise(function () {}, 'TestAdapter paused promise');
|
|
603
592
|
}
|
|
604
593
|
|
|
605
594
|
function focus(el) {
|
|
606
595
|
if (el && el.is(':input, [contenteditable=true]')) {
|
|
607
596
|
var type = el.prop('type');
|
|
608
597
|
if (type !== 'checkbox' && type !== 'radio' && type !== 'hidden') {
|
|
609
|
-
_emberMetalRun_loop
|
|
598
|
+
_emberMetalRun_loop.default(el, function () {
|
|
610
599
|
// Firefox does not trigger the `focusin` event if the window
|
|
611
600
|
// does not have focus. If the document doesn't have focus just
|
|
612
601
|
// use trigger('focusin') instead.
|
|
@@ -628,13 +617,13 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
628
617
|
router.location.setURL(url);
|
|
629
618
|
|
|
630
619
|
if (shouldHandleURL) {
|
|
631
|
-
_emberMetalRun_loop
|
|
620
|
+
_emberMetalRun_loop.default(app.__deprecatedInstance__, 'handleURL', url);
|
|
632
621
|
}
|
|
633
622
|
});
|
|
634
623
|
|
|
635
624
|
if (app._readinessDeferrals > 0) {
|
|
636
625
|
router['initialURL'] = url;
|
|
637
|
-
_emberMetalRun_loop
|
|
626
|
+
_emberMetalRun_loop.default(app, 'advanceReadiness');
|
|
638
627
|
delete router['initialURL'];
|
|
639
628
|
} else {
|
|
640
629
|
shouldHandleURL = true;
|
|
@@ -645,12 +634,12 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
645
634
|
|
|
646
635
|
function click(app, selector, context) {
|
|
647
636
|
var $el = app.testHelpers.findWithAssert(selector, context);
|
|
648
|
-
_emberMetalRun_loop
|
|
637
|
+
_emberMetalRun_loop.default($el, 'mousedown');
|
|
649
638
|
|
|
650
639
|
focus($el);
|
|
651
640
|
|
|
652
|
-
_emberMetalRun_loop
|
|
653
|
-
_emberMetalRun_loop
|
|
641
|
+
_emberMetalRun_loop.default($el, 'mouseup');
|
|
642
|
+
_emberMetalRun_loop.default($el, 'click');
|
|
654
643
|
|
|
655
644
|
return app.testHelpers.wait();
|
|
656
645
|
}
|
|
@@ -659,7 +648,7 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
659
648
|
var $el = app.testHelpers.findWithAssert(selector, context);
|
|
660
649
|
var type = $el.prop('type');
|
|
661
650
|
|
|
662
|
-
_emberMetalCore
|
|
651
|
+
_emberMetalCore.default.assert('To check \'' + selector + '\', the input must be a checkbox', type === 'checkbox');
|
|
663
652
|
|
|
664
653
|
if (!$el.prop('checked')) {
|
|
665
654
|
app.testHelpers.click(selector, context);
|
|
@@ -672,7 +661,7 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
672
661
|
var $el = app.testHelpers.findWithAssert(selector, context);
|
|
673
662
|
var type = $el.prop('type');
|
|
674
663
|
|
|
675
|
-
_emberMetalCore
|
|
664
|
+
_emberMetalCore.default.assert('To uncheck \'' + selector + '\', the input must be a checkbox', type === 'checkbox');
|
|
676
665
|
|
|
677
666
|
if ($el.prop('checked')) {
|
|
678
667
|
app.testHelpers.click(selector, context);
|
|
@@ -693,7 +682,7 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
693
682
|
options = {};
|
|
694
683
|
} else if (arity === 4) {
|
|
695
684
|
// context and options are optional, so this is
|
|
696
|
-
if (typeof typeOrOptions ===
|
|
685
|
+
if (typeof typeOrOptions === 'object') {
|
|
697
686
|
// either
|
|
698
687
|
// app, selector, type, options
|
|
699
688
|
context = null;
|
|
@@ -714,9 +703,9 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
714
703
|
|
|
715
704
|
var $el = app.testHelpers.findWithAssert(selector, context);
|
|
716
705
|
|
|
717
|
-
var event = _emberViewsSystemJquery
|
|
706
|
+
var event = _emberViewsSystemJquery.default.Event(type, options);
|
|
718
707
|
|
|
719
|
-
_emberMetalRun_loop
|
|
708
|
+
_emberMetalRun_loop.default($el, 'trigger', event);
|
|
720
709
|
|
|
721
710
|
return app.testHelpers.wait();
|
|
722
711
|
}
|
|
@@ -745,8 +734,10 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
745
734
|
}
|
|
746
735
|
$el = app.testHelpers.findWithAssert(selector, context);
|
|
747
736
|
focus($el);
|
|
748
|
-
_emberMetalRun_loop
|
|
749
|
-
$el.val(text)
|
|
737
|
+
_emberMetalRun_loop.default(function () {
|
|
738
|
+
$el.val(text);
|
|
739
|
+
$el.trigger('input');
|
|
740
|
+
$el.change();
|
|
750
741
|
});
|
|
751
742
|
return app.testHelpers.wait();
|
|
752
743
|
}
|
|
@@ -754,7 +745,7 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
754
745
|
function findWithAssert(app, selector, context) {
|
|
755
746
|
var $el = app.testHelpers.find(selector, context);
|
|
756
747
|
if ($el.length === 0) {
|
|
757
|
-
throw new _emberMetalError
|
|
748
|
+
throw new _emberMetalError.default('Element ' + selector + ' not found.');
|
|
758
749
|
}
|
|
759
750
|
return $el;
|
|
760
751
|
}
|
|
@@ -772,7 +763,7 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
772
763
|
}
|
|
773
764
|
|
|
774
765
|
function wait(app, value) {
|
|
775
|
-
return new _emberRuntimeExtRsvp
|
|
766
|
+
return new _emberRuntimeExtRsvp.default.Promise(function (resolve) {
|
|
776
767
|
// Every 10ms, poll for the async thing to have finished
|
|
777
768
|
var watcher = setInterval(function () {
|
|
778
769
|
var router = app.__container__.lookup('router:main');
|
|
@@ -784,15 +775,15 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
784
775
|
}
|
|
785
776
|
|
|
786
777
|
// 2. If there are pending Ajax requests, keep polling
|
|
787
|
-
if (_emberTestingTest
|
|
778
|
+
if (_emberTestingTest.default.pendingAjaxRequests) {
|
|
788
779
|
return;
|
|
789
780
|
}
|
|
790
781
|
|
|
791
782
|
// 3. If there are scheduled timers or we are inside of a run loop, keep polling
|
|
792
|
-
if (_emberMetalRun_loop
|
|
783
|
+
if (_emberMetalRun_loop.default.hasScheduledTimers() || _emberMetalRun_loop.default.currentRunLoop) {
|
|
793
784
|
return;
|
|
794
785
|
}
|
|
795
|
-
if (_emberTestingTest
|
|
786
|
+
if (_emberTestingTest.default.waiters && _emberTestingTest.default.waiters.any(function (waiter) {
|
|
796
787
|
var context = waiter[0];
|
|
797
788
|
var callback = waiter[1];
|
|
798
789
|
return !callback.call(context);
|
|
@@ -803,7 +794,7 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
803
794
|
clearInterval(watcher);
|
|
804
795
|
|
|
805
796
|
// Synchronously resolve the promise
|
|
806
|
-
_emberMetalRun_loop
|
|
797
|
+
_emberMetalRun_loop.default(null, resolve, value);
|
|
807
798
|
}, 10);
|
|
808
799
|
});
|
|
809
800
|
}
|
|
@@ -847,7 +838,7 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
847
838
|
*/
|
|
848
839
|
asyncHelper('click', click);
|
|
849
840
|
|
|
850
|
-
|
|
841
|
+
/**
|
|
851
842
|
Simulates a key event, e.g. `keypress`, `keydown`, `keyup` with the desired keyCode
|
|
852
843
|
|
|
853
844
|
Example:
|
|
@@ -919,7 +910,7 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
919
910
|
the DOM
|
|
920
911
|
@return {Object} jQuery object representing the results of the query
|
|
921
912
|
@throws {Error} throws error if jQuery object returned has a length of 0
|
|
922
|
-
@
|
|
913
|
+
@private
|
|
923
914
|
*/
|
|
924
915
|
helper('findWithAssert', findWithAssert);
|
|
925
916
|
|
|
@@ -1057,8 +1048,37 @@ enifed("ember-testing/helpers", ["exports", "ember-metal/core", "ember-metal/pro
|
|
|
1057
1048
|
*/
|
|
1058
1049
|
asyncHelper('triggerEvent', triggerEvent);
|
|
1059
1050
|
});
|
|
1051
|
+
|
|
1052
|
+
/**
|
|
1053
|
+
Checks a checkbox. Ensures the presence of the `checked` attribute
|
|
1054
|
+
Example:
|
|
1055
|
+
```javascript
|
|
1056
|
+
check('#remember-me').then(function() {
|
|
1057
|
+
// assert something
|
|
1058
|
+
});
|
|
1059
|
+
```
|
|
1060
|
+
@method check
|
|
1061
|
+
@param {String} selector jQuery selector finding an `input[type="checkbox"]`
|
|
1062
|
+
element on the DOM to check
|
|
1063
|
+
@return {RSVP.Promise}
|
|
1064
|
+
@private
|
|
1065
|
+
*/
|
|
1066
|
+
|
|
1067
|
+
/**
|
|
1068
|
+
Unchecks a checkbox. Ensures the absence of the `checked` attribute
|
|
1069
|
+
Example:
|
|
1070
|
+
```javascript
|
|
1071
|
+
uncheck('#remember-me').then(function() {
|
|
1072
|
+
// assert something
|
|
1073
|
+
});
|
|
1074
|
+
```
|
|
1075
|
+
@method check
|
|
1076
|
+
@param {String} selector jQuery selector finding an `input[type="checkbox"]`
|
|
1077
|
+
element on the DOM to uncheck
|
|
1078
|
+
@return {RSVP.Promise}
|
|
1079
|
+
@private
|
|
1080
|
+
*/
|
|
1060
1081
|
enifed('ember-testing/initializers', ['exports', 'ember-runtime/system/lazy_load'], function (exports, _emberRuntimeSystemLazy_load) {
|
|
1061
|
-
'use strict';
|
|
1062
1082
|
|
|
1063
1083
|
var name = 'deferReadiness in `testing` mode';
|
|
1064
1084
|
|
|
@@ -1076,10 +1096,8 @@ enifed('ember-testing/initializers', ['exports', 'ember-runtime/system/lazy_load
|
|
|
1076
1096
|
}
|
|
1077
1097
|
});
|
|
1078
1098
|
});
|
|
1079
|
-
enifed(
|
|
1080
|
-
|
|
1081
|
-
|
|
1082
|
-
exports["default"] = setupForTesting;
|
|
1099
|
+
enifed('ember-testing/setup_for_testing', ['exports', 'ember-metal/core', 'ember-testing/adapters/qunit', 'ember-views/system/jquery'], function (exports, _emberMetalCore, _emberTestingAdaptersQunit, _emberViewsSystemJquery) {
|
|
1100
|
+
exports.default = setupForTesting;
|
|
1083
1101
|
|
|
1084
1102
|
var Test, requests;
|
|
1085
1103
|
|
|
@@ -1115,33 +1133,32 @@ enifed("ember-testing/setup_for_testing", ["exports", "ember-metal/core", "ember
|
|
|
1115
1133
|
Test = requireModule('ember-testing/test')['default'];
|
|
1116
1134
|
}
|
|
1117
1135
|
|
|
1118
|
-
_emberMetalCore
|
|
1136
|
+
_emberMetalCore.default.testing = true;
|
|
1119
1137
|
|
|
1120
1138
|
// if adapter is not manually set default to QUnit
|
|
1121
1139
|
if (!Test.adapter) {
|
|
1122
|
-
Test.adapter = _emberTestingAdaptersQunit
|
|
1140
|
+
Test.adapter = _emberTestingAdaptersQunit.default.create();
|
|
1123
1141
|
}
|
|
1124
1142
|
|
|
1125
1143
|
requests = [];
|
|
1126
1144
|
Test.pendingAjaxRequests = requests.length;
|
|
1127
1145
|
|
|
1128
|
-
_emberViewsSystemJquery
|
|
1129
|
-
_emberViewsSystemJquery
|
|
1130
|
-
_emberViewsSystemJquery
|
|
1131
|
-
_emberViewsSystemJquery
|
|
1146
|
+
_emberViewsSystemJquery.default(document).off('ajaxSend', incrementAjaxPendingRequests);
|
|
1147
|
+
_emberViewsSystemJquery.default(document).off('ajaxComplete', decrementAjaxPendingRequests);
|
|
1148
|
+
_emberViewsSystemJquery.default(document).on('ajaxSend', incrementAjaxPendingRequests);
|
|
1149
|
+
_emberViewsSystemJquery.default(document).on('ajaxComplete', decrementAjaxPendingRequests);
|
|
1132
1150
|
}
|
|
1133
1151
|
});
|
|
1134
1152
|
|
|
1135
1153
|
// import Test from "ember-testing/test"; // ES6TODO: fix when cycles are supported
|
|
1136
|
-
enifed(
|
|
1137
|
-
"use strict";
|
|
1154
|
+
enifed('ember-testing/support', ['exports', 'ember-metal/core', 'ember-views/system/jquery', 'ember-metal/environment'], function (exports, _emberMetalCore, _emberViewsSystemJquery, _emberMetalEnvironment) {
|
|
1138
1155
|
|
|
1139
1156
|
/**
|
|
1140
1157
|
@module ember
|
|
1141
1158
|
@submodule ember-testing
|
|
1142
1159
|
*/
|
|
1143
1160
|
|
|
1144
|
-
var $ = _emberViewsSystemJquery
|
|
1161
|
+
var $ = _emberViewsSystemJquery.default;
|
|
1145
1162
|
|
|
1146
1163
|
/**
|
|
1147
1164
|
This method creates a checkbox and triggers the click event to fire the
|
|
@@ -1155,7 +1172,7 @@ enifed("ember-testing/support", ["exports", "ember-metal/core", "ember-views/sys
|
|
|
1155
1172
|
$('<input type="checkbox">').css({ position: 'absolute', left: '-1000px', top: '-1000px' }).appendTo('body').on('click', handler).trigger('click').remove();
|
|
1156
1173
|
}
|
|
1157
1174
|
|
|
1158
|
-
if (_emberMetalEnvironment
|
|
1175
|
+
if (_emberMetalEnvironment.default.hasDOM) {
|
|
1159
1176
|
$(function () {
|
|
1160
1177
|
/*
|
|
1161
1178
|
Determine whether a checkbox checked using jQuery's "click" method will have
|
|
@@ -1169,7 +1186,7 @@ enifed("ember-testing/support", ["exports", "ember-metal/core", "ember-views/sys
|
|
|
1169
1186
|
$.event.special.click = {
|
|
1170
1187
|
// For checkbox, fire native event so checked state will be right
|
|
1171
1188
|
trigger: function () {
|
|
1172
|
-
if ($.nodeName(this,
|
|
1189
|
+
if ($.nodeName(this, 'input') && this.type === 'checkbox' && this.click) {
|
|
1173
1190
|
this.click();
|
|
1174
1191
|
return false;
|
|
1175
1192
|
}
|
|
@@ -1180,13 +1197,12 @@ enifed("ember-testing/support", ["exports", "ember-metal/core", "ember-views/sys
|
|
|
1180
1197
|
|
|
1181
1198
|
// Try again to verify that the patch took effect or blow up.
|
|
1182
1199
|
testCheckboxClick(function () {
|
|
1183
|
-
_emberMetalCore
|
|
1200
|
+
_emberMetalCore.default.warn('clicked checkboxes should be checked! the jQuery patch didn\'t work', this.checked);
|
|
1184
1201
|
});
|
|
1185
1202
|
});
|
|
1186
1203
|
}
|
|
1187
1204
|
});
|
|
1188
|
-
enifed(
|
|
1189
|
-
"use strict";
|
|
1205
|
+
enifed('ember-testing/test', ['exports', 'ember-metal/core', 'ember-metal/run_loop', 'ember-runtime/ext/rsvp', 'ember-testing/setup_for_testing', 'ember-application/system/application'], function (exports, _emberMetalCore, _emberMetalRun_loop, _emberRuntimeExtRsvp, _emberTestingSetup_for_testing, _emberApplicationSystemApplication) {
|
|
1190
1206
|
|
|
1191
1207
|
/**
|
|
1192
1208
|
@module ember
|
|
@@ -1334,7 +1350,7 @@ enifed("ember-testing/test", ["exports", "ember-metal/core", "ember-metal/run_lo
|
|
|
1334
1350
|
@param {String} label An optional string for identifying the promise.
|
|
1335
1351
|
*/
|
|
1336
1352
|
promise: function (resolver, label) {
|
|
1337
|
-
var fullLabel =
|
|
1353
|
+
var fullLabel = 'Ember.Test.promise: ' + (label || '<Unknown Promise>');
|
|
1338
1354
|
return new Test.Promise(resolver, fullLabel);
|
|
1339
1355
|
},
|
|
1340
1356
|
|
|
@@ -1397,7 +1413,7 @@ enifed("ember-testing/test", ["exports", "ember-metal/core", "ember-metal/run_lo
|
|
|
1397
1413
|
context = null;
|
|
1398
1414
|
}
|
|
1399
1415
|
if (!this.waiters) {
|
|
1400
|
-
this.waiters = _emberMetalCore
|
|
1416
|
+
this.waiters = _emberMetalCore.default.A();
|
|
1401
1417
|
}
|
|
1402
1418
|
this.waiters.push([context, callback]);
|
|
1403
1419
|
},
|
|
@@ -1418,7 +1434,7 @@ enifed("ember-testing/test", ["exports", "ember-metal/core", "ember-metal/run_lo
|
|
|
1418
1434
|
callback = context;
|
|
1419
1435
|
context = null;
|
|
1420
1436
|
}
|
|
1421
|
-
this.waiters = _emberMetalCore
|
|
1437
|
+
this.waiters = _emberMetalCore.default.A(this.waiters.filter(function (elt) {
|
|
1422
1438
|
return !(elt[0] === context && elt[1] === callback);
|
|
1423
1439
|
}));
|
|
1424
1440
|
}
|
|
@@ -1455,21 +1471,21 @@ enifed("ember-testing/test", ["exports", "ember-metal/core", "ember-metal/run_lo
|
|
|
1455
1471
|
Test.adapter.asyncStart();
|
|
1456
1472
|
return lastPromise.then(function () {
|
|
1457
1473
|
return fn.apply(app, args);
|
|
1458
|
-
})
|
|
1474
|
+
}).finally(function () {
|
|
1459
1475
|
Test.adapter.asyncEnd();
|
|
1460
1476
|
});
|
|
1461
1477
|
};
|
|
1462
1478
|
}
|
|
1463
1479
|
|
|
1464
1480
|
function run(fn) {
|
|
1465
|
-
if (!_emberMetalRun_loop
|
|
1466
|
-
return _emberMetalRun_loop
|
|
1481
|
+
if (!_emberMetalRun_loop.default.currentRunLoop) {
|
|
1482
|
+
return _emberMetalRun_loop.default(fn);
|
|
1467
1483
|
} else {
|
|
1468
1484
|
return fn();
|
|
1469
1485
|
}
|
|
1470
1486
|
}
|
|
1471
1487
|
|
|
1472
|
-
_emberApplicationSystemApplication
|
|
1488
|
+
_emberApplicationSystemApplication.default.reopen({
|
|
1473
1489
|
/**
|
|
1474
1490
|
This property contains the testing helpers for the current application. These
|
|
1475
1491
|
are created once you call `injectTestHelpers` on your `Ember.Application`
|
|
@@ -1521,7 +1537,7 @@ enifed("ember-testing/test", ["exports", "ember-metal/core", "ember-metal/run_lo
|
|
|
1521
1537
|
@public
|
|
1522
1538
|
*/
|
|
1523
1539
|
setupForTesting: function () {
|
|
1524
|
-
_emberTestingSetup_for_testing
|
|
1540
|
+
_emberTestingSetup_for_testing.default();
|
|
1525
1541
|
|
|
1526
1542
|
this.testing = true;
|
|
1527
1543
|
|
|
@@ -1563,13 +1579,6 @@ enifed("ember-testing/test", ["exports", "ember-metal/core", "ember-metal/run_lo
|
|
|
1563
1579
|
this.helperContainer = window;
|
|
1564
1580
|
}
|
|
1565
1581
|
|
|
1566
|
-
this.reopen({
|
|
1567
|
-
willDestroy: function () {
|
|
1568
|
-
this._super.apply(this, arguments);
|
|
1569
|
-
this.removeTestHelpers();
|
|
1570
|
-
}
|
|
1571
|
-
});
|
|
1572
|
-
|
|
1573
1582
|
this.testHelpers = {};
|
|
1574
1583
|
for (var name in helpers) {
|
|
1575
1584
|
this.originalMethods[name] = this.helperContainer[name];
|
|
@@ -1599,7 +1608,6 @@ enifed("ember-testing/test", ["exports", "ember-metal/core", "ember-metal/run_lo
|
|
|
1599
1608
|
|
|
1600
1609
|
for (var name in helpers) {
|
|
1601
1610
|
this.helperContainer[name] = this.originalMethods[name];
|
|
1602
|
-
delete Test.Promise.prototype[name];
|
|
1603
1611
|
delete this.testHelpers[name];
|
|
1604
1612
|
delete this.originalMethods[name];
|
|
1605
1613
|
}
|
|
@@ -1626,17 +1634,17 @@ enifed("ember-testing/test", ["exports", "ember-metal/core", "ember-metal/run_lo
|
|
|
1626
1634
|
}
|
|
1627
1635
|
|
|
1628
1636
|
Test.Promise = function () {
|
|
1629
|
-
_emberRuntimeExtRsvp
|
|
1637
|
+
_emberRuntimeExtRsvp.default.Promise.apply(this, arguments);
|
|
1630
1638
|
Test.lastPromise = this;
|
|
1631
1639
|
};
|
|
1632
1640
|
|
|
1633
|
-
Test.Promise.prototype =
|
|
1641
|
+
Test.Promise.prototype = Object.create(_emberRuntimeExtRsvp.default.Promise.prototype);
|
|
1634
1642
|
Test.Promise.prototype.constructor = Test.Promise;
|
|
1635
1643
|
Test.Promise.resolve = Test.resolve;
|
|
1636
1644
|
|
|
1637
1645
|
// Patch `then` to isolate async methods
|
|
1638
1646
|
// specifically `Ember.Test.lastPromise`
|
|
1639
|
-
var originalThen = _emberRuntimeExtRsvp
|
|
1647
|
+
var originalThen = _emberRuntimeExtRsvp.default.Promise.prototype.then;
|
|
1640
1648
|
Test.Promise.prototype.then = function (onSuccess, onFailure) {
|
|
1641
1649
|
return originalThen.call(this, function (val) {
|
|
1642
1650
|
return isolate(onSuccess, val);
|
|
@@ -1674,7 +1682,7 @@ enifed("ember-testing/test", ["exports", "ember-metal/core", "ember-metal/run_lo
|
|
|
1674
1682
|
}
|
|
1675
1683
|
}
|
|
1676
1684
|
|
|
1677
|
-
exports
|
|
1685
|
+
exports.default = Test;
|
|
1678
1686
|
});
|
|
1679
1687
|
requireModule("ember-testing");
|
|
1680
1688
|
|