Merge pull request #1103 from emberjs/refactor-acceptance-tests

Refactor acceptance tests

app/adapters/basic.js

@@ -11,7 +11,7 @@
  * });
  * ```
  */
-import EmberObject, { computed } from '@ember/object';
+import EmberObject from '@ember/object';
 
 import config from 'ember-inspector/config/environment';
 
@@ -24,6 +24,7 @@ export default EmberObject.extend({
    */
   init() {
     this._super(...arguments);
+    this._messageCallbacks = [];
     this._checkVersion();
   },
 
@@ -85,11 +86,9 @@ export default EmberObject.extend({
     when a message from EmberDebug is received
   **/
   onMessageReceived(callback) {
-    this._messageCallbacks.pushObject(callback);
+    this._messageCallbacks.push(callback);
   },
 
-  _messageCallbacks: computed(function() { return []; }),
-
   _messageReceived(message) {
     this._messageCallbacks.forEach(callback => {
       callback(message);

app/components/app-picker.js

@@ -1,16 +1,11 @@
 import Component from '@ember/component';
-import { observer } from '@ember/object';
 import { alias, reads } from '@ember/object/computed';
 
 export default Component.extend({
   classNames: ['app-picker'],
 
-  apps: alias('port.detectedApplications.[]'),
-  selectedApp: reads('port.applicationId'),
-
-  selectedDidChange: observer('selectedApp', function() {
-    this.port.set('applicationId', this.selectedApp);
-  }),
+  apps: alias('port.detectedApplications'),
+  selectedAppId: reads('port.applicationId'),
 
   init() {
     this._super(...arguments);
@@ -19,8 +14,7 @@ export default Component.extend({
 
   actions: {
     selectApp(applicationId) {
-      this.set('selectedApp', applicationId);
-      this.port.send('app-selected', { applicationId });
+      this.port.selectApplication(applicationId);
     }
   }
 });

app/controllers/component-tree.js

@@ -98,7 +98,6 @@ export default Controller.extend({
    */
   pinnedObjectId: null,
   inspectingViews: false,
-  viewTreeLoaded: false,
 
   /**
    * Bound to the search field to filter the component list.

app/controllers/deprecations.js

@@ -1,16 +1,20 @@
-import { action, get, computed } from '@ember/object';
+import { action, computed } from '@ember/object';
 import Controller from '@ember/controller';
 import debounceComputed from 'ember-inspector/computed/debounce';
 import searchMatch from 'ember-inspector/utils/search-match';
 
 export default Controller.extend({
+  init() {
+    this._super(...arguments);
+    this.deprecations = [];
+  },
+
   search: null,
   searchValue: debounceComputed('search', 300),
   toggleDeprecationWorkflow: false,
 
-  filtered: computed('model.@each.message', 'search', function() {
-    return this.model
-      .filter((item) => searchMatch(get(item, 'message'), this.search));
+  filtered: computed('deprecations.@each.message', 'search', function() {
+    return this.deprecations.filter(item => searchMatch(item.message, this.search));
   }),
 
   openResource: action(function(item) {

app/initializers/setup.js

@@ -1,20 +1,13 @@
-import { typeOf } from '@ember/utils';
 import config from 'ember-inspector/config/environment';
 import PromiseAssembler from "ember-inspector/libs/promise-assembler";
 
 export default {
   name: 'setup',
   initialize(instance) {
-    // {{EMBER_DIST}} is replaced by the build process.
-    instance.adapter = '{{EMBER_DIST}}';
+    // {{EMBER_DIST}} is replaced by the build process (basic, chrome, etc)
+    let Adapter = instance.resolveRegistration(`adapter:{{EMBER_DIST}}`);
 
     // register and inject adapter
-    let Adapter;
-    if (typeOf(instance.adapter) === 'string') {
-      Adapter = instance.resolveRegistration(`adapter:${instance.adapter}`);
-    } else {
-      Adapter = instance.adapter;
-    }
     register(instance, 'adapter:main', Adapter);
     instance.inject('controller:deprecations', 'adapter', 'adapter:main');
     instance.inject('route:application', 'adapter', 'adapter:main');

app/routes/app-detected.js

@@ -19,6 +19,7 @@ export default Route.extend({
       this.applicationBooted = ({ booted }) => {
         if (booted) {
           port.off('general:applicationBooted', this.applicationBooted);
+          this.applicationBooted = null;
           resolve();
         }
       };
@@ -27,6 +28,10 @@ export default Route.extend({
     });
   },
 
+  afterModel() {
+    this.port.send('deprecation:getCount');
+  },
+
   /**
    * Sets up a listener such that if ember-debug resets, the inspector app also
    * resets.

app/routes/application.js

@@ -19,7 +19,6 @@ export default Route.extend({
     port.on('objectInspector:droppedObject', this, this.droppedObject);
     port.on('deprecation:count', this, this.setDeprecationCount);
     port.on('view:inspectComponent', this, this.inspectComponent);
-    port.send('deprecation:getCount');
   },
 
   deactivate() {

app/routes/component-tree.js

@@ -1,4 +1,5 @@
-import TabRoute from "ember-inspector/routes/tab";
+import { Promise } from 'rsvp';
+import TabRoute from 'ember-inspector/routes/tab';
 
 export default TabRoute.extend({
   queryParams: {
@@ -8,21 +9,27 @@ export default TabRoute.extend({
   },
 
   model() {
-    return [];
+    return new Promise(resolve => {
+      this.port.one('view:viewTree', resolve);
+      this.port.send('view:getTree');
+    });
   },
 
-  setupController() {
+  setupController(controller, message) {
+    this._super(...arguments);
+    this.setViewTree(message);
+  },
+
+  activate() {
     this._super(...arguments);
     this.port.on('view:viewTree', this, this.setViewTree);
     this.port.on('view:stopInspecting', this, this.stopInspecting);
     this.port.on('view:startInspecting', this, this.startInspecting);
     this.port.on('view:inspectDOMNode', this, this.inspectDOMNode);
-
-    this.set('controller.viewTreeLoaded', false);
-    this.port.send('view:getTree');
   },
 
   deactivate() {
+    this._super(...arguments);
     this.port.off('view:viewTree', this, this.setViewTree);
     this.port.off('view:stopInspecting', this, this.stopInspecting);
     this.port.off('view:startInspecting', this, this.startInspecting);
@@ -31,7 +38,6 @@ export default TabRoute.extend({
 
   setViewTree(options) {
     this.set('controller.viewTree', options.tree);
-    this.set('controller.viewTreeLoaded', true);
 
     // If we're waiting for view tree to inspect a component
     const componentToInspect = this.get('controller.pinnedObjectId');
@@ -41,10 +47,6 @@ export default TabRoute.extend({
   },
 
   inspectComponent(viewId) {
-    if (!this.get('controller.viewTreeLoaded')) {
-      return;
-    }
-
     this.controller.inspect(viewId);
   },
 

app/routes/deprecations.js

@@ -1,32 +1,39 @@
-import { set } from '@ember/object';
-import TabRoute from "ember-inspector/routes/tab";
+import { Promise } from 'rsvp';
+import { setProperties } from '@ember/object';
+import TabRoute from 'ember-inspector/routes/tab';
 
 export default TabRoute.extend({
-  setupController() {
-    let port = this.port;
-    port.on('deprecation:deprecationsAdded', this, this.deprecationsAdded);
-    port.send('deprecation:watch');
+  model() {
+    return new Promise(resolve => {
+      this.port.one('deprecation:deprecationsAdded', resolve);
+      this.port.send('deprecation:watch');
+    });
+  },
+
+  setupController(controller, message) {
     this._super(...arguments);
+    this.deprecationsAdded(message);
   },
 
-  model() {
-    return [];
+  activate() {
+    this._super(...arguments);
+    this.port.on('deprecation:deprecationsAdded', this, this.deprecationsAdded);
   },
 
   deactivate() {
+    this._super(...arguments);
     this.port.off('deprecation:deprecationsAdded', this, this.deprecationsAdded);
   },
 
   deprecationsAdded(message) {
-    let model = this.currentModel;
+    let { deprecations } = this.controller;
+
     message.deprecations.forEach(item => {
-      let record = model.findBy('id', item.id);
+      let record = deprecations.findBy('id', item.id);
       if (record) {
-        set(record, 'count', item.count);
-        set(record, 'sources', item.sources);
-        set(record, 'url', item.url);
+        setProperties(record, item);
       } else {
-        model.pushObject(item);
+        deprecations.pushObject(item);
       }
     });
   },
@@ -36,6 +43,5 @@ export default TabRoute.extend({
       this.port.send('deprecation:clear');
       this.currentModel.clear();
     }
-
   }
 });

app/services/port.js

@@ -1,3 +1,4 @@
+import { set } from '@ember/object';
 import Evented from '@ember/object/evented';
 import Service from '@ember/service';
 
@@ -9,53 +10,49 @@ export default Service.extend(Evented, {
     this._super(...arguments);
 
     /*
-     * An array of objects of the form:
-     * { applicationId, applicationName }
+     * A dictionary of the form:
+     * { applicationId: applicationName }
      */
-    this.detectedApplications = [];
+    this.detectedApplications = {};
+    this.applicationId = undefined;
+    this.applicationName = undefined;
 
     this.adapter.onMessageReceived(message => {
       if (message.type === 'apps-loaded') {
-        message.apps.forEach(app => {
-          if (!this.detectedApplications.mapBy('applicationId').includes(app.applicationId)) {
-            this.detectedApplications.pushObject(app);
-          }
-        });
-      }
-    });
-
-    this.adapter.onMessageReceived(message => {
-      const { applicationId, applicationName } = message;
-
-      if (message.type === 'app-list') {
-        const apps = JSON.parse(message.appList);
-        apps.forEach((app) => {
-          if (!this.detectedApplications.mapBy('applicationId').includes(app.applicationId)) {
-            this.detectedApplications.push(app);
-          }
+        message.apps.forEach(({ applicationId, applicationName }) => {
+          set(this.detectedApplications, applicationId, applicationName);
         });
 
         return;
       }
 
+      let { applicationId, applicationName } = message;
+
       if (!applicationId) {
         return;
       }
 
-      if (!this.applicationId) {
-        this.set('applicationId', applicationId);
-      }
+      // save the application, in case we haven't seen it yet
+      set(this.detectedApplications, applicationId, applicationName);
 
-      // save list of application ids
-      if (!this.detectedApplications.mapBy('applicationId').includes(applicationId)) {
-        this.detectedApplications.pushObject({ applicationId, applicationName });
+      if (!this.applicationId) {
+        this.selectApplication(applicationId);
       }
 
       if (this.applicationId === applicationId) {
         this.trigger(message.type, message, applicationId);
       }
     });
   },
+
+  selectApplication(applicationId) {
+    if (applicationId in this.detectedApplications && applicationId !== this.applicationId) {
+      let applicationName = this.detectedApplications[applicationId];
+      this.setProperties({ applicationId, applicationName });
+      this.send('app-selected', { applicationId, applicationName });
+    }
+  },
+
   send(type, message) {
     message = message || {};
     message.type = type;

app/templates/components/app-picker.hbs

@@ -3,14 +3,14 @@
     class="dropdown__select"
     onchange={{action "selectApp" value="target.value"}}
   >
-    {{#each apps as |app|}}
+    {{#each-in this.apps as |id name|}}
       <option
-        value={{app.applicationId}}
-        selected={{eq app.applicationId selectedApp}}
+        value={{id}}
+        selected={{eq id this.selectedAppId}}
       >
-        {{app.applicationName}}
+        {{name}}
       </option>
-    {{/each}}
+    {{/each-in}}
   </select>
   {{svg-jar "dropdown-arrow" class="dropdown__arrow"}}
 </div>

ember_debug/adapters/basic.js

@@ -10,6 +10,8 @@ export default EmberObject.extend({
     resolve(this.connect(), 'ember-inspector').then(() => {
       this.onConnectionReady();
     }, null, 'ember-inspector');
+
+    this._messageCallbacks = [];
   },
 
   /**
@@ -54,7 +56,7 @@ export default EmberObject.extend({
     @param {Function} callback
   */
   onMessageReceived(callback) {
-    this.get('_messageCallbacks').pushObject(callback);
+    this._messageCallbacks.push(callback);
   },
 
   /**
@@ -70,10 +72,8 @@ export default EmberObject.extend({
   */
   inspectElement(/* elem */) {},
 
-  _messageCallbacks: computed(function() { return A(); }),
-
   _messageReceived(message) {
-    this.get('_messageCallbacks').forEach(callback => {
+    this._messageCallbacks.forEach(callback => {
       callback(message);
     });
   },