Skip to content

Commit

Permalink
Merge pull request #2992 from emberjs/registry_detection
Browse files Browse the repository at this point in the history
Feature detect Ember.Registry rather than relying on version numbers
  • Loading branch information
igorT committed Apr 12, 2015
2 parents 7e4f137 + 474644f commit 40cce02
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions tests/ember-configuration.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,10 @@

window.setupStore = function(options) {
var container, registry;
var emberChannel = QUnit.urlParams.emberchannel || "release";
var env = {};
options = options || {};

if (emberChannel.match(/^beta|canary$/i)) {
if (Ember.Registry) {
registry = env.registry = new Ember.Registry();
container = env.container = registry.container();
} else {
Expand Down

0 comments on commit 40cce02

Please sign in to comment.