Merge pull request #706 from ember-learn/issue_404

[BUGFIX] fix for 404 after switching classes

Author: jenweber

app/adapters/application.js

@@ -18,9 +18,17 @@ export default JSONAPIAdapter.extend({
 
   ids: null,
 
+  shouldReloadRecord(store, { modelName, id }) {
+    if (modelName === 'project') {
+      this.currentProject = id;
+    } else if (modelName === 'project-version') {
+      this.currentProjectVersion = id;
+    }
+    return; // return undefined so auto determinated
+  },
   shouldBackgroundReloadAll() { return false; },
-  shouldBackgroundReloadRecord(store, snapshot) {
-    let key = `${snapshot.modelName}-${snapshot.id}`;
+  shouldBackgroundReloadRecord(store, { modelName, id }) {
+    let key = `${modelName}-${id}`;
     let hasId = this.ids[key];
     if (!hasId) {
       this.ids[key] = true;
@@ -33,7 +41,7 @@ export default JSONAPIAdapter.extend({
     this.ids = {};
   },
 
-  async findRecord(store, {modelName}, id) {
+  async findRecord(store, { modelName }, id) {
     let url;
     let host = this.host;
     let projectName = this.currentProject;
@@ -49,7 +57,7 @@ export default JSONAPIAdapter.extend({
         modelNameToUse = 'namespace';
       }
 
-      if (typeof revId != 'undefined') {
+      if (typeof revId !== 'undefined') {
         let encodedRevId = encodeURIComponent(revId);
         url = `json-docs/${projectName}/${version}/${pluralize(modelNameToUse)}/${encodedRevId}`;
       } else {
@@ -60,9 +68,10 @@ export default JSONAPIAdapter.extend({
       let revId = this.metaStore.getRevId(projectName, version, modelName, id);
       url = `json-docs/${projectName}/${version}/${pluralize(modelName)}/${revId}`;
     } else if (modelName === 'project') {
-      this.set('currentProject', id);
+      this.currentProject = id;
       url = `rev-index/${id}`;
     } else if (modelName === 'project-version') {
+      this.currentProjectVersion = id;
       url = `rev-index/${id}`;
     } else {
       throw new Error('Unexpected model lookup');

app/instance-initializers/ember-meta-store.js

@@ -12,7 +12,6 @@ export function initialize(appInstance) {
     const {availableProjectVersions, projectRevMap} = shoebox.retrieve('meta-store');
     metaStore.initializeStore(availableProjectVersions, projectRevMap);
   }
-
 }
 
 export default {

tests/acceptance/switch-project-test.js

@@ -5,38 +5,62 @@ import {
   click,
   findAll,
   find,
+  currentURL,
   settled
 } from '@ember/test-helpers';
 import { selectSearch } from 'ember-power-select/test-support';
 import { timeout } from 'ember-concurrency';
 
+async function waitForSettled() {
+  await settled();
+  await timeout(10);
+  await settled();
+}
+
+async function ensureVersionsExist(assert) {
+  await waitForSettled();
+  await selectSearch('.select-container', '2');
+  await settled();
+
+  assert.dom('.ember-power-select-options').exists({ count: 1 });
+  assert.ok(findAll('.ember-power-select-options')[0].children.length > 1);
+}
+
 module('Acceptance | Switch Project', function(hooks) {
   setupApplicationTest(hooks);
 
   test('Can switch projects back and forth', async function(assert) {
-    async function ensureVersionsExist() {
-      await settled();
-      await timeout(10);
-      await settled();
-      await selectSearch('.select-container', '2');
-      await settled();
-
-      assert.dom('.ember-power-select-options').exists({ count: 1 });
-      assert.ok(findAll('.ember-power-select-options')[0].children.length > 1);
-    }
 
     await visit('/');
 
     await click('.spec-ember-data');
-    await ensureVersionsExist();
+    await ensureVersionsExist(assert);
     assert.dom(find('.spec-ember-data')).hasClass('active');
 
     await click('.spec-ember');
-    await ensureVersionsExist();
+    await ensureVersionsExist(assert);
     assert.dom(find('.spec-ember')).hasClass('active');
 
     await click('.spec-ember-data');
-    await ensureVersionsExist();
+    await ensureVersionsExist(assert);
     assert.dom(find('.spec-ember-data')).hasClass('active');
   });
+
+  test('Can open class after switching projects back and forth', async function(assert) {
+    await visit('/');
+    await ensureVersionsExist(assert);
+    assert.dom(find('.spec-ember')).hasClass('active');
+
+    await click('.spec-ember-data');
+    await ensureVersionsExist(assert);
+    assert.dom(find('.spec-ember-data')).hasClass('active');
+
+    await click('.spec-ember');
+    await ensureVersionsExist(assert);
+    assert.dom(find('.spec-ember')).hasClass('active');
+
+    await click('[data-test-class=EmberObject] > a');
+    await waitForSettled();
+    assert.equal(currentURL(), '/ember/release/classes/EmberObject');
+  });
 });