From 80bc508fae137328d87eaa2f92e42f6de1c7e484 Mon Sep 17 00:00:00 2001
From: Steve Jabour <steve@jabour.me>
Date: Thu, 12 Mar 2015 14:48:20 -0600
Subject: [PATCH 1/2] Explicitly Set 'mapped' Location Type

Should resolve a bug which crashes the app when running as a
Chrome extension, due to the Ember router not using the correct
location adapter.
---
 app/routes/stories/show.js                    |  2 +-
 config/environment.js                         |  2 +-
 tests/unit/initializers/04-url-mapper-test.js | 22 +++++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tests/unit/initializers/04-url-mapper-test.js

diff --git a/app/routes/stories/show.js b/app/routes/stories/show.js
index e0885d2..b009781 100644
--- a/app/routes/stories/show.js
+++ b/app/routes/stories/show.js
@@ -22,7 +22,7 @@ export default Ember.Route.extend({
   },
 
   model(params) {
-    return this.store.fetch('story', params.story_id);
+    return this.store.fetchById('story', params.story_id);
   },
 
   afterModel(story) {
diff --git a/config/environment.js b/config/environment.js
index 3f76e60..025a6e7 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function(environment) {
     modulePrefix: 'hn-reader',
     environment: environment,
     baseURL: '/',
-    locationType: 'auto',
+    locationType: 'mapped',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/tests/unit/initializers/04-url-mapper-test.js b/tests/unit/initializers/04-url-mapper-test.js
new file mode 100644
index 0000000..d725f3e
--- /dev/null
+++ b/tests/unit/initializers/04-url-mapper-test.js
@@ -0,0 +1,22 @@
+import Ember from 'ember';
+import { initialize } from '../../../initializers/04-url-mapper';
+import { module, test } from 'qunit';
+
+var container, application;
+
+module('04UrlMapperInitializer', {
+  beforeEach: function() {
+    Ember.run(function() {
+      application = Ember.Application.create();
+      container = application.__container__;
+      application.deferReadiness();
+    });
+  }
+});
+
+// Replace this with your real tests.
+test('location:mapped registered on initialize', function(assert) {
+  initialize(container, application);
+
+  assert.equal(container.resolve('location:mapped'), '(subclass of Ember.HistoryLocation)');
+});

From b8e232f18ef3fda330f05e48f370dc149408eb59 Mon Sep 17 00:00:00 2001
From: Steve Jabour <steve@jabour.me>
Date: Thu, 12 Mar 2015 16:00:19 -0600
Subject: [PATCH 2/2] Added back  dep, lost in upgrade to Ember CLI latest.

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7873b7b..377f1f2 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,8 @@
     "ember-cli-uglify": "1.0.1",
     "ember-data": "1.0.0-beta.15",
     "ember-export-application-global": "^1.0.2",
-    "ember-inflector": "1.3.1"
+    "ember-inflector": "1.3.1",
+    "glob": "4.0.5"
   },
   "ember-addon": {
     "paths": [