Flatten e2e test utils (#6164)

npm workspaces doesn't seem to handle nested packages very well. To get our repo ready for workspaces this PR moves the e2e test utils to be a sibling of the samples rather than a parent
AzureAD · Jun 27, 2023 · 533afa1 · 533afa1
1 parent 5cd5987
commit 533afa1
Show file tree

Hide file tree

Showing 109 changed files with 765 additions and 5,751 deletions.
diff --git a/.github/workflows/msal-angular-e2e.yml b/.github/workflows/msal-angular-e2e.yml
@@ -59,8 +59,8 @@ jobs:
       run: npm run build:all
 
     - name: Install Test Tools
-      working-directory: samples
-      run: npm ci
+      working-directory: samples/e2eTestUtils
+      run: npm install
 
     - name: Install ${{ matrix.sample }}
       working-directory: samples/msal-angular-v3-samples/${{ matrix.sample }}

diff --git a/.github/workflows/msal-browser-e2e.yml b/.github/workflows/msal-browser-e2e.yml
@@ -65,19 +65,10 @@ jobs:
         RUNNING_NODE_CI: 1
       run: npm ci
 
-    - name: Restore node_modules for test tools
-      uses: actions/cache@v3
-      id: test-tools-cache
-      with:
-        path: |
-          samples/node_modules
-          samples/.cache/puppeteer
-        key: ${{ runner.os }}-browser-test-tools-${{ hashFiles('samples/package-lock.json') }}
-
     - name: Install Test Tools
       if: steps.test-tools-cache.outputs.cache-hit != 'true'
-      working-directory: samples
-      run: npm ci
+      working-directory: samples/e2eTestUtils
+      run: npm install
 
     - name: Restore node_modules for sample
       uses: actions/cache@v3

diff --git a/.github/workflows/msal-node-e2e.yml b/.github/workflows/msal-node-e2e.yml
@@ -69,23 +69,13 @@ jobs:
       run: npx lerna --scope @azure/msal-node --scope @azure/msal-common bootstrap
 
     - name: Build Package
-      working-directory: samples/msal-node-samples
-      run: npm run build:package
-
-    - name: Restore node_modules for test tools
-      if: matrix.node == '10' || matrix.node == '12'
-      uses: actions/cache@v3
-      id: test-tools-cache
-      with:
-        path: |
-          samples/node_modules
-          samples/.cache/puppeteer
-        key: ${{ runner.os }}-node-test-tools-${{ matrix.node }}-${{ hashFiles('samples/package-lock.json') }}
+      working-directory: lib/msal-node
+      run: npm run build:all
 
     - name: Install Test Tools
       if: steps.test-tools-cache.outputs.cache-hit != 'true'
-      working-directory: samples
-      run: npm ci
+      working-directory: samples/e2eTestUtils
+      run: npm install
 
     - name: Restore node_modules for sample
       uses: actions/cache@v3
@@ -160,20 +150,13 @@ jobs:
       run: npm ci
 
     - name: Build Package
-      working-directory: samples/msal-node-samples
-      run: npm run build:package
-
-    - name: Restore node_modules for test tools
-      uses: actions/cache@v3
-      id: test-tools-cache
-      with:
-        path: samples/node_modules
-        key: ${{ runner.os }}-node-test-tools-${{ hashFiles('samples/package-lock.json') }}
+      working-directory: lib/msal-node
+      run: npm run build:all
 
     - name: Install Test Tools
       if: steps.test-tools-cache.outputs.cache-hit != 'true'
-      working-directory: samples
-      run: npm ci
+      working-directory: samples/e2eTestUtils
+      run: npm install
       env:
         PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
         PLAYWRIGHT_BROWSERS_PATH: 0

diff --git a/.github/workflows/msal-react-e2e.yml b/.github/workflows/msal-react-e2e.yml
@@ -70,19 +70,10 @@ jobs:
       working-directory: lib/msal-react
       run: npm run build:all
 
-    - name: Restore node_modules for test tools
-      uses: actions/cache@v3
-      id: test-tools-cache
-      with:
-        path: |
-          samples/node_modules
-          samples/.cache/puppeteer
-        key: ${{ runner.os }}-react-e2e-${{ hashFiles('samples/package-lock.json') }}
-
     - name: Install Test Tools
       if: steps.test-tools-cache.outputs.cache-hit != 'true'
-      working-directory: samples
-      run: npm ci
+      working-directory: samples/e2eTestUtils
+      run: npm install
 
     - name: Restore node_modules for sample
       uses: actions/cache@v3

diff --git a/samples/.puppeteerrc.cjs b/samples/.puppeteerrc.cjs
diff --git a/samples/e2eTestUtils/TestUtils.ts b/samples/e2eTestUtils/TestUtils.ts
diff --git a/samples/package.json → samples/e2eTestUtils/package.json b/samples/package.json → samples/e2eTestUtils/package.json
@@ -1,25 +1,24 @@
 {
-    "name": "msal-js-samples",
+    "name": "e2e-test-utils",
     "version": "0.0.1",
     "license": "MIT",
     "private": true,
-    "scripts": {
-        "test": "jest",
-        "test:agc": "jest --testMatch [ '**/test/**/*agc*.spec.ts' ]"
-    },
     "dependencies": {
-        "axios": "^1.4.0",
-        "typescript": "^4.9.5"
-    },
-    "devDependencies": {
         "@azure/identity": "^3.1.2",
         "@azure/keyvault-secrets": "^4.3.0",
-        "@types/jest": "^29.5.1",
         "dotenv": "^8.2.0",
-        "find-process": "^1.4.4",
-        "jest": "^29.5.0",
+        "axios": "^1.4.0",
+        "find-process": "^1.4.4"
+    },
+    "devDependencies": {
+        "typescript": "^4.9.5"
+    },
+    "peerDependencies": {
         "playwright-core": "^1.31.1",
-        "puppeteer": "^20.1.2",
-        "ts-jest": "^29.1.0"
+        "puppeteer": "^20.7.2",
+        "jest": "^29.5.0",
+        "@azure/msal-browser": "^3.0.0-beta.0",
+        "@azure/msal-common": "^14.0.0-beta.0",
+        "@azure/msal-node": "^2.0.0-beta.0"
     }
 }
diff --git a/...les/e2eTestUtils/BrowserCacheTestUtils.ts → ...e2eTestUtils/src/BrowserCacheTestUtils.ts b/...les/e2eTestUtils/BrowserCacheTestUtils.ts → ...e2eTestUtils/src/BrowserCacheTestUtils.ts
@@ -1,8 +1,8 @@
 import * as puppeteer from "puppeteer";
 
 import { LabConfig } from "./LabConfig";
-import { Configuration } from "../../lib/msal-browser";
-import { ServerTelemetryEntity } from "../../lib/msal-common";
+import { Configuration } from "@azure/msal-browser";
+import { ServerTelemetryEntity } from "@azure/msal-common";
 
 export type tokenMap = {
     idTokens: string[],

diff --git a/samples/e2eTestUtils/Constants.ts → samples/e2eTestUtils/src/Constants.ts b/samples/e2eTestUtils/Constants.ts → samples/e2eTestUtils/src/Constants.ts
diff --git a/...eTestUtils/ElectronPlaywrightTestUtils.ts → ...tUtils/src/ElectronPlaywrightTestUtils.ts b/...eTestUtils/ElectronPlaywrightTestUtils.ts → ...tUtils/src/ElectronPlaywrightTestUtils.ts
diff --git a/samples/e2eTestUtils/KeyVaultUtils.ts → samples/e2eTestUtils/src/KeyVaultUtils.ts b/samples/e2eTestUtils/KeyVaultUtils.ts → samples/e2eTestUtils/src/KeyVaultUtils.ts
diff --git a/samples/e2eTestUtils/LabApiQueryParams.ts → ...les/e2eTestUtils/src/LabApiQueryParams.ts b/samples/e2eTestUtils/LabApiQueryParams.ts → ...les/e2eTestUtils/src/LabApiQueryParams.ts
diff --git a/samples/e2eTestUtils/LabClient.ts → samples/e2eTestUtils/src/LabClient.ts b/samples/e2eTestUtils/LabClient.ts → samples/e2eTestUtils/src/LabClient.ts
diff --git a/samples/e2eTestUtils/LabConfig.ts → samples/e2eTestUtils/src/LabConfig.ts b/samples/e2eTestUtils/LabConfig.ts → samples/e2eTestUtils/src/LabConfig.ts
diff --git a/samples/e2eTestUtils/MsidApp.ts → samples/e2eTestUtils/src/MsidApp.ts b/samples/e2eTestUtils/MsidApp.ts → samples/e2eTestUtils/src/MsidApp.ts
diff --git a/samples/e2eTestUtils/MsidLab.ts → samples/e2eTestUtils/src/MsidLab.ts b/samples/e2eTestUtils/MsidLab.ts → samples/e2eTestUtils/src/MsidLab.ts
diff --git a/samples/e2eTestUtils/MsidUser.ts → samples/e2eTestUtils/src/MsidUser.ts b/samples/e2eTestUtils/MsidUser.ts → samples/e2eTestUtils/src/MsidUser.ts
diff --git a/...s/msal-node-samples/NodeCacheTestUtils.ts → ...es/e2eTestUtils/src/NodeCacheTestUtils.ts b/...s/msal-node-samples/NodeCacheTestUtils.ts → ...es/e2eTestUtils/src/NodeCacheTestUtils.ts
@@ -1,8 +1,5 @@
 import fs from "fs";
-import { IdTokenEntity } from "../../lib/msal-common/src/cache/entities/IdTokenEntity";
-import { AccessTokenEntity } from "../../lib/msal-common/src/cache/entities/AccessTokenEntity";
-import { RefreshTokenEntity } from "../../lib/msal-common/src/cache/entities/RefreshTokenEntity";
-
+import { IdTokenEntity, AccessTokenEntity, RefreshTokenEntity } from "@azure/msal-common";
 import { InMemoryCache, internals } from "@azure/msal-node";
 
 export type tokenMap = {