Auto merge of #2380 - Turbo87:missing-owner, r=locks

Fix owner invite error handling behavior

Resolves #2084

r? @locks

/cc @carols10cents

Author: bors

app/adapters/crate.js

@@ -5,12 +5,18 @@ export default ApplicationAdapter.extend({
     return this.ajax(this.urlForFollowAction(id), 'PUT');
   },
 
-  inviteOwner(id, username) {
-    return this.ajax(this.urlForOwnerAction(id), 'PUT', {
+  async inviteOwner(id, username) {
+    let result = await this.ajax(this.urlForOwnerAction(id), 'PUT', {
       data: {
         owners: [username],
       },
     });
+
+    if (result.ok) {
+      return result;
+    } else {
+      throw result;
+    }
   },
 
   removeOwner(id, username) {

mirage/route-handlers/crates.js

@@ -165,7 +165,7 @@ export function register(server) {
     const user = schema.users.findBy({ login: ownerId });
 
     if (!user) {
-      return notFound();
+      return { errors: [{ detail: `could not find user with login \`${ownerId}\`` }] };
     }
 
     return { ok: true };

tests/acceptance/crate-test.js

@@ -281,7 +281,9 @@ module('Acceptance | crate page', function (hooks) {
     await fillIn('input[name="username"]', 'spookyghostboo');
     await click('[data-test-save-button]');
 
-    assert.dom('[data-test-error-message]').hasText('Error sending invite: Not Found');
+    assert
+      .dom('[data-test-error-message]')
+      .hasText('Error sending invite: could not find user with login `spookyghostboo`');
     assert.dom('[data-test-owners] [data-test-owner-team]').exists({ count: 2 });
     assert.dom('[data-test-owners] [data-test-owner-user]').exists({ count: 2 });
   });

tests/models/crate-test.js

@@ -33,8 +33,8 @@ module('Model | Crate', function (hooks) {
       let crateRecord = await this.store.findRecord('crate', crate.id);
 
       await assert.rejects(crateRecord.inviteOwner('unknown'), function (error) {
-        assert.deepEqual(error.errors, [{ detail: 'Not Found' }]);
-        return error instanceof AdapterError;
+        assert.deepEqual(error.errors, [{ detail: 'could not find user with login `unknown`' }]);
+        return true;
       });
     });
   });