Remove usage of this.container completely.

.travis.yml

@@ -12,24 +12,15 @@ cache:
 env:
   # - EMBER_TRY_SCENARIO=default
   # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
-  - EMBER_TRY_SCENARIO=ember-1.13
-  - EMBER_TRY_SCENARIO=ember-lts-2.4
   - EMBER_TRY_SCENARIO=ember-release
+  - EMBER_TRY_SCENARIO=ember-lts-2.4
+  - EMBER_TRY_SCENARIO=ember-lts-2.8
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
-  - EMBER_TRY_SCENARIO=ember-2.0.3
-  - EMBER_TRY_SCENARIO=ember-2.1.2
-  - EMBER_TRY_SCENARIO=ember-2.2.2
-  - EMBER_TRY_SCENARIO=ember-2.3.1
-  - EMBER_TRY_SCENARIO=ember-2.5.1
-  - EMBER_TRY_SCENARIO=ember-2.6.2
-  - EMBER_TRY_SCENARIO=ember-2.7.3
-  - EMBER_TRY_SCENARIO=ember-2.8.2
 
 matrix:
   fast_finish: true
   allow_failures:
-    - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:

addon/adapters/application.js

@@ -41,7 +41,7 @@ export default Ember.Object.extend(FetchMixin, Evented, {
   */
   url: Ember.computed('type', {
     get() {
-      const config = this.container.lookupFactory('config:environment');
+      const config = getOwner(this).resolveRegistration('config:environment');
       const enclosingSlashes = /^\/|\/$/g;
       const host = config.APP.API_HOST.replace(enclosingSlashes, '');
       const path = config.APP.API_PATH.replace(enclosingSlashes, '');
@@ -137,8 +137,7 @@ export default Ember.Object.extend(FetchMixin, Evented, {
       type = resource.type;
     }
     // use resource's service if in container, otherwise use this service to fetch
-    let owner = (typeof getOwner === 'function') ? getOwner(this) : this.container;
-    let service = owner.lookup('service:' + pluralize(type)) || this;
+    let service = getOwner(this).lookup('service:' + pluralize(type)) || this;
     url = this.fetchUrl(url);
     return service.fetch(url, { method: 'GET' });
   },

addon/mixins/adapter-api-host-proxy.js

@@ -4,6 +4,8 @@
 **/
 import Ember from 'ember';
 
+const { getOwner } = Ember;
+
 /**
   Mixin to provide url rewrite for proxied api. Mostly used as example.
 
@@ -12,7 +14,7 @@ import Ember from 'ember';
 */
 export default Ember.Mixin.create({
 	fetchUrl: function(url) {
-    const config = this.container.lookupFactory('config:environment');
+    const config = getOwner(this).resolveRegistration('config:environment');
     const proxy  = config.APP.API_HOST_PROXY;
     const host   = config.APP.API_HOST;
     if (proxy && host) {

addon/models/resource.js

@@ -21,8 +21,7 @@ const { getOwner, computed, Logger } = Ember;
   use the owner API or the container to `lookup` the factory, for example:
 
   ```js
-  let owner = (typeof Ember.getOwner === 'function') ? Ember.getOwner(this) : this.container;
-  let model = owner.lookup('model:entity').create({ attributes: { key: value } });
+  let model = Ember.getOwner(this).lookup('model:entity').create({ attributes: { key: value } });
   ```
 
   See <http://jsonapi.org/format/#document-resource-objects>
@@ -208,8 +207,7 @@ const Resource = Ember.Object.extend(ResourceOperationsMixin, {
     let data = this.get(key);
     let type = pluralize(meta.type);
     let identifier = { type: type, id: id };
-    let owner = (typeof getOwner === 'function') ? getOwner(this) : this.container;
-    let resource = owner.lookup(`service:${type}`).cacheLookup(id);
+    let resource = getOwner(this).lookup(`service:${type}`).cacheLookup(id);
     if (Array.isArray(data)) {
       this._relationAdded(related, identifier);
       data.push(identifier);
@@ -558,7 +556,7 @@ Resource.reopenClass({
 
     ```
     model() {
-      let owner = (typeof Ember.getOwner === 'function') ? Ember.getOwner(this) : this.container;
+      let owner = Ember.getOwner(this);
       return owner.lookup('model:post').create({
         attributes: {
           title: 'The JSON API 1.0 Spec Rocks!'
@@ -604,12 +602,12 @@ Resource.reopenClass({
     if (!type) {
       Logger.warn(msg + '#create called, instead you should first use ' + msg + '.extend({type:"entity"})');
     } else {
-      let owner = (typeof getOwner === 'function') ? getOwner(instance) : instance.container;
+      let owner = getOwner(instance);
       if (owner) {
         useComputedPropsMetaToSetupRelationships(owner, factory, instance);
       } else {
         msg += '#create should only be called from a container lookup (relationships not setup), instead use: \n';
-        msg += "`let owner = (typeof Ember.getOwner === 'function') ? Ember.getOwner(this) : this.container; \n";
+        msg += "`let owner = Ember.getOwner(this); \n";
         msg += 'owner.lookup("' + factory + '").create()`';
         Logger.warn(msg);
       }

addon/serializers/application.js

@@ -214,8 +214,7 @@ export default Ember.Object.extend({
     if (!related) { return; }
     let resource, service;
     for (let i = 0; i < related.length; i++) {
-      let owner = (typeof Ember.getOwner === 'function') ? Ember.getOwner(this) : this.container;
-      service = owner.lookup('service:' + pluralize(related[i].type));
+      service = Ember.getOwner(this).lookup('service:' + pluralize(related[i].type));
       if (service && service.cache && service.cache.data) {
         resource = service.serializer.deserializeResource(related[i]);
         service.cacheResource({ meta: resp.meta, data: resource, headers: resp.headers});
@@ -298,8 +297,7 @@ export default Ember.Object.extend({
     @return {Function} factory for creating resource instances
   */
   _lookupFactory(type) {
-    let owner = (typeof Ember.getOwner === 'function') ? Ember.getOwner(this) : this.container;
-    return owner.lookup('model:' + singularize(type));
+    return Ember.getOwner(this).lookup('model:' + singularize(type));
   }
 });
 

blueprints/jsonapi-model-test/files/tests/unit/__path__/__test__.js

@@ -15,7 +15,7 @@ moduleFor('model:<%= dasherizedModuleName %>', '<%= friendlyDescription %>', {
 });
 
 test('<%= resource %> has "type" property set to: <%= resource %>', function(assert) {
-  let owner = (typeof Ember.getOwner === 'function') ? Ember.getOwner(this) : this.container;
+  let owner = Ember.getOwner(this);
   let model = owner.lookup('model:<%= entity %>').create();
   assert.equal(model.get('type'), '<%= resource %>', 'resource has expected type');
 });

blueprints/jsonapi-serializer-test/files/tests/unit/__path__/__test__.js

@@ -4,11 +4,7 @@ import Ember from 'ember';
 
 moduleFor('serializer:<%= entity %>', '<%= friendlyTestDescription %>', {
   beforeEach() {
-    if (typeof Ember.setOwner === 'function') {
-      Ember.setOwner(Resource.prototype, Ember.getOwner(this));
-    } else {
-      Resource.prototype.container = this.container;
-    }
+    Ember.setOwner(Resource.prototype, Ember.getOwner(this));
     let opts = { instantiate: false, singleton: false };
     this.registry.register('model:<%= entity %>', Resource, opts);
   },
@@ -19,7 +15,7 @@ moduleFor('serializer:<%= entity %>', '<%= friendlyTestDescription %>', {
 
 // Replace this with your real tests.
 test('it serializes resources', function(assert) {
-  let owner = (typeof Ember.getOwner === 'function') ? Ember.getOwner(this) : this.container;
+  let owner = Ember.getOwner(this);
   let resource = owner.lookup('model:<%= entity %>').create();
   let serializer = this.subject();
   var serializedResource = serializer.serialize(resource);

config/ember-try.js

@@ -1,24 +1,24 @@
 module.exports = {
   scenarios: [
     {
-      name: 'ember-1.13',
+      name: 'ember-lts-2.4',
       bower: {
         dependencies: {
-          'ember': '~1.13.0'
+          'ember': 'components/ember#lts-2-4'
         },
         resolutions: {
-          'ember': '~1.13.0'
+          'ember': 'lts-2-4'
         }
       }
     },
     {
-      name: 'ember-lts-2.4',
+      name: 'ember-lts-2.8',
       bower: {
         dependencies: {
-          'ember': 'components/ember#lts-2-4'
+          'ember': 'components/ember#lts-2-8'
         },
         resolutions: {
-          'ember': 'lts-2-4'
+          'ember': 'lts-2-8'
         }
       }
     },
@@ -54,89 +54,6 @@ module.exports = {
           'ember': 'canary'
         }
       }
-    },
-    {
-      name: 'ember-2.0.3',
-      bower: {
-        dependencies: {
-          'ember': '2.0.3'
-        },
-        resolutions: {
-          'ember': '2.0.3'
-        }
-      }
-    },
-    {
-      name: 'ember-2.1.2',
-      bower: {
-        dependencies: {
-          'ember': '2.1.2'
-        },
-        resolutions: {
-          'ember': '2.1.2'
-        }
-      }
-    },
-    {
-      name: 'ember-2.2.2',
-      dependencies: {
-        'ember': '2.2.2'
-      }
-    },
-    {
-      name: 'ember-2.3.1',
-      bower: {
-        dependencies: {
-          'ember': '2.3.1'
-        },
-        resolutions: {
-          'ember': '2.3.1'
-        }
-      }
-    },
-    {
-      name: 'ember-2.5.1',
-      bower: {
-        dependencies: {
-          'ember': '2.5.1'
-        },
-        resolutions: {
-          'ember': '2.5.1'
-        }
-     }
-    },
-    {
-      name: 'ember-2.6.2',
-      bower: {
-        dependencies: {
-          'ember': '2.6.2'
-        },
-        resolutions: {
-          'ember': '2.6.2'
-        }
-      }
-    },
-    {
-      name: 'ember-2.7.3',
-      bower: {
-        dependencies: {
-          'ember': '2.7.3'
-        },
-        resolutions: {
-          'ember': '2.7.3'
-        }
-      }
-    },
-    {
-      name: 'ember-2.8.2',
-      bower: {
-        dependencies: {
-          'ember': '2.8.2'
-        },
-        resolutions: {
-          'ember': '2.8.2'
-        }
-      }
     }
   ]
 };

tests/dummy/app/routes/admin/create.js

@@ -8,7 +8,7 @@ export default Ember.Route.extend({
   },
 
   model() {
-    let owner = (typeof Ember.getOwner === 'function') ? Ember.getOwner(this) : this.container;
+    let owner = Ember.getOwner(this);
     return owner.lookup('model:post').create({
       isNew: true,
       attributes: { date: new Date() }

tests/helpers/resources.js

@@ -48,13 +48,14 @@ function setupOwner() {
   let ogLookup, ogLookupFactory;
   if (typeof Ember.getOwner === 'function') {
     this.container = this.owner || Ember.getOwner(this);
-    ogLookup = this.container.lookup;
+    ogLookup = Ember.getOwner(this).lookup;
     ogLookupFactory = this.container._lookupFactory;
   } else {
     ogLookup = this._ogContainer.lookup;
     ogLookupFactory = this._ogContainer.lookupFactory;
   }
-  this.container.lookup = function(factory) {
+
+  Ember.getOwner(this).lookup = function(factory) {
     if (factory.match(/^model/) !== null) {
       return ogLookupFactory.call(this, factory);
     } else {