dist/ember-testing.js in ember-source-1.13.0 vs dist/ember-testing.js in ember-source-1.13.1
- old
+ new
@@ -3,11 +3,11 @@
* @copyright Copyright 2011-2015 Tilde Inc. and contributors
* Portions Copyright 2006-2011 Strobe Inc.
* Portions Copyright 2008-2011 Apple Inc. All rights reserved.
* @license Licensed under MIT license
* See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version 1.13.0
+ * @version 1.13.1
*/
(function() {
var enifed, requireModule, eriuqer, requirejs, Ember;
var mainContext = this;
@@ -582,19 +582,25 @@
}
}
function visit(app, url) {
var router = app.__container__.lookup("router:main");
+ var shouldHandleURL = false;
+
app.boot().then(function () {
router.location.setURL(url);
+
+ if (shouldHandleURL) {
+ (0, _emberMetalRun_loop.default)(app.__deprecatedInstance__, "handleURL", url);
+ }
});
if (app._readinessDeferrals > 0) {
router["initialURL"] = url;
(0, _emberMetalRun_loop.default)(app, "advanceReadiness");
delete router["initialURL"];
} else {
- (0, _emberMetalRun_loop.default)(app.__deprecatedInstance__, "handleURL", url);
+ shouldHandleURL = true;
}
return app.testHelpers.wait();
}
\ No newline at end of file