From 02b43cbfac910c077ba41ae97da7e0f7697ff964 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 19 Mar 2020 15:59:50 -0400
Subject: [PATCH] Refactor migrateExtraFields() tests

---
 test/tests/schemaTest.js | 62 ++++++++++------------------------------
 1 file changed, 15 insertions(+), 47 deletions(-)

diff --git a/test/tests/schemaTest.js b/test/tests/schemaTest.js
index f3e38d13bc..075c0dbdb1 100644
--- a/test/tests/schemaTest.js
+++ b/test/tests/schemaTest.js
@@ -48,13 +48,7 @@ describe("Zotero.Schema", function() {
 		});
 		
 		describe("#migrateExtraFields()", function () {
-			it("should add a new field and migrate values from Extra", async function () {
-				var item = await createDataObject('item', { itemType: 'book' });
-				item.setField('numPages', "10");
-				item.setField('extra', 'Foo Bar: This is a value.\nnumber-of-pages: 11\nThis is another line.');
-				item.synced = true;
-				await item.saveTx();
-				
+			async function migrate() {
 				schema.version++;
 				schema.itemTypes.find(x => x.itemType == 'book').fields.splice(0, 1, { field: 'fooBar' })
 				var newLocales = {};
@@ -65,6 +59,16 @@ describe("Zotero.Schema", function() {
 				});
 				await Zotero.Schema._updateGlobalSchemaForTest(schema);
 				await Zotero.Schema.migrateExtraFields();
+			}
+			
+			it("should add a new field and migrate values from Extra", async function () {
+				var item = await createDataObject('item', { itemType: 'book' });
+				item.setField('numPages', "10");
+				item.setField('extra', 'Foo Bar: This is a value.\nnumber-of-pages: 11\nThis is another line.');
+				item.synced = true;
+				await item.saveTx();
+				
+				await migrate();
 				
 				assert.isNumber(Zotero.ItemFields.getID('fooBar'));
 				assert.equal(Zotero.ItemFields.getLocalizedString('fooBar'), 'Foo Bar');
@@ -89,16 +93,7 @@ describe("Zotero.Schema", function() {
 				item.synced = true;
 				await item.saveTx();
 				
-				schema.version++;
-				schema.itemTypes.find(x => x.itemType == 'book').fields.splice(0, 1, { field: 'fooBar' })
-				var newLocales = {};
-				Object.keys(schema.locales).forEach((locale) => {
-					var o = schema.locales[locale];
-					o.fields.fooBar = 'Foo Bar';
-					newLocales[locale] = o;
-				});
-				await Zotero.Schema._updateGlobalSchemaForTest(schema);
-				await Zotero.Schema.migrateExtraFields();
+				await migrate();
 				
 				var creators = item.getCreators();
 				assert.lengthOf(creators, 2);
@@ -126,16 +121,7 @@ describe("Zotero.Schema", function() {
 				item.synced = true;
 				await item.saveTx();
 				
-				schema.version++;
-				schema.itemTypes.find(x => x.itemType == 'book').fields.splice(0, 1, { field: 'fooBar' })
-				var newLocales = {};
-				Object.keys(schema.locales).forEach((locale) => {
-					var o = schema.locales[locale];
-					o.fields.fooBar = 'Foo Bar';
-					newLocales[locale] = o;
-				});
-				await Zotero.Schema._updateGlobalSchemaForTest(schema);
-				await Zotero.Schema.migrateExtraFields();
+				await migrate();
 				
 				var creators = item.getCreators();
 				assert.lengthOf(creators, 1);
@@ -155,16 +141,7 @@ describe("Zotero.Schema", function() {
 					skipEditCheck: true
 				});
 				
-				schema.version++;
-				schema.itemTypes.find(x => x.itemType == 'book').fields.splice(0, 1, { field: 'fooBar' })
-				var newLocales = {};
-				Object.keys(schema.locales).forEach((locale) => {
-					var o = schema.locales[locale];
-					o.fields.fooBar = 'Foo Bar';
-					newLocales[locale] = o;
-				});
-				await Zotero.Schema._updateGlobalSchemaForTest(schema);
-				await Zotero.Schema.migrateExtraFields();
+				await migrate();
 				
 				assert.isNumber(Zotero.ItemFields.getID('fooBar'));
 				assert.equal(item.getField('fooBar'), '');
@@ -195,16 +172,7 @@ describe("Zotero.Schema", function() {
 				item.synced = true;
 				await item.saveTx();
 				
-				schema.version++;
-				schema.itemTypes.find(x => x.itemType == 'book').fields.splice(0, 1, { field: 'fooBar' })
-				var newLocales = {};
-				Object.keys(schema.locales).forEach((locale) => {
-					var o = schema.locales[locale];
-					o.fields.fooBar = 'Foo Bar';
-					newLocales[locale] = o;
-				});
-				await Zotero.Schema._updateGlobalSchemaForTest(schema);
-				await Zotero.Schema.migrateExtraFields();
+				await migrate();
 				
 				assert.equal(item.getField('numPages'), 30);
 				var creators = item.getCreators();