Merge branch 'master' into clostridium

* master:
  ember 2 series
  Remove globals initializer
This commit is contained in:
Matthew Dillon 2015-11-17 08:13:07 -07:00
commit 4aaa9cdfb9
8 changed files with 30 additions and 49 deletions

View file

@ -1,23 +0,0 @@
import Ember from 'ember';
import { initialize } from '../../../initializers/global-variables';
import { module, test } from 'qunit';
var container, application;
module('Unit | Initializer | global variables', {
beforeEach: function() {
Ember.run(function() {
application = Ember.Application.create();
container = application.__container__;
application.deferReadiness();
});
}
});
// Replace this with your real tests.
test('it works', function(assert) {
initialize(container, application);
// you would normally confirm the results of the initializer here
assert.ok(true);
});