remove initializer, get config from environment

addon/services/apollo.js

@@ -56,8 +56,11 @@ export default Service.extend({
   client: null,
   apiURL: alias('options.apiURL'),
 
-  // options are injected by an initializer and configured in your environment.js.
-  options: { apiURL: null },
+  // options are configured in your environment.js.
+  options: computed(function() {
+    const config = getOwner(this).resolveRegistration('config:environment');
+    return config.apollo;
+  }),
 
   init() {
     this._super(...arguments);

tests/unit/mixins/component-query-manager-test.js

@@ -7,13 +7,7 @@ const { getOwner, Object: EmberObject } = Ember;
 moduleFor(
   'mixin:component-query-manager',
   'Unit | Mixin | component query manager', {
-    needs: ['service:apollo'],
-    beforeEach() {
-      // needed to set up config since initializers don't run here
-      const options = { apiURL: 'https://test.example/graphql' };
-      this.register('config:apollo', options, { instantiate: false });
-      getOwner(this).inject('service:apollo', 'options', 'config:apollo');
-    },
+    needs: ['config:environment', 'service:apollo'],
     subject() {
       let TestObject = EmberObject.extend(ComponentQueryManagerMixin);
       this.register('test-container:test-object', TestObject);

tests/unit/mixins/route-query-manager-test.js

@@ -8,13 +8,7 @@ moduleFor(
   'mixin:route-query-manager',
   'Unit | Mixin | route query manager',
   {
-    needs: ['service:apollo'],
-    beforeEach() {
-      // needed to set up config since initializers don't run here
-      const options = { apiURL: 'https://test.example/graphql' };
-      this.register('config:apollo', options, { instantiate: false });
-      getOwner(this).inject('service:apollo', 'options', 'config:apollo');
-    },
+    needs: ['config:environment', 'service:apollo'],
     subject() {
       let TestObject = EmberObject.extend(RouteQueryManagerMixin);
       this.register('test-container:test-object', TestObject);

tests/unit/services/apollo-test.js

@@ -4,38 +4,29 @@ import ApolloService from 'ember-apollo-client/services/apollo';
 
 const { computed } = Ember;
 
-let options;
-
 moduleFor('service:apollo', 'Unit | Service | apollo', {
-  beforeEach() {
-    options = {
-      apiURL: 'https://test.example/graphql',
-    };
-  },
+  needs: ['config:environment'],
 });
 
 test('it exists', function(assert) {
+  let options = {
+    apiURL: 'https://test.example/graphql',
+  };
   let service = this.subject({ options });
   assert.ok(service);
 });
 
 test('it uses clientOptions', function(assert) {
   let customDataIdFromObject = o => o.name;
-  let OverriddenService = ApolloService.extend({
-    // Need this here because apollo requires a uri, but our initializer doesn't
-    // run in unit tests.
-    options: {
-      apiURL: 'https://this-should-be-set-from-environment.example',
-    },
-
+  this.register('service:overridden-apollo', ApolloService.extend({
     // Override the clientOptions.
     clientOptions: computed(function() {
       let opts = this._super(...arguments);
       opts.dataIdFromObject = customDataIdFromObject;
       return opts;
     }),
-  });
-  let service = OverriddenService.create({});
+  }));
+  let service = this.container.lookup('service:overridden-apollo')
 
   // make sure the override was used.
   assert.equal(service.get('apollo.dataIdFromObject', customDataIdFromObject));