Merge pull request #799 from Turbo87/route-aliases

Replace "ember-route-alias" with explicit "crate.index" route

Author: locks

app/app.js

@@ -2,18 +2,15 @@ import Ember from 'ember';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
-import RouteAliasResolverMixin from 'cargo/mixins/route-alias-resolver';
 
 let App;
 
-let CargoResolver = Resolver.extend(RouteAliasResolverMixin);
-
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
 App = Ember.Application.extend({
     modulePrefix: config.modulePrefix,
     podModulePrefix: config.podModulePrefix,
-    Resolver: CargoResolver
+    Resolver
 });
 
 loadInitializers(App, config.modulePrefix);

app/router.js

@@ -18,7 +18,6 @@ Router.map(function() {
         this.route('download');
         this.route('versions');
         this.route('version', { path: '/:version_num' });
-        this.alias('index', '/', 'version');
 
         this.route('reverse_dependencies');
 

app/routes/crate/index.js

@@ -0,0 +1,6 @@
+import VersionRoute from './version';
+
+export default VersionRoute.extend({
+    controllerName: 'crate.version',
+    templateName: 'crate/version',
+});

app/routes/crate/version.js

@@ -100,7 +100,7 @@ export default Ember.Route.extend({
     },
 
     serialize(model) {
-        let version_num = model ? model.get('num') : '';
+        let version_num = model.get('num');
         return { version_num };
     },
 });

mirage/config.js

@@ -42,6 +42,7 @@ export default function() {
     this.get('/api/v1/crates/nanomsg/reverse_dependencies', () => crateReverseDependenciesFixture);
     this.get('/api/v1/crates/nanomsg/:version_num/dependencies', () => crateDependenciesFixture);
     this.get('/api/v1/crates/nanomsg/downloads', () => crateDownloadsFixture);
+    this.get('/api/v1/crates/nanomsg/:version_num/downloads', () => crateDownloadsFixture);
     this.get('/api/v1/keywords/network', () => keywordFixture);
     this.get('/api/v1/teams/:team_id', () => teamFixture);
     this.get('/api/v1/users/:user_id', () => userFixture);

package.json

@@ -53,7 +53,6 @@
     "ember-moment": "^7.3.1",
     "ember-page-title": "3.1.5",
     "ember-resolver": "3.0.0",
-    "ember-route-alias": "0.1.5",
     "ember-router-scroll": "0.1.1",
     "ember-source": "2.12.0",
     "emberx-select": "^3.0.1",

tests/acceptance/crate-test.js

@@ -13,11 +13,37 @@ test('visiting a crate page from the front page', async function(assert) {
     assert.equal(document.title, 'nanomsg - Cargo: packages for Rust');
 });
 
-test('visiting a crate page directly', async function(assert) {
+test('visiting /crates/nanomsg', async function(assert) {
     await visit('/crates/nanomsg');
 
     assert.equal(currentURL(), '/crates/nanomsg');
+    assert.equal(currentRouteName(), 'crate.index');
     assert.equal(document.title, 'nanomsg - Cargo: packages for Rust');
+
+    assert.equal(find('#crates-heading .info h1').text(), 'nanomsg');
+    assert.equal(find('#crates-heading .info h2').text(), '0.6.1');
+});
+
+test('visiting /crates/nanomsg/', async function(assert) {
+    await visit('/crates/nanomsg/');
+
+    assert.equal(currentURL(), '/crates/nanomsg/');
+    assert.equal(currentRouteName(), 'crate.index');
+    assert.equal(document.title, 'nanomsg - Cargo: packages for Rust');
+
+    assert.equal(find('#crates-heading .info h1').text(), 'nanomsg');
+    assert.equal(find('#crates-heading .info h2').text(), '0.6.1');
+});
+
+test('visiting /crates/nanomsg/0.6.0', async function(assert) {
+    await visit('/crates/nanomsg/0.6.0');
+
+    assert.equal(currentURL(), '/crates/nanomsg/0.6.0');
+    assert.equal(currentRouteName(), 'crate.version');
+    assert.equal(document.title, 'nanomsg - Cargo: packages for Rust');
+
+    assert.equal(find('#crates-heading .info h1').text(), 'nanomsg');
+    assert.equal(find('#crates-heading .info h2').text(), '0.6.0');
 });
 
 test('navigating to the all versions page', async function(assert) {

yarn.lock

@@ -1,5 +1,7 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
+# yarn v0.25.1
+# node v6.9.2
 
 
 abbrev@1:
@@ -2449,12 +2451,6 @@ [email protected]:
     ember-cli-babel "^5.1.6"
     ember-cli-version-checker "^1.1.6"
 
-[email protected]:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/ember-route-alias/-/ember-route-alias-0.1.5.tgz#3379a21e5aa48604d22d7c048bf9b92d8bc9d2c0"
-  dependencies:
-    ember-cli-babel "^5.1.7"
-
 ember-router-generator@^1.0.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-1.2.2.tgz#62dac1f63e873553e6d4c7e32da6589e577bcf63"