From ec56d2fbbe5d99b03342b41e0f2a84de17ec2d7e Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Thu, 28 Jul 2022 17:49:51 -0700
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20role=20discard=20should?=
 =?UTF-8?q?=20not=20error=20(#1226)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/api/addon/models/role.js                 | 4 +++-
 addons/api/mirage/factories/credential-store.js | 2 +-
 addons/api/mirage/factories/credential.js       | 2 +-
 addons/api/tests/unit/models/credential-test.js | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/api/addon/models/role.js b/addons/api/addon/models/role.js
index 5abb8fd6c..fdddc6941 100644
--- a/addons/api/addon/models/role.js
+++ b/addons/api/addon/models/role.js
@@ -27,7 +27,9 @@ export default class RoleModel extends GeneratedRoleModel {
    * Convenience for looking up the grant scope, if loaded.
    */
   get grantScope() {
-    return this.store.peekRecord('scope', this.grant_scope_id);
+    return this.grant_scope_id
+      ? this.store.peekRecord('scope', this.grant_scope_id)
+      : null;
   }
 
   // =methods
diff --git a/addons/api/mirage/factories/credential-store.js b/addons/api/mirage/factories/credential-store.js
index 2472c23fe..42ca84eab 100644
--- a/addons/api/mirage/factories/credential-store.js
+++ b/addons/api/mirage/factories/credential-store.js
@@ -23,7 +23,7 @@ export default factory.extend({
       case 'static':
       default:
         return {
-          'credentials': ['create', 'list'],
+          credentials: ['create', 'list'],
         };
     }
   },
diff --git a/addons/api/mirage/factories/credential.js b/addons/api/mirage/factories/credential.js
index 4d9dc1a18..5ab002ffb 100644
--- a/addons/api/mirage/factories/credential.js
+++ b/addons/api/mirage/factories/credential.js
@@ -18,4 +18,4 @@ export default factory.extend({
       username: random.word(),
     };
   },
-});
\ No newline at end of file
+});
diff --git a/addons/api/tests/unit/models/credential-test.js b/addons/api/tests/unit/models/credential-test.js
index 2d6018943..c7f3b8863 100644
--- a/addons/api/tests/unit/models/credential-test.js
+++ b/addons/api/tests/unit/models/credential-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Model | credential', function(hooks) {
+module('Unit | Model | credential', function (hooks) {
   setupTest(hooks);
 
   // Replace this with your real tests.
-  test('it exists', function(assert) {
+  test('it exists', function (assert) {
     let store = this.owner.lookup('service:store');
     let model = store.createRecord('credential', {});
     assert.ok(model);