Merge pull request #231 from IBM/feature/fix-release-issue

bdjos1 · web-flow · commit e123b74989dc · 2022-02-23T11:29:33.000Z
Fix release issue
diff --git a/acceptance-test.bat b/acceptance-test.bat
@@ -1,4 +1,6 @@
 @echo off
 set INPUT_FOLDER=%CD%\packages\acceptance-tests\input
 set OUTPUT_FOLDER=%CD%\packages\acceptance-tests\output
+
+yarn build:release
 call dev.bat
diff --git a/acceptance-test.sh b/acceptance-test.sh
@@ -1,4 +1,6 @@
-set INPUT_FOLDER=$PWD/packages/acceptance-tests/input
-set OUTPUT_FOLDER=$PWD/packages/acceptance-tests/output
-. ./dev.sh
+export INPUT_FOLDER=$PWD/packages/acceptance-tests/input
+export OUTPUT_FOLDER=$PWD/packages/acceptance-tests/output
+
+yarn build:release
+sh dev.sh
 
diff --git a/packages/acceptance-tests/puppeteer/eclipse-theia.js b/packages/acceptance-tests/puppeteer/eclipse-theia.js
@@ -29,7 +29,7 @@ const runSpmUiUpgradeHelperTool = async () => {
   const page = utils.getPage();
   await page.focus("div#theia-app-shell");
   await page.keyboard.press('F1');
-  await page.keyboard.type('Run SPM');
+  await page.keyboard.type('Run SPM UI Upgrade Helper');
   await page.keyboard.press('Enter');
 }
 
@@ -38,7 +38,7 @@ const waitForWorkingMessageToAppear = async () => {
 }
 
 const waitForWorkingMessageToDisappear = async () => {
-  await utils.getPage().waitForSelector('div.theia-notification-message', { hidden: true, timeout: 30000 });
+  await utils.getPage().waitForSelector('div.theia-notification-message', { hidden: true, timeout: 40000 });
 }
 
 /**
@@ -50,7 +50,7 @@ const _waitForCorrectNumberOfGitChanges = async (numChanges) => {
   await utils.getPage().waitForFunction(
     `document.getElementsByClassName("theia-badge-decorator-sidebar").length > 0` +
     `&& document.getElementsByClassName("theia-badge-decorator-sidebar")[0].innerText === "${numChanges}"`,
-    { timeout: 10000 }
+    { timeout: 50000 }
   );
 }
 
@@ -59,7 +59,7 @@ const _listGitChanges = async () => {
   let names = [];
   for(let i = 0; i < sps.length; i++) {
     const spanName = await (await sps[i].getProperty('textContent')).jsonValue();
-    names.push(spanName);
+    if (spanName !=="Run SPM UI Upgrade Helper"){names.push(spanName);}
   }
   return names.sort();
 }
diff --git a/packages/acceptance-tests/puppeteer/index.test.js b/packages/acceptance-tests/puppeteer/index.test.js
@@ -2,7 +2,7 @@ const utils = require("./utils");
 const theia = require("./eclipse-theia");
 const generateExpectedFileList = require("../scripts/generate-expected-file-list");
 
-jest.setTimeout(30000);
+jest.setTimeout(70000);
 
 test('puppeteer test 1 (kitchen sink data set)', async () => {
 
@@ -19,10 +19,11 @@ test('puppeteer test 1 (kitchen sink data set)', async () => {
     await theia.runSpmUiUpgradeHelperTool();
     await theia.waitForWorkingMessageToAppear();
     await theia.waitForWorkingMessageToDisappear();
-   // const actual = await theia.getGitChanges(expected.length);
+
+    //  const actual = await theia.getGitChanges(expected.length);
     
     // Assert
-    //expect(actual).toEqual(expected);
+    // expect(actual).toEqual(expected);
 
   } finally {
     await utils.screenshot("error.png");
diff --git a/packages/acceptance-tests/scripts/generate-expected-file-list.js b/packages/acceptance-tests/scripts/generate-expected-file-list.js
@@ -8,9 +8,6 @@ const generateExpectedFileList = datasetName => {
   for(let i = 0; i < dataset.cssUpdates; i++) {
     changes.push(`has-updates-css-${i}.css`);
   }
-  for(let i = 0; i < dataset.invalidCssFiles; i++) {
-    changes.push(`invalid-css-file-${i}.css`);
-  }
   for(let i = 0; i < dataset.iconUpdates; i++) {
     changes.push(`has-updates-icons-${i}.properties`);
   }
@@ -21,6 +18,9 @@ const generateExpectedFileList = datasetName => {
     changes.push("Chevron_Down_Blue30_10px.png");
     changes.push("chevron--down10-on-dark.svg");
   }
+  for(let i = 0; i < dataset.windowSizeUpdates; i++) {
+    changes.push(`has-updates-${i}.uim`);
+  }
   return changes.sort();
 };
 
diff --git a/packages/acceptance-tests/scripts/generate-expected-file-list.test.js b/packages/acceptance-tests/scripts/generate-expected-file-list.test.js
@@ -6,8 +6,6 @@ const expected = [
   "has-updates-css-2.css",
   "has-updates-css-1.css",
   "has-updates-css-0.css",
-  "invalid-css-file-0.css",
-  "invalid-css-file-1.css",
   "has-updates-css-and-icons-1.css",
   "has-updates-css-and-icons-0.css",
   "Chevron_Down_Blue30_10px.png",
@@ -20,6 +18,9 @@ const expected = [
   "has-updates-icons-0.properties",
   "has-updates-css-6.css",
   "has-updates-css-5.css",
+  "has-updates-1.uim",
+  "has-updates-0.uim",
+  "has-updates-2.uim"
 ].sort();
 
 test('kitchen-sink file list', () => {
diff --git a/packages/docker-tasks/docker-tasks.js b/packages/docker-tasks/docker-tasks.js
@@ -159,8 +159,8 @@ const dockerTasks = (execFunction = shelljs, props, args) => {
     }
     if (version !== "latest") {
       cmds.push(`docker image tag ${additionalArgs} ${props.imageName}:latest ${props.imageName}:${version}`);
-      cmds.push(`docker image tag ${additionalArgs} ${props.parserImageName}:latest ${props.imageName}:${version}`);
-      cmds.push(`docker image tag ${additionalArgs} ${props.nodeImageName}:latest ${props.imageName}:${version}`);
+      cmds.push(`docker image tag ${additionalArgs} ${props.parserImageName}:latest ${props.parserImageName}:${version}`);
+      cmds.push(`docker image tag ${additionalArgs} ${props.nodeImageName}:latest ${props.nodeImageName}:${version}`);
     }
     cmds.push(`docker image tag ${additionalArgs} ${props.imageName}:latest docker.io/${props.username}/${props.imageName}:${version}`);
     cmds.push(`docker image tag ${additionalArgs} ${props.parserImageName}:latest docker.io/${props.username}/${props.parserImageName}:${version}`);
diff --git a/packages/docker-tasks/docker-tasks.test.js b/packages/docker-tasks/docker-tasks.test.js
@@ -219,7 +219,7 @@ test("calling 'release <version>' runs the correct commands", () => {
   ];
   const props = yaml.load(inputConfig.join("\n"));
   const inputArgs = "release 0.0.1".split(" ");
-  const expectedCommands = ["docker image tag foo:latest foo:0.0.1", "docker image tag bar:latest foo:0.0.1", "docker image tag baz:latest foo:0.0.1", "docker image tag foo:latest docker.io/folkforms/foo:0.0.1", "docker image tag bar:latest docker.io/folkforms/bar:0.0.1", "docker image tag baz:latest docker.io/folkforms/baz:0.0.1", "docker image push docker.io/folkforms/foo:0.0.1", "docker image push docker.io/folkforms/bar:0.0.1", "docker image push docker.io/folkforms/baz:0.0.1"];
+  const expectedCommands = ["docker image tag foo:latest foo:0.0.1", "docker image tag bar:latest bar:0.0.1", "docker image tag baz:latest baz:0.0.1", "docker image tag foo:latest docker.io/folkforms/foo:0.0.1", "docker image tag bar:latest docker.io/folkforms/bar:0.0.1", "docker image tag baz:latest docker.io/folkforms/baz:0.0.1", "docker image push docker.io/folkforms/foo:0.0.1", "docker image push docker.io/folkforms/bar:0.0.1", "docker image push docker.io/folkforms/baz:0.0.1"];
   const expectedEchos = [];
   const expectedErrorCode = 0;
 
diff --git a/packages/release/release.js b/packages/release/release.js
@@ -29,7 +29,7 @@ const release = (shell, option, version) => {
     shell.echo("Building...");
     exec(shell, `yarn install-all`);
     exec(shell, `yarn test`);
-    exec(shell, `echo { "version": "${version}" }>version.json`);
+    exec(shell, `echo { '"'version'"': '"'${version}'"'}>version.json`);
     exec(shell, `yarn build:release`);
     shell.echo("Creating release branch...");
     exec(shell, `git checkout -b v${version}`);
diff --git a/packages/release/release.test.js b/packages/release/release.test.js
@@ -43,7 +43,7 @@ test('--start option runs the correct commands', () => {
     "git tag --list v0.10.0",
     "yarn install-all",
     "yarn test",
-    "echo { \"version\": \"0.10.0\" }>version.json",
+    "echo { '\"'version'\"': '\"'0.10.0'\"'}>version.json",
     "yarn build:release",
     "git checkout -b v0.10.0",
     "git push --set-upstream origin v0.10.0",

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ const runSpmUiUpgradeHelperTool = async () => {`
`29`	`29`	`const page = utils.getPage();`
`30`	`30`	`await page.focus("div#theia-app-shell");`
`31`	`31`	`await page.keyboard.press('F1');`
`32`		`- await page.keyboard.type('Run SPM');`
	`32`	`+ await page.keyboard.type('Run SPM UI Upgrade Helper');`
`33`	`33`	`await page.keyboard.press('Enter');`
`34`	`34`	`}`
`35`	`35`
`@@ -38,7 +38,7 @@ const waitForWorkingMessageToAppear = async () => {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`const waitForWorkingMessageToDisappear = async () => {`
`41`		`- await utils.getPage().waitForSelector('div.theia-notification-message', { hidden: true, timeout: 30000 });`
	`41`	`+ await utils.getPage().waitForSelector('div.theia-notification-message', { hidden: true, timeout: 40000 });`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`
`@@ -50,7 +50,7 @@ const _waitForCorrectNumberOfGitChanges = async (numChanges) => {`
`50`	`50`	`await utils.getPage().waitForFunction(`
`51`	`51`	`document.getElementsByClassName("theia-badge-decorator-sidebar").length > 0` +
`52`	`52`	`&& document.getElementsByClassName("theia-badge-decorator-sidebar")[0].innerText === "${numChanges}"`,
`53`		`- { timeout: 10000 }`
	`53`	`+ { timeout: 50000 }`
`54`	`54`	`);`
`55`	`55`	`}`
`56`	`56`
`@@ -59,7 +59,7 @@ const _listGitChanges = async () => {`
`59`	`59`	`let names = [];`
`60`	`60`	`for(let i = 0; i < sps.length; i++) {`
`61`	`61`	`const spanName = await (await sps[i].getProperty('textContent')).jsonValue();`
`62`		`- names.push(spanName);`
	`62`	`+ if (spanName !=="Run SPM UI Upgrade Helper"){names.push(spanName);}`
`63`	`63`	`}`
`64`	`64`	`return names.sort();`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,6 @@ const generateExpectedFileList = datasetName => {`
`8`	`8`	`for(let i = 0; i < dataset.cssUpdates; i++) {`
`9`	`9`	changes.push(`has-updates-css-${i}.css`);
`10`	`10`	`}`
`11`		`- for(let i = 0; i < dataset.invalidCssFiles; i++) {`
`12`		- changes.push(`invalid-css-file-${i}.css`);
`13`		`- }`
`14`	`11`	`for(let i = 0; i < dataset.iconUpdates; i++) {`
`15`	`12`	changes.push(`has-updates-icons-${i}.properties`);
`16`	`13`	`}`
`@@ -21,6 +18,9 @@ const generateExpectedFileList = datasetName => {`
`21`	`18`	`changes.push("Chevron_Down_Blue30_10px.png");`
`22`	`19`	`changes.push("chevron--down10-on-dark.svg");`
`23`	`20`	`}`
	`21`	`+ for(let i = 0; i < dataset.windowSizeUpdates; i++) {`
	`22`	+ changes.push(`has-updates-${i}.uim`);
	`23`	`+ }`
`24`	`24`	`return changes.sort();`
`25`	`25`	`};`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -159,8 +159,8 @@ const dockerTasks = (execFunction = shelljs, props, args) => {`
`159`	`159`	`}`
`160`	`160`	`if (version !== "latest") {`
`161`	`161`	cmds.push(`docker image tag ${additionalArgs} ${props.imageName}:latest ${props.imageName}:${version}`);
`162`		- cmds.push(`docker image tag ${additionalArgs} ${props.parserImageName}:latest ${props.imageName}:${version}`);
`163`		- cmds.push(`docker image tag ${additionalArgs} ${props.nodeImageName}:latest ${props.imageName}:${version}`);
	`162`	+ cmds.push(`docker image tag ${additionalArgs} ${props.parserImageName}:latest ${props.parserImageName}:${version}`);
	`163`	+ cmds.push(`docker image tag ${additionalArgs} ${props.nodeImageName}:latest ${props.nodeImageName}:${version}`);
`164`	`164`	`}`
`165`	`165`	cmds.push(`docker image tag ${additionalArgs} ${props.imageName}:latest docker.io/${props.username}/${props.imageName}:${version}`);
`166`	`166`	cmds.push(`docker image tag ${additionalArgs} ${props.parserImageName}:latest docker.io/${props.username}/${props.parserImageName}:${version}`);