mirage: Reset version.yank_message when unyanking

Author: Turbo87

mirage/route-handlers/crates.js

@@ -284,7 +284,7 @@ export function register(server) {
     const body = JSON.parse(request.requestBody);
     version.update({
       yanked: body.version.yanked,
-      yank_message: body.version.yank_message,
+      yank_message: body.version.yanked ? body.version.yank_message || null : null,
     });
 
     return this.serialize(version);
@@ -329,7 +329,7 @@ export function register(server) {
       return notFound();
     }
 
-    version.update({ yanked: false });
+    version.update({ yanked: false, yank_message: null });
 
     return { ok: true };
   });

tests/mirage/crates/versions/patch-test.js

@@ -12,6 +12,12 @@ const YANK_BODY = JSON.stringify({
   },
 });
 
+const UNYANK_BODY = JSON.stringify({
+  version: {
+    yanked: false,
+  },
+});
+
 module('Mirage | PATCH /api/v1/crates/:crate/:version', function (hooks) {
   setupTest(hooks);
   setupMirage(hooks);
@@ -81,5 +87,34 @@ module('Mirage | PATCH /api/v1/crates/:crate/:version', function (hooks) {
     user.reload();
     assert.true(version.yanked);
     assert.strictEqual(version.yank_message, 'some reason');
+
+    response = await fetch('/api/v1/crates/foo/1.0.0', { method: 'PATCH', body: UNYANK_BODY });
+    assert.strictEqual(response.status, 200);
+    assert.deepEqual(await response.json(), {
+      version: {
+        crate: 'foo',
+        crate_size: 0,
+        created_at: '2010-06-16T21:30:45Z',
+        dl_path: '/api/v1/crates/foo/1.0.0/download',
+        downloads: 0,
+        id: '1',
+        license: 'MIT/Apache-2.0',
+        links: {
+          dependencies: '/api/v1/crates/foo/1.0.0/dependencies',
+          version_downloads: '/api/v1/crates/foo/1.0.0/downloads',
+        },
+        num: '1.0.0',
+        published_by: null,
+        readme_path: '/api/v1/crates/foo/1.0.0/readme',
+        rust_version: null,
+        updated_at: '2017-02-24T12:34:56Z',
+        yank_message: null,
+        yanked: false,
+      },
+    });
+
+    user.reload();
+    assert.false(version.yanked);
+    assert.strictEqual(version.yank_message, null);
   });
 });

tests/mirage/crates/versions/yank/unyank-test.js

@@ -39,8 +39,9 @@ module('Mirage | PUT /api/v1/crates/:crateId/unyank', function (hooks) {
 
   test('unyanks the version', async function (assert) {
     let crate = this.server.create('crate', { name: 'foo' });
-    let version = this.server.create('version', { crate, num: '1.0.0', yanked: true });
+    let version = this.server.create('version', { crate, num: '1.0.0', yanked: true, yank_message: 'some reason' });
     assert.true(version.yanked);
+    assert.strictEqual(version.yank_message, 'some reason');
 
     let user = this.server.create('user');
     this.authenticateAs(user);
@@ -51,5 +52,6 @@ module('Mirage | PUT /api/v1/crates/:crateId/unyank', function (hooks) {
 
     user.reload();
     assert.false(version.yanked);
+    assert.strictEqual(version.yank_message, null);
   });
 });