Merge branch 'workspace/v16.0.0' into dev/john/salesforce-update

built-on-openfin · Dec 1, 2023 · 80bfacf · 80bfacf
2 parents 8f48bc3 + 1545375
commit 80bfacf
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 30 deletions.
diff --git a/.github/workflows/automation-testing-full.yaml b/.github/workflows/automation-testing-full.yaml
@@ -6,53 +6,74 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  e2e:
     runs-on: windows-latest
 
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
-      - name: Setup Node 16
+
+      - name: Setup Node 18
         uses: actions/setup-node@v3
         with:
-          node-version: 16
-      - name: Install Packages
-        run: |
-          npm install
+          node-version: 18
+          registry-url: https://registry.npmjs.org
+          scope: '@openfin'
+
+      - name: Restore root node_modules from cache
+        id: node-cache
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: node-modules-${{ hashFiles('package-lock.json') }}
+
+      - name: Install dependencies
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm ci
+
       - name: Run JavaScript Tests with Mocha
         run: |
           npx fkill-cli OpenFin OpenFinRVM --force --silent
           npm run test-remote-mocha --prefix how-to/automation-testing/register-with-home-js
+
       - name: Run WDIO tests
         run: |
           npm run kill --prefix how-to/automation-testing/wdio
           npm run dos --prefix how-to/automation-testing/wdio
           npm run test --prefix how-to/automation-testing/wdio
+
       - name: Run Selenium tests
         run: |
           npm run kill --prefix how-to/automation-testing/selenium
           npm run dos --prefix how-to/automation-testing/selenium
           npm run test --prefix how-to/automation-testing/selenium
+
       - name: Run JavaScript Tests with Jasmine
         run: |
           npx fkill-cli OpenFin OpenFinRVM --force --silent
           npm run test-remote-jasmine --prefix how-to/automation-testing/register-with-home-js
+
       - name: Run JavaScript Tests with Jest
         run: |
           npx fkill-cli OpenFin OpenFinRVM --force --silent
           npm run test-remote-jest --prefix how-to/automation-testing/register-with-home-js
+
       - name: Run TypeScript Tests with Mocha
         run: |
           npx fkill-cli OpenFin OpenFinRVM --force --silent
           npm run test-remote-mocha --prefix how-to/automation-testing/register-with-home-ts
+
       - name: Run TypeScript Tests with Jasmine
         run: |
           npx fkill-cli OpenFin OpenFinRVM --force --silent
           npm run test-remote-jasmine --prefix how-to/automation-testing/register-with-home-ts
+
       - name: Run TypeScript Tests with Jest
         run: |
           npx fkill-cli OpenFin OpenFinRVM --force --silent
           npm run test-remote-jest --prefix how-to/automation-testing/register-with-home-ts
+
       - name: Run JavaScript Tests with Mocha for Store
         run: |
           npx fkill-cli OpenFin OpenFinRVM --force --silent

diff --git a/.github/workflows/automation-testing.yaml b/.github/workflows/automation-testing.yaml
@@ -6,19 +6,32 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  e2e:
     runs-on: windows-latest
 
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
-      - name: Setup Node 16
+
+      - name: Setup Node 18
         uses: actions/setup-node@v3
         with:
-          node-version: 16
-      - name: Install Packages
-        run: |
-          npm install
+          node-version: 18
+          registry-url: https://registry.npmjs.org
+          scope: '@openfin'
+
+      - name: Restore root node_modules from cache
+        id: node-cache
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: node-modules-${{ hashFiles('package-lock.json') }}
+
+      - name: Install dependencies
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm ci
+
       - name: Run JavaScript Tests with Mocha
         run: |
           npx fkill-cli OpenFin OpenFinRVM --force --silent

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -0,0 +1,38 @@
+name: Workspace Platform Starter - E2E Tests
+
+on: 
+  workflow_dispatch:
+  push:
+
+jobs:
+  e2e:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+
+      - name: Setup Node 18
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          registry-url: https://registry.npmjs.org
+          scope: '@openfin'
+
+      - name: Restore root node_modules from cache
+        id: node-cache
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: node-modules-${{ hashFiles('package-lock.json') }}
+
+      - name: Install dependencies
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm ci
+
+      - name: Run Workspace Platform Starter E2E Tests
+        working-directory: ./how-to/workspace-platform-starter
+        run: |
+          npm run build
+          npm run start & npm run e2e
diff --git a/.github/workflows/publish-HOWTOs.yml b/.github/workflows/publish-HOWTOs.yml
@@ -17,24 +17,24 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Setup Node.js
+      - name: Setup Node 18
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           registry-url: https://registry.npmjs.org
           scope: '@openfin'
 
-      - name: Install dependencies
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: npm ci
-
       - name: Restore root node_modules from cache
         id: node-cache
         uses: actions/cache@v3
         with:
           path: node_modules
-          key: node-modules-${{ hashFiles('package-lock.json') }}        
+          key: node-modules-${{ hashFiles('package-lock.json') }}
+
+      - name: Install dependencies
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm ci
 
       - name: Build packages
         run: npm run build

diff --git a/.github/workflows/publish-NPM.yaml b/.github/workflows/publish-NPM.yaml
@@ -4,16 +4,34 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@v3
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup Node 18
+        uses: actions/setup-node@v3
         with:
-          node-version: '19'
-          registry-url: 'https://registry.npmjs.org'
-      - run: npm run setup
+          node-version: 18
+          registry-url: https://registry.npmjs.org
+          scope: '@openfin'
+
+      - name: Restore root node_modules from cache
+        id: node-cache
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: node-modules-${{ hashFiles('package-lock.json') }}
+
+      - name: Install dependencies
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm ci
+
+      - run: npm run build
         working-directory: ./how-to/workspace-platform-starter
+
       - run: NAME=@openfin/default-workspace-platform npm run prepare-package
         working-directory: ./how-to/workspace-platform-starter
+
       - run: npm publish --access restricted
         working-directory: ./how-to/workspace-platform-starter/packaged
         env:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: Check Tests run
+name: Workspace Platform Starter - Unit Tests
 
 on:
   pull_request:

diff --git a/how-to/workspace-platform-starter/e2e/tests/platform.spec.ts b/how-to/workspace-platform-starter/e2e/tests/platform.spec.ts
@@ -6,9 +6,11 @@ describe("Platform", () => {
 		expect(isReady).toEqual(true);
 	});
 
-	it("The title should be set", async () => {
-		const title = await WebDriver.getTitle();
-		expect(title).toEqual("Platform Provider");
+	it("The platform title should be set", async () => {
+		const windows = await WebDriver.getWindows();
+		expect(windows.length).toBeGreaterThan(0);
+		const titles = windows.map((w) => w.title);
+		expect(titles).toContain("Platform Provider");
 	});
 
 	it("The runtime version should be set", async () => {