version: Show "Version not found" error page instead of notification

Author: Turbo87

app/routes/crate/version.js

@@ -6,28 +6,25 @@ import { didCancel } from 'ember-concurrency';
 import { AjaxError } from '../../utils/ajax';
 
 export default class VersionRoute extends Route {
-  @service notifications;
+  @service router;
   @service sentry;
 
-  async model(params) {
+  async model(params, transition) {
     let crate = this.modelFor('crate');
 
     let versions;
     try {
       versions = await crate.get('versions');
-    } catch {
-      this.notifications.error(`Loading data for the '${crate.name}' crate failed. Please try again later!`);
-      this.replaceWith('index');
-      return;
+    } catch (error) {
+      return this.router.replaceWith('catch-all', { transition, error, title: 'Crate failed to load', tryAgain: true });
     }
 
     let version;
     let requestedVersion = params.version_num;
     if (requestedVersion) {
       version = versions.find(version => version.num === requestedVersion);
       if (!version) {
-        this.notifications.error(`Version '${requestedVersion}' of crate '${crate.name}' does not exist`);
-        this.replaceWith('crate.index');
+        return this.router.replaceWith('catch-all', { transition, title: 'Version not found' });
       }
     } else {
       let { defaultVersion } = crate;

tests/acceptance/crate-test.js

@@ -108,10 +108,11 @@ module('Acceptance | crate page', function (hooks) {
 
     await visit('/crates/nanomsg/0.7.0');
 
-    assert.equal(currentURL(), '/crates/nanomsg');
-    assert.dom('[data-test-heading] [data-test-crate-name]').hasText('nanomsg');
-    assert.dom('[data-test-heading] [data-test-crate-version]').hasText('0.6.1');
-    assert.dom('[data-test-notification-message]').hasText("Version '0.7.0' of crate 'nanomsg' does not exist");
+    assert.equal(currentURL(), '/crates/nanomsg/0.7.0');
+    assert.dom('[data-test-404-page]').exists();
+    assert.dom('[data-test-title]').hasText('Version not found');
+    assert.dom('[data-test-go-back]').exists();
+    assert.dom('[data-test-try-again]').doesNotExist();
   });
 
   test('other versions loading error shows an error message', async function (assert) {
@@ -123,10 +124,11 @@ module('Acceptance | crate page', function (hooks) {
 
     await visit('/');
     await click('[data-test-just-updated] [data-test-crate-link="0"]');
-    assert.equal(currentURL(), '/');
-    assert
-      .dom('[data-test-notification-message]')
-      .hasText("Loading data for the 'nanomsg' crate failed. Please try again later!");
+    assert.equal(currentURL(), '/crates/nanomsg');
+    assert.dom('[data-test-404-page]').exists();
+    assert.dom('[data-test-title]').hasText('Crate failed to load');
+    assert.dom('[data-test-go-back]').doesNotExist();
+    assert.dom('[data-test-try-again]').exists();
   });
 
   test('navigating to the all versions page', async function (assert) {

tests/routes/crate/version/model-test.js

@@ -1,8 +1,10 @@
-import { currentURL, visit } from '@ember/test-helpers';
+import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
+import { visit } from '../../../helpers/visit-ignoring-abort';
+
 module('Route | crate.version | model() hook', function (hooks) {
   setupApplicationTest(hooks);
 
@@ -20,17 +22,18 @@ module('Route | crate.version | model() hook', function (hooks) {
       assert.dom('[data-test-notification-message]').doesNotExist();
     });
 
-    test('redirects to unspecific version URL', async function (assert) {
+    test('shows error page for unknown versions', async function (assert) {
       let crate = this.server.create('crate', { name: 'foo' });
       this.server.create('version', { crate, num: '1.0.0' });
       this.server.create('version', { crate, num: '1.2.3', yanked: true });
       this.server.create('version', { crate, num: '2.0.0-beta.1' });
 
       await visit('/crates/foo/2.0.0');
-      assert.equal(currentURL(), `/crates/foo`);
-      assert.dom('[data-test-crate-name]').hasText('foo');
-      assert.dom('[data-test-crate-version]').hasText('1.0.0');
-      assert.dom('[data-test-notification-message="error"]').hasText("Version '2.0.0' of crate 'foo' does not exist");
+      assert.equal(currentURL(), `/crates/foo/2.0.0`);
+      assert.dom('[data-test-404-page]').exists();
+      assert.dom('[data-test-title]').hasText('Version not found');
+      assert.dom('[data-test-go-back]').exists();
+      assert.dom('[data-test-try-again]').doesNotExist();
     });
   });