mirage: Inline single-use responsePayload variables

Author: Turbo87

tests/mirage/categories/get-by-id-test.js

@@ -12,9 +12,7 @@ module('Mirage | GET /api/v1/categories/:id', function (hooks) {
   test('returns 404 for unknown categories', async function (assert) {
     let response = await fetch('/api/v1/categories/foo');
     assert.equal(response.status, 404);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, { errors: [{ detail: 'Not Found' }] });
+    assert.deepEqual(await response.json(), { errors: [{ detail: 'Not Found' }] });
   });
 
   test('returns a category object for known categories', async function (assert) {
@@ -25,9 +23,7 @@ module('Mirage | GET /api/v1/categories/:id', function (hooks) {
 
     let response = await fetch('/api/v1/categories/no-std');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       category: {
         id: 'no-std',
         category: 'no-std',
@@ -47,9 +43,7 @@ module('Mirage | GET /api/v1/categories/:id', function (hooks) {
 
     let response = await fetch('/api/v1/categories/cli');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       category: {
         category: 'cli',
         crates_cnt: 7,

tests/mirage/categories/list-test.js

@@ -12,9 +12,7 @@ module('Mirage | GET /api/v1/categories', function (hooks) {
   test('empty case', async function (assert) {
     let response = await fetch('/api/v1/categories');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       categories: [],
       meta: {
         total: 0,
@@ -31,9 +29,7 @@ module('Mirage | GET /api/v1/categories', function (hooks) {
 
     let response = await fetch('/api/v1/categories');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       categories: [
         {
           id: 'category-1',

tests/mirage/category-slugs/list-test.js

@@ -12,9 +12,7 @@ module('Mirage | GET /api/v1/category_slugs', function (hooks) {
   test('empty case', async function (assert) {
     let response = await fetch('/api/v1/category_slugs');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       category_slugs: [],
     });
   });
@@ -28,9 +26,7 @@ module('Mirage | GET /api/v1/category_slugs', function (hooks) {
 
     let response = await fetch('/api/v1/category_slugs');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       category_slugs: [
         {
           description: 'This is the description for the category called "Category 1"',
@@ -56,8 +52,6 @@ module('Mirage | GET /api/v1/category_slugs', function (hooks) {
 
     let response = await fetch('/api/v1/category_slugs');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.equal(responsePayload.category_slugs.length, 25);
+    assert.equal((await response.json()).category_slugs.length, 25);
   });
 });

tests/mirage/confirm/put-by-id-test.js

@@ -15,9 +15,7 @@ module('Mirage | PUT /api/v1/confirm/:token', function (hooks) {
 
     let response = await fetch('/api/v1/confirm/foo', { method: 'PUT' });
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, { ok: true });
+    assert.deepEqual(await response.json(), { ok: true });
 
     user.reload();
     assert.strictEqual(user.emailVerified, true);
@@ -31,9 +29,7 @@ module('Mirage | PUT /api/v1/confirm/:token', function (hooks) {
 
     let response = await fetch('/api/v1/confirm/foo', { method: 'PUT' });
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, { ok: true });
+    assert.deepEqual(await response.json(), { ok: true });
 
     user.reload();
     assert.strictEqual(user.emailVerified, true);
@@ -42,9 +38,7 @@ module('Mirage | PUT /api/v1/confirm/:token', function (hooks) {
   test('returns an error for unknown tokens', async function (assert) {
     let response = await fetch('/api/v1/confirm/unknown', { method: 'PUT' });
     assert.equal(response.status, 400);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       errors: [{ detail: 'Email belonging to token not found.' }],
     });
   });

tests/mirage/crates/downloads-test.js

@@ -12,19 +12,15 @@ module('Mirage | GET /api/v1/crates/:id/downloads', function (hooks) {
   test('returns 404 for unknown crates', async function (assert) {
     let response = await fetch('/api/v1/crates/foo/downloads');
     assert.equal(response.status, 404);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, { errors: [{ detail: 'Not Found' }] });
+    assert.deepEqual(await response.json(), { errors: [{ detail: 'Not Found' }] });
   });
 
   test('empty case', async function (assert) {
     this.server.create('crate', { name: 'rand' });
 
     let response = await fetch('/api/v1/crates/rand/downloads');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       version_downloads: [],
       meta: {
         extra_downloads: [],
@@ -41,9 +37,7 @@ module('Mirage | GET /api/v1/crates/:id/downloads', function (hooks) {
 
     let response = await fetch('/api/v1/crates/rand/downloads');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       version_downloads: [
         {
           date: '2020-01-13',

tests/mirage/crates/follow/delete-test.js

@@ -12,9 +12,7 @@ module('Mirage | DELETE /api/v1/crates/:crateId/follow', function (hooks) {
   test('returns 403 if unauthenticated', async function (assert) {
     let response = await fetch('/api/v1/crates/foo/follow', { method: 'DELETE' });
     assert.equal(response.status, 403);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       errors: [{ detail: 'must be logged in to perform that action' }],
     });
   });
@@ -25,9 +23,7 @@ module('Mirage | DELETE /api/v1/crates/:crateId/follow', function (hooks) {
 
     let response = await fetch('/api/v1/crates/foo/follow', { method: 'DELETE' });
     assert.equal(response.status, 404);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, { errors: [{ detail: 'Not Found' }] });
+    assert.deepEqual(await response.json(), { errors: [{ detail: 'Not Found' }] });
   });
 
   test('makes the authenticated user unfollow the crate', async function (assert) {
@@ -40,9 +36,7 @@ module('Mirage | DELETE /api/v1/crates/:crateId/follow', function (hooks) {
 
     let response = await fetch('/api/v1/crates/rand/follow', { method: 'DELETE' });
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, { ok: true });
+    assert.deepEqual(await response.json(), { ok: true });
 
     user.reload();
     assert.deepEqual(user.followedCrateIds, []);

tests/mirage/crates/follow/get-test.js

@@ -12,9 +12,7 @@ module('Mirage | GET /api/v1/crates/:crateId/following', function (hooks) {
   test('returns 403 if unauthenticated', async function (assert) {
     let response = await fetch('/api/v1/crates/foo/following');
     assert.equal(response.status, 403);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       errors: [{ detail: 'must be logged in to perform that action' }],
     });
   });
@@ -25,9 +23,7 @@ module('Mirage | GET /api/v1/crates/:crateId/following', function (hooks) {
 
     let response = await fetch('/api/v1/crates/foo/following');
     assert.equal(response.status, 404);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, { errors: [{ detail: 'Not Found' }] });
+    assert.deepEqual(await response.json(), { errors: [{ detail: 'Not Found' }] });
   });
 
   test('returns true if the authenticated user follows the crate', async function (assert) {
@@ -38,9 +34,7 @@ module('Mirage | GET /api/v1/crates/:crateId/following', function (hooks) {
 
     let response = await fetch('/api/v1/crates/rand/following');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, { following: true });
+    assert.deepEqual(await response.json(), { following: true });
   });
 
   test('returns false if the authenticated user is not following the crate', async function (assert) {
@@ -51,8 +45,6 @@ module('Mirage | GET /api/v1/crates/:crateId/following', function (hooks) {
 
     let response = await fetch('/api/v1/crates/rand/following');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, { following: false });
+    assert.deepEqual(await response.json(), { following: false });
   });
 });

tests/mirage/crates/follow/put-test.js

@@ -12,9 +12,7 @@ module('Mirage | PUT /api/v1/crates/:crateId/follow', function (hooks) {
   test('returns 403 if unauthenticated', async function (assert) {
     let response = await fetch('/api/v1/crates/foo/follow', { method: 'PUT' });
     assert.equal(response.status, 403);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       errors: [{ detail: 'must be logged in to perform that action' }],
     });
   });
@@ -25,9 +23,7 @@ module('Mirage | PUT /api/v1/crates/:crateId/follow', function (hooks) {
 
     let response = await fetch('/api/v1/crates/foo/follow', { method: 'PUT' });
     assert.equal(response.status, 404);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, { errors: [{ detail: 'Not Found' }] });
+    assert.deepEqual(await response.json(), { errors: [{ detail: 'Not Found' }] });
   });
 
   test('makes the authenticated user follow the crate', async function (assert) {
@@ -40,9 +36,7 @@ module('Mirage | PUT /api/v1/crates/:crateId/follow', function (hooks) {
 
     let response = await fetch('/api/v1/crates/rand/follow', { method: 'PUT' });
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, { ok: true });
+    assert.deepEqual(await response.json(), { ok: true });
 
     user.reload();
     assert.deepEqual(user.followedCrateIds, [crate.id]);

tests/mirage/crates/get-by-id-test.js

@@ -12,9 +12,7 @@ module('Mirage | GET /api/v1/crates/:id', function (hooks) {
   test('returns 404 for unknown crates', async function (assert) {
     let response = await fetch('/api/v1/crates/foo');
     assert.equal(response.status, 404);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, { errors: [{ detail: 'Not Found' }] });
+    assert.deepEqual(await response.json(), { errors: [{ detail: 'Not Found' }] });
   });
 
   test('returns a crate object for known crates', async function (assert) {
@@ -23,9 +21,7 @@ module('Mirage | GET /api/v1/crates/:id', function (hooks) {
 
     let response = await fetch('/api/v1/crates/rand');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       categories: [],
       crate: {
         badges: [],

tests/mirage/crates/list-test.js

@@ -12,9 +12,7 @@ module('Mirage | GET /api/v1/crates', function (hooks) {
   test('empty case', async function (assert) {
     let response = await fetch('/api/v1/crates');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       crates: [],
       meta: {
         total: 0,
@@ -39,9 +37,7 @@ module('Mirage | GET /api/v1/crates', function (hooks) {
 
     let response = await fetch('/api/v1/crates');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       crates: [
         {
           id: 'rand',

tests/mirage/crates/owner-team-test.js

@@ -12,19 +12,15 @@ module('Mirage | GET /api/v1/crates/:id/owner_team', function (hooks) {
   test('returns 404 for unknown crates', async function (assert) {
     let response = await fetch('/api/v1/crates/foo/owner_team');
     assert.equal(response.status, 404);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, { errors: [{ detail: 'Not Found' }] });
+    assert.deepEqual(await response.json(), { errors: [{ detail: 'Not Found' }] });
   });
 
   test('empty case', async function (assert) {
     this.server.create('crate', { name: 'rand' });
 
     let response = await fetch('/api/v1/crates/rand/owner_team');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       teams: [],
     });
   });
@@ -36,9 +32,7 @@ module('Mirage | GET /api/v1/crates/:id/owner_team', function (hooks) {
 
     let response = await fetch('/api/v1/crates/rand/owner_team');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       teams: [
         {
           id: 1,

tests/mirage/crates/owner-user-test.js

@@ -12,19 +12,15 @@ module('Mirage | GET /api/v1/crates/:id/owner_user', function (hooks) {
   test('returns 404 for unknown crates', async function (assert) {
     let response = await fetch('/api/v1/crates/foo/owner_user');
     assert.equal(response.status, 404);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, { errors: [{ detail: 'Not Found' }] });
+    assert.deepEqual(await response.json(), { errors: [{ detail: 'Not Found' }] });
   });
 
   test('empty case', async function (assert) {
     this.server.create('crate', { name: 'rand' });
 
     let response = await fetch('/api/v1/crates/rand/owner_user');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       users: [],
     });
   });
@@ -36,9 +32,7 @@ module('Mirage | GET /api/v1/crates/:id/owner_user', function (hooks) {
 
     let response = await fetch('/api/v1/crates/rand/owner_user');
     assert.equal(response.status, 200);
-
-    let responsePayload = await response.json();
-    assert.deepEqual(responsePayload, {
+    assert.deepEqual(await response.json(), {
       users: [
         {
           id: 1,