diff --git a/app/router.js b/app/router.js index d3c7b07a..036ad592 100644 --- a/app/router.js +++ b/app/router.js @@ -15,7 +15,7 @@ var Router = Ember.Router.extend({ // we should probably think about a more general way to // do this, location should not know about auth status return Location.create({ - auth: this.container.lookup('service:auth') + auth: Ember.getOwner(this).lookup('service:auth') }); } }.property(), diff --git a/app/services/auth.js b/app/services/auth.js index fa74fb06..5aff35cd 100644 --- a/app/services/auth.js +++ b/app/services/auth.js @@ -1,4 +1,5 @@ import config from 'travis/config/environment'; +import getOwner from 'ember-getowner-polyfill'; import Ember from 'ember'; export default Ember.Service.extend({ @@ -214,7 +215,7 @@ export default Ember.Service.extend({ // as a direct response to either manual sign in or autoSignIn (right now // we treat both cases behave the same in terms of sent events which I think // makes it more complicated than it should be). - router = this.container.lookup('router:main'); + router = Ember.getOwner(this).lookup('router:main'); try { return router.send(name); } catch (error1) { diff --git a/bower.json b/bower.json index b18cab6c..cafe9951 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "travis", "dependencies": { - "ember": "2.2.1", + "ember": "2.3.2", "ember-cli-shims": "0.1.1", "ember-cli-test-loader": "0.2.2", "ember-load-initializers": "0.1.7", diff --git a/package.json b/package.json index 41987da7..2b89d43f 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "ember-cli-babel": "^5.1.6", "ember-cli-dependency-checker": "^1.2.0", "ember-cli-deprecation-workflow": "0.1.6", - "ember-cli-document-title": "0.2.0", + "ember-cli-document-title": "0.3.1", "ember-cli-htmlbars": "^1.0.3", "ember-cli-htmlbars-inline-precompile": "^0.3.1", "ember-cli-inject-live-reload": "^1.4.0", diff --git a/tests/integration/components/add-env-var-test.js b/tests/integration/components/add-env-var-test.js index 4b0bb79e..4ccaf530 100644 --- a/tests/integration/components/add-env-var-test.js +++ b/tests/integration/components/add-env-var-test.js @@ -3,7 +3,7 @@ import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import fillIn from '../../helpers/fill-in'; import DS from 'ember-data'; - +import getOwner from 'ember-getowner-polyfill'; moduleForComponent('add-env-var', 'Integration | Component | add env-var', { integration: true @@ -14,7 +14,7 @@ test('it adds an env var on submit', function(assert) { // this shouldn't be needed, probably some bug in tests setup with new ember-data this.registry.register('transform:boolean', DS.BooleanTransform); - var store = this.container.lookup('service:store'); + var store = Ember.getOwner(this).lookup('service:store'); assert.equal(store.peekAll('envVar').get('length'), 0, 'precond: store should be empty'); var repo; @@ -66,7 +66,7 @@ test('it adds a public env var on submit', function(assert) { assert.expect(6); this.registry.register('transform:boolean', DS.BooleanTransform); - var store = this.container.lookup('service:store'); + var store = Ember.getOwner(this).lookup('service:store'); assert.equal(store.peekAll('envVar').get('length'), 0, 'precond: store should be empty'); var repo; diff --git a/tests/integration/components/add-ssh-key-test.js b/tests/integration/components/add-ssh-key-test.js index d221a234..e7c4d8df 100644 --- a/tests/integration/components/add-ssh-key-test.js +++ b/tests/integration/components/add-ssh-key-test.js @@ -3,6 +3,7 @@ import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import fillIn from '../../helpers/fill-in'; import DS from 'ember-data'; +import getOwner from 'ember-getowner-polyfill'; moduleForComponent('add-ssh-key', 'Integration | Component | add ssh-key', { integration: true @@ -12,7 +13,7 @@ test('it adds an ssh key on submit', function(assert) { assert.expect(6); this.registry.register('transform:boolean', DS.BooleanTransform); - var store = this.container.lookup('service:store'); + var store = Ember.getOwner(this).lookup('service:store'); var repo; Ember.run(function() { @@ -47,7 +48,7 @@ test('it throws an error if value for ssh key is blank', function(assert) { assert.expect(5); this.registry.register('transform:boolean', DS.BooleanTransform); - var store = this.container.lookup('service:store'); + var store = Ember.getOwner(this).lookup('service:store'); var repo; Ember.run(function() { diff --git a/tests/integration/components/env-var-test.js b/tests/integration/components/env-var-test.js index 9b8ed0c2..808e99ed 100644 --- a/tests/integration/components/env-var-test.js +++ b/tests/integration/components/env-var-test.js @@ -3,7 +3,7 @@ import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import fillIn from '../../helpers/fill-in'; import DS from 'ember-data'; - +import getOwner from 'ember-getowner-polyfill'; moduleForComponent('env-var', 'Integration | Component | env-var', { integration: true @@ -13,7 +13,7 @@ test('it renders an env-var with private value', function(assert) { assert.expect(2); this.registry.register('transform:boolean', DS.BooleanTransform); - var store = this.container.lookup('service:store'); + var store = Ember.getOwner(this).lookup('service:store'); Ember.run(() => { var envVar = store.push({data: { id: 1, type: 'env-var', attributes: { name: 'foo', value: 'bar', public: false}}}); this.set('envVar', envVar); @@ -30,7 +30,7 @@ test('it renders an env-var with public value', function(assert) { assert.expect(2); this.registry.register('transform:boolean', DS.BooleanTransform); - var store = this.container.lookup('service:store'); + var store = Ember.getOwner(this).lookup('service:store'); Ember.run(() => { var envVar = store.push({data: { id: 1, type: 'env-var', attributes: { name: 'foo', value: 'bar', public: true}}}); this.set('envVar', envVar); diff --git a/tests/integration/components/ssh-key-test.js b/tests/integration/components/ssh-key-test.js index ffb52fc1..4b08fdc1 100644 --- a/tests/integration/components/ssh-key-test.js +++ b/tests/integration/components/ssh-key-test.js @@ -2,7 +2,7 @@ import Ember from 'ember'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import fillIn from '../../helpers/fill-in'; - +import getOwner from 'ember-getowner-polyfill'; moduleForComponent('ssh-key', 'Integration | Component | ssh-key', { integration: true @@ -11,7 +11,7 @@ moduleForComponent('ssh-key', 'Integration | Component | ssh-key', { test('it renders the default ssh key if no custom key is set', function(assert) { assert.expect(2); - var store = this.container.lookup('service:store'); + var store = Ember.getOwner(this).lookup('service:store'); var key = Ember.Object.create({fingerprint: 'fingerprint'}); this.set('key', key); @@ -25,7 +25,7 @@ test('it renders the default ssh key if no custom key is set', function(assert) test('it renders the custom ssh key if custom key is set', function(assert) { assert.expect(2); - var store = this.container.lookup('service:store'); + var store = Ember.getOwner(this).lookup('service:store'); var key; Ember.run(function() { @@ -44,7 +44,7 @@ test('it renders the custom ssh key if custom key is set', function(assert) { test('it deletes a custom key if permissions are right', function(assert) { assert.expect(1); - var store = this.container.lookup('service:store'); + var store = Ember.getOwner(this).lookup('service:store'); var key; Ember.run(function() { @@ -67,7 +67,7 @@ test('it deletes a custom key if permissions are right', function(assert) { test('it does not delete the custom key if permissions are insufficient', function(assert) { assert.expect(1); - var store = this.container.lookup('service:store'); + var store = Ember.getOwner(this).lookup('service:store'); var key; Ember.run(function() {