Integration test updates

pnp · May 27, 2021 · d82371f · d82371f
1 parent 2031f6b
commit d82371f
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 24 deletions.
diff --git a/.github/workflows/generator-integration-test.yaml b/.github/workflows/generator-integration-test.yaml
@@ -0,0 +1,25 @@
+name: Integration test for generator-teams
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x, 14.x, 15.x, 16.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm install
+      working-directory: packages/generator-teams
+    - run: npm run test-integration
+      working-directory: packages/generator-teams
+      env:
+        CI: true
diff --git a/packages/generator-teams/CHANGELOG.md b/packages/generator-teams/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 * Moved custom `skip-install` implementation to native Yeoman version
 * Updated to Microsoft Teams JS SDK 1.10
 * Node 10.x no longer supported
+* Improved integration testing for generator
 
 ### Deleted
 

diff --git a/packages/generator-teams/src/app/templates/package.json b/packages/generator-teams/src/app/templates/package.json
@@ -5,6 +5,7 @@
   "scripts": {
     "start": "node dist/server.js",
     "build": "gulp build",
+    "manifest": "gulp manifest",
     "lint": "eslint ./src --ext .js,.jsx,.ts,.tsx",
     "debug": "gulp serve --debug"<% if (unitTestsEnabled) { %>,
     "test": "jest",
@@ -64,7 +65,7 @@
     "vinyl": "2.2.0",
     "webpack": "5.0.0",
     "yargs": "^16.0.3",
-    "yoteams-build-core": "^1.1.0",
+    "yoteams-build-core": "^1.2.0-preview",
     "webpack-node-externals": "^2.5.2"
   },
   "browserslist": [

diff --git a/packages/generator-teams/tests/helpers/TestHelper.ts b/packages/generator-teams/tests/helpers/TestHelper.ts
@@ -72,6 +72,16 @@ export const SCRIPT_FILES = [
   "src/client/tsconfig.json"
 ];
 
+export const DIST_FILES = [
+  'dist/server.js',
+  'dist/web/index.html',
+  'dist/web/privacy.html',
+  'dist/web/tou.html',
+  'dist/web/assets/icon.png',
+  'dist/web/scripts/client.js',
+  'dist/web/styles/main.css',
+];
+
 export const basePrompts = {
   "solutionName": "teams-solution",
   "whichFolder": "current",
@@ -116,7 +126,7 @@ export enum TestTypes {
   UNIT = "UNIT",
   INTEGRATION = "INTEGRATION"
 }
-export function coreTests(manifestVersion: string, prompts: any) {
+export async function coreTests(manifestVersion: string, prompts: any, projectPath: string) {
   it("Should have root files", async () => {
     assert.file(ROOT_FILES);
   });
@@ -236,6 +246,28 @@ export function coreTests(manifestVersion: string, prompts: any) {
       });
     })
   }
+
+  // Integration tests
+  if (process.env.TEST_TYPE == TestTypes.INTEGRATION) {
+    it("Should run npm install successfully", async () => {
+      const npmInstallResult = await runNpmCommand("npm install --prefer-offline", projectPath);
+      assert.strictEqual(false, npmInstallResult);
+    });
+
+    it("Should run npm build successfully", async () => {
+      const npmRunBuildResult = await runNpmCommand("npm run build", projectPath);
+      assert.strictEqual(false, npmRunBuildResult);
+    });
+
+    it("Should validate manifest successfully", async () => {
+      const npmResult = await runNpmCommand("npm run manifest", projectPath);
+      assert.strictEqual(false, npmResult);
+    });
+
+    it("Should have ./dist files", async () => {
+      assert.file(DIST_FILES);
+    });
+  }
 }
 
 
@@ -244,13 +276,13 @@ export async function runTests(prefix: string, tests: any[], additionalTests: Fu
     describe(test.description, async () => {
       for (const manifestVersion of test.manifestVersions as string[]) {
         // run without unit tests
-        runTest(manifestVersion, test, false);
+        await runTest(manifestVersion, test, false);
         // run with tests
-        runTest(manifestVersion, test, true);
+        await runTest(manifestVersion, test, true);
         // upgrade if possible
         if (UPGRADE_PATHS[manifestVersion]) {
           for (const upgradeTo of UPGRADE_PATHS[manifestVersion])
-            runUpgradeTest(manifestVersion, upgradeTo, test, false);
+            await runUpgradeTest(manifestVersion, upgradeTo, test, false);
         }
       }
     });
@@ -278,22 +310,13 @@ export async function runTests(prefix: string, tests: any[], additionalTests: Fu
           .withGenerators(DEPENDENCIES);
       });
 
-      coreTests(manifestVersion, prompts);
+      coreTests(manifestVersion, prompts, projectPath);
 
 
       if (additionalTests) {
         await additionalTests(prompts);
       }
 
-
-
-      if (process.env.TEST_TYPE == TestTypes.INTEGRATION) {
-        const npmInstallResult = await runNpmCommand("npm install --prefer-offline", projectPath);
-        assert.strictEqual(false, npmInstallResult);
-
-        const npmRunBuildResult = await runNpmCommand("npm run build", projectPath);
-        assert.strictEqual(false, npmRunBuildResult);
-      }
     });
   }
 
@@ -334,16 +357,8 @@ export async function runTests(prefix: string, tests: any[], additionalTests: Fu
           .withGenerators(DEPENDENCIES);
       });
 
+      coreTests(to, prompts, projectPath);
 
-      coreTests(to, prompts);
-
-      if (process.env.TEST_TYPE == TestTypes.INTEGRATION) {
-        const npmInstallResult = await runNpmCommand("npm install --prefer-offline", projectPath);
-        assert.strictEqual(false, npmInstallResult);
-
-        const npmRunBuildResult = await runNpmCommand("npm run build", projectPath);
-        assert.strictEqual(false, npmRunBuildResult);
-      }
     });
   }
 }