Merge pull request #40 from ember-learn/add-acceptance-test

Add acceptance test

Author: samselikoff

.gitignore

@@ -15,3 +15,4 @@
 /libpeerconnection.log
 npm-debug.log*
 testem.log
+package-lock.json

addon/components/docs-viewer/x-nav-item/component.js

@@ -1,6 +1,7 @@
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
 import layout from './template';
+import { next } from '@ember/runloop';
 
 export default Component.extend({
   layout,
@@ -11,8 +12,14 @@ export default Component.extend({
 
   didInsertElement() {
     this._super(...arguments);
-    this.get('docsRoutes.items').addObject(this);
-  },
+
+    next(() => {
+      this.get('docsRoutes.items').addObject(this);
+    });
+  }
+
 }).reopenClass({
+
   positionalParams: ['label', 'route', 'model']
+
 });

addon/services/docs-routes.js

@@ -35,15 +35,15 @@ export default Service.extend({
     });
   }),
 
-  currentRouteIndex: computed('router.router.currentURL', 'routeUrls.[]', function() {
+  currentRouteIndex: computed('router.router.url', 'routeUrls.[]', function() {
     if (this.get('routeUrls.length')) {
       let router = this.get('router.router');
-      let currentURL = router.get('rootURL') + router.get('currentURL');
+      let currentURL = router.get('rootURL') + router.get('url');
       currentURL = currentURL
         .replace("//", "/")  // dedup slashes
         .replace(/\/$/, ""); // remove trailing slash
       let index = this.get('routeUrls').indexOf(currentURL);
-      assert(`DocsRoutes wasn't able to correctly detect the current route.`, index > -1);
+      assert(`DocsRoutes wasn't able to correctly detect the current route. The current url is ${currentURL}`, index > -1);
       return index;
     }
   }),

tests/acceptance/docs-route-test.js

@@ -0,0 +1,12 @@
+import { test } from 'qunit';
+import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';
+
+moduleForAcceptance('Acceptance | Docs route test');
+
+test('the docs route renders', function(assert) {
+  visit('/docs');
+
+  andThen(function() {
+    assert.equal(currentURL(), '/docs');
+  });
+});