crate.range: Show 404 page instead of error notification

Author: Turbo87

app/routes/crate/range.js

@@ -11,7 +11,7 @@ export default class VersionRoute extends Route {
   @service notifications;
   @service router;
 
-  async model({ range }) {
+  async model({ range }, transition) {
     let crate = this.modelFor('crate');
 
     let versions = await crate.get('versions');
@@ -21,11 +21,11 @@ export default class VersionRoute extends Route {
     let npmRange = cargoRangeToNpm(range);
     // find a version that matches the specified range
     let versionNum = maxSatisfying(unyankedVersionNums, npmRange) ?? maxSatisfying(allVersionNums, npmRange);
-    if (!versionNum) {
-      this.notifications.error(`No matching version of crate '${crate.name}' found for: ${range}`);
-      this.router.replaceWith('crate.index');
+    if (versionNum) {
+      this.router.replaceWith('crate.version', versionNum);
+    } else {
+      let title = `${crate.name}: No matching version found for ${range}`;
+      this.router.replaceWith('catch-all', { transition, title });
     }
-
-    this.router.replaceWith('crate.version', versionNum);
   }
 }

tests/routes/crate/range-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.range', function (hooks) {
   setupApplicationTest(hooks);
 
@@ -76,17 +78,18 @@ module('Route | crate.range', function (hooks) {
     assert.dom('[data-test-notification-message]').doesNotExist();
   });
 
-  test('redirects to main crate page if no match found', async function (assert) {
+  test('shows an error page if no match found', 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.1.0' });
     this.server.create('version', { crate, num: '1.1.1' });
     this.server.create('version', { crate, num: '2.0.0' });
 
     await visit('/crates/foo/range/^3');
-    assert.equal(currentURL(), `/crates/foo`);
-    assert.dom('[data-test-crate-name]').hasText('foo');
-    assert.dom('[data-test-crate-version]').hasText('2.0.0');
-    assert.dom('[data-test-notification-message="error"]').hasText("No matching version of crate 'foo' found for: ^3");
+    assert.equal(currentURL(), '/crates/foo/range/%5E3');
+    assert.dom('[data-test-404-page]').exists();
+    assert.dom('[data-test-title]').hasText('foo: No matching version found for ^3');
+    assert.dom('[data-test-go-back]').exists();
+    assert.dom('[data-test-try-again]').doesNotExist();
   });
 });