Fix version selector test

Author: samselikoff

addon/components/docs-header/version-selector/component.js

@@ -1,29 +1,46 @@
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 import layout from './template';
-import { sort } from '@ember/object/computed';
 import { reads } from '@ember/object/computed';
-import config from 'dummy/config/environment';
-
-const { latestVersionName, primaryBranch } = config['ember-cli-addon-docs'];
+// import config from 'dummy/config/environment';
+import { computed } from '@ember/object';
+import { A } from '@ember/array';
+import { getOwner } from '@ember/application';
 
+// const { latestVersionName, primaryBranch } = config['ember-cli-addon-docs'];
+//
 export default Component.extend({
   layout,
 
-  latestVersionName,
-  primaryBranch,
+  latestVersionName: computed(function() {
+    let config = getOwner(this).resolveRegistration('config:environment')['ember-cli-addon-docs'];
+
+    return config.latestVersionName;
+  }),
+
+  primaryBranch: computed(function() {
+    let config = getOwner(this).resolveRegistration('config:environment')['ember-cli-addon-docs'];
+
+    return config.primaryBranch;
+  }),
 
   projectVersion: service(),
   'on-close'() {},
 
   currentVersion: reads('projectVersion.currentVersion'),
 
-  sortedVersions: sort('projectVersion.versions', function(a, b) {
-    if ([latestVersionName, primaryBranch].includes(a.key) || [latestVersionName, primaryBranch].includes(b.key) ) {
-      return a.key > b.key;
-    } else {
-      return a.key < b.key;
-    }
+  sortedVersions: computed('projectVersion.versions', 'latestVersionName', 'primaryBranch', function() {
+    let latestVersionName = this.get('latestVersionName');
+    let primaryBranch = this.get('primaryBranch');
+    let versions = A(this.get('projectVersion.versions'));
+    let latest = versions.findBy('key', latestVersionName);
+    let primary = versions.findBy('key', primaryBranch);
+
+    return [
+      latest,
+      primary,
+      ...versions.removeObjects([ latest, primary ]).sortBy('key')
+    ].filter(Boolean);
   }),
 
   actions: {

tests/acceptance/version-selector-test.js

@@ -105,11 +105,11 @@ module('Acceptance | Version selector test', function(hooks) {
     let oldPrimaryBranch;
     hooks.beforeEach(function() {
       oldPrimaryBranch = config.primaryBranch;
-      config.primaryBranch = 'develop';
+      config['ember-cli-addon-docs'].primaryBranch = 'develop';
     });
 
     hooks.afterEach(function() {
-      config.primaryBranch = oldPrimaryBranch;
+      config['ember-cli-addon-docs'].primaryBranch = oldPrimaryBranch;
     });
 
     test(`the version selector honors the primary branch`, async function(assert) {

tests/dummy/app/app.js

@@ -2,6 +2,7 @@ import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
+import { registerWarnHandler } from '@ember/debug';
 
 // BEGIN-SNIPPET sample-snippet.js
 const App = Application.extend({
@@ -13,4 +14,10 @@ const App = Application.extend({
 
 loadInitializers(App, config.modulePrefix);
 
+registerWarnHandler(function(message, { id }, next) {
+  if (id !== 'ember-test-selectors.empty-tag-name') {
+    next(...arguments);
+  }
+});
+
 export default App;