yaml code clean up and enable the e2e test

os-fpga · Nov 8, 2024 · 580c7bc · 580c7bc
1 parent a75e247
commit 580c7bc
Show file tree

Hide file tree

Showing 5 changed files with 233 additions and 234 deletions.
diff --git a/.github/workflows/rpe_test.yml b/.github/workflows/rpe_test.yml
@@ -31,7 +31,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Bring in closed src device.xml
+      - name: Bring in device.xml
         uses: actions/checkout@v4
         with:
           repository: os-fpga/Raptor
@@ -96,14 +96,13 @@ jobs:
 
       - name: E2E Playwright tests on Linux latest & MacOS
         if: ${{ matrix.os == 'ubuntu-latest' }}     
-        run: ls -l Raptor/etc/devices &&  cp -rf Raptor/etc backend && npm run compile && xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npx playwright test -- fle.test.js
+        run: |
+            cp -rf Raptor/etc backend
+            npm run compile && xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npx playwright test
 
       - name: cat RPE log
         if: matrix.os == 'ubuntu-latest'  &&  always()
-        run: |
-           ls -la
-           cd $HOME && pwd
-           find $HOME -type f -name "rpe.log" -exec cat {} +
+        run: find $HOME -type f -name "rpe.log" -exec cat {} +
 
 
       - name: Run ESLint only on ubuntu-latest

diff --git a/tests/e2e/acpu.test.js b/tests/e2e/acpu.test.js
@@ -1,37 +1,37 @@
-// const { _electron: electron } = require('playwright');
-// const { test, expect } = require('@playwright/test');
+const { _electron: electron } = require('playwright');
+const { test, expect } = require('@playwright/test');
 
-// test('Launch Electron app, select device, toggle ACPU power, and click Add slowly', async () => {
-//   const app = await electron.launch({ args: ['main.js'] });
+test('Launch Electron app, select device, toggle ACPU power, and click Add slowly', async () => {
+  const app = await electron.launch({ args: ['main.js'] });
 
-//   const window = await app.firstWindow();
+  const window = await app.firstWindow();
 
-//   // selecting the device (MPW1 Gemini)
-//   const deviceDropdown = await window.waitForSelector('#deviceId');
-//   await deviceDropdown.selectOption('MPW1');
-//   await new Promise((resolve) => setTimeout(resolve, 2000)); // wait 2 seconds (not really needed, just for demo)
+  // selecting the device (MPW1 Gemini)
+  const deviceDropdown = await window.waitForSelector('#deviceId');
+  await deviceDropdown.selectOption('MPW1');
+  await new Promise((resolve) => setTimeout(resolve, 2000)); // wait 2 seconds (not really needed, just for demo)
 
-//   // clicking on ACPU block
-//   const acpuBlock = await window.waitForSelector('#app > div > div.top-row-container > div.main-table-container.main-border > div.top-l2 > div.top-l2-col1 > div.top-l2-col1-row1 > div:nth-child(1) > div');
-//   await acpuBlock.click();
-//   await new Promise((resolve) => setTimeout(resolve, 2000)); 
+  // clicking on ACPU block
+  const acpuBlock = await window.waitForSelector('#app > div > div.top-row-container > div.main-table-container.main-border > div.top-l2 > div.top-l2-col1 > div.top-l2-col1-row1 > div:nth-child(1) > div');
+  await acpuBlock.click();
+  await new Promise((resolve) => setTimeout(resolve, 2000)); 
 
-//   // toggling ACPU power, basically turning on the power on
-//   const acpuPowerToggle = await window.waitForSelector('#app > div > div.table-container.main-border > div > div.toggle-container > label.toggle-switch > span');
-//   await acpuPowerToggle.click();
-//   await new Promise((resolve) => setTimeout(resolve, 2000)); 
+  // toggling ACPU power, basically turning on the power on
+  const acpuPowerToggle = await window.waitForSelector('#app > div > div.table-container.main-border > div > div.toggle-container > label.toggle-switch > span');
+  await acpuPowerToggle.click();
+  await new Promise((resolve) => setTimeout(resolve, 2000)); 
 
-//   // Click on Add button
-//   const addButton = await window.waitForSelector('#app > div > div.table-container.main-border > div > div.cpu-container > div.table-wrapper > button');
-//   await addButton.click();
-//   await new Promise((resolve) => setTimeout(resolve, 2000));
+  // Click on Add button
+  const addButton = await window.waitForSelector('#app > div > div.table-container.main-border > div > div.cpu-container > div.table-wrapper > button');
+  await addButton.click();
+  await new Promise((resolve) => setTimeout(resolve, 2000));
 
-//   // Click OK in the popup
-//   const okButton = await window.waitForSelector('body > div:nth-child(3) > div > div.ant-modal-wrap > div > div:nth-child(1) > div > div.ant-modal-footer > button.ant-btn.css-dev-only-do-not-override-apn68.ant-btn-primary.ant-btn-color-primary.ant-btn-variant-solid > span');
-//   await okButton.click();
-//   await new Promise((resolve) => setTimeout(resolve, 2000)); 
+  // Click OK in the popup
+  const okButton = await window.waitForSelector('body > div:nth-child(3) > div > div.ant-modal-wrap > div > div:nth-child(1) > div > div.ant-modal-footer > button.ant-btn.css-dev-only-do-not-override-apn68.ant-btn-primary.ant-btn-color-primary.ant-btn-variant-solid > span');
+  await okButton.click();
+  await new Promise((resolve) => setTimeout(resolve, 2000)); 
 
-//   console.log('Test case executed successfully.');
+  console.log('Test case executed successfully.');
 
-//   await app.close();
-// });
+  await app.close();
+});
diff --git a/tests/e2e/bcpu.test.js b/tests/e2e/bcpu.test.js
@@ -1,44 +1,44 @@
-// const { _electron: electron } = require('playwright');
-// const { test, expect } = require('@playwright/test');
-
-// test('Launch Electron app, select device MPW1 Gemini, and click on BCPU block', async () => {
-//   const app = await electron.launch({ args: ['main.js'], headless: false });
-
-//   const window = await app.firstWindow();
-
-//   // selecting MPW1 Gemini from device dropdown
-//   const deviceDropdown = await window.waitForSelector('#deviceId');
-//   await deviceDropdown.selectOption('MPW1');
-//   await window.waitForTimeout(2000); // wait for UI update
-
-//   // click on the BCPU block
-//   const bcpuSelector = '#app > div > div.top-row-container > div.main-table-container.main-border > div.top-l2 > div.top-l2-col1 > div.top-l2-col1-row1 > div:nth-child(2) > div';
-//   await window.waitForSelector(bcpuSelector); 
-//   await window.click(bcpuSelector); 
-
-//   // click on "Add" button
-//   const addButtonSelector = '#app > div > div.table-container.main-border > div > div.cpu-container > div.table-wrapper > button';
-//   await window.waitForSelector(addButtonSelector, { state: 'visible' });
-//   await window.click(addButtonSelector); 
-
-//   // click on "OK" button
-//   const okButtonSelector = 'button.ant-btn-primary';
-//   await window.waitForSelector(okButtonSelector, { state: 'visible' });
-//   await window.click(okButtonSelector);
-
-//   // click on Peripherals tab
-//   const peripheralsTabSelector = '#app > div > div.top-row-container > div.main-table-container.main-border > div.top-l2 > div.top-l2-col1 > div:nth-child(3) > div > div:nth-child(2) > div:nth-child(2) > div.periph-internal-font-header';
-//   await window.waitForSelector(peripheralsTabSelector, { state: 'visible' });
-//   await window.click(peripheralsTabSelector);
-
-//   // check SPI/QSPI block
-//   const spiQspiCheckSelector = '#\\30';
-//   await window.waitForSelector(spiQspiCheckSelector, { state: 'visible' });
-//   await window.click(spiQspiCheckSelector);
-
-//   // waiting to observe result on UI
-//   await window.waitForTimeout(5000);
-
-//   // closing RPE
-//   await app.close();
-// });
+const { _electron: electron } = require('playwright');
+const { test, expect } = require('@playwright/test');
+
+test('Launch Electron app, select device MPW1 Gemini, and click on BCPU block', async () => {
+  const app = await electron.launch({ args: ['main.js'], headless: false });
+
+  const window = await app.firstWindow();
+
+  // selecting MPW1 Gemini from device dropdown
+  const deviceDropdown = await window.waitForSelector('#deviceId');
+  await deviceDropdown.selectOption('MPW1');
+  await window.waitForTimeout(2000); // wait for UI update
+
+  // click on the BCPU block
+  const bcpuSelector = '#app > div > div.top-row-container > div.main-table-container.main-border > div.top-l2 > div.top-l2-col1 > div.top-l2-col1-row1 > div:nth-child(2) > div';
+  await window.waitForSelector(bcpuSelector); 
+  await window.click(bcpuSelector); 
+
+  // click on "Add" button
+  const addButtonSelector = '#app > div > div.table-container.main-border > div > div.cpu-container > div.table-wrapper > button';
+  await window.waitForSelector(addButtonSelector, { state: 'visible' });
+  await window.click(addButtonSelector); 
+
+  // click on "OK" button
+  const okButtonSelector = 'button.ant-btn-primary';
+  await window.waitForSelector(okButtonSelector, { state: 'visible' });
+  await window.click(okButtonSelector);
+
+  // click on Peripherals tab
+  const peripheralsTabSelector = '#app > div > div.top-row-container > div.main-table-container.main-border > div.top-l2 > div.top-l2-col1 > div:nth-child(3) > div > div:nth-child(2) > div:nth-child(2) > div.periph-internal-font-header';
+  await window.waitForSelector(peripheralsTabSelector, { state: 'visible' });
+  await window.click(peripheralsTabSelector);
+
+  // check SPI/QSPI block
+  const spiQspiCheckSelector = '#\\30';
+  await window.waitForSelector(spiQspiCheckSelector, { state: 'visible' });
+  await window.click(spiQspiCheckSelector);
+
+  // waiting to observe result on UI
+  await window.waitForTimeout(5000);
+
+  // closing RPE
+  await app.close();
+});
diff --git a/tests/e2e/clocking.test.js b/tests/e2e/clocking.test.js
@@ -1,51 +1,51 @@
-// const { _electron: electron } = require('playwright');
-// const { test, expect } = require('@playwright/test');
-
-// test('Launch Electron app, select device, toggle ACPU power, click Clocking, Add clock source, and submit form', async () => {
-//   const app = await electron.launch({ args: ['main.js'] });
-//   const window = await app.firstWindow();
-
-//   // Selecting the device (MPW1 Gemini)
-//   const deviceDropdown = await window.waitForSelector('#deviceId');
-//   await deviceDropdown.selectOption('MPW1');
-//   await new Promise((resolve) => setTimeout(resolve, 2000)); // Wait for 2 seconds
-
-//   // Selecting Clocking block
-//   const clockingBlockSelector = '#app > div > div.top-row-container > div.main-table-container.main-border > div.top-l2 > div.top-l2-col2 > div.top-l2-col2-elem > div > div:nth-child(2) > div:nth-child(1) > div';
-//   const clockingBlock = await window.waitForSelector(clockingBlockSelector);
-//   await clockingBlock.click();
-//   await new Promise((resolve) => setTimeout(resolve, 2000)); // Wait for 2 seconds
-
-//   // Clicking on Add button
-//   const addButtonSelector = '#app > div > div.table-container.main-border > div > div.power-and-table-wrapper > div.table-wrapper > button';
-//   const addButton = await window.waitForSelector(addButtonSelector);
-//   await addButton.click();
-//   await new Promise((resolve) => setTimeout(resolve, 2000)); // Wait for 2 seconds
-
-//   // Ensure modal is visible before interacting
-//   const modalSelector = 'body > div:nth-child(3) > div > div.ant-modal-wrap > div';
-//   await window.waitForSelector(modalSelector, { state: 'visible', timeout: 5000 }); // Wait for modal
-
-//   // Typing description as 'test'
-//   const descriptionSelector = 'body > div:nth-child(3) > div > div.ant-modal-wrap > div > div:nth-child(1) > div > div.ant-modal-body > div > form > div:nth-child(2) > input[type=text]';
-//   const descriptionInput = await window.waitForSelector(descriptionSelector);
-//   await descriptionInput.click();
-//   await descriptionInput.fill('test');
-//   await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait for 1 second
-
-//   // Typing Port/Signal name as 'test'
-//   const portSignalSelector = 'body > div:nth-child(3) > div > div.ant-modal-wrap > div > div:nth-child(1) > div > div.ant-modal-body > div > form > div:nth-child(3) > input[type=text]';
-//   const portSignalInput = await window.waitForSelector(portSignalSelector);
-//   await portSignalInput.click();
-//   await portSignalInput.fill('test');
-//   await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait for 1 second
-
-//   // Clicking OK to submit the form
-//   const okButtonSelector = 'body > div:nth-child(3) > div > div.ant-modal-wrap > div > div:nth-child(1) > div > div.ant-modal-footer > button.ant-btn.css-dev-only-do-not-override-apn68.ant-btn-primary.ant-btn-color-primary.ant-btn-variant-solid';
-//   const okButton = await window.waitForSelector(okButtonSelector);
-//   await okButton.click();
-
-//   // Closing the test
-//   await app.close();
-// });
+const { _electron: electron } = require('playwright');
+const { test, expect } = require('@playwright/test');
+
+test('Launch Electron app, select device, toggle ACPU power, click Clocking, Add clock source, and submit form', async () => {
+  const app = await electron.launch({ args: ['main.js'] });
+  const window = await app.firstWindow();
+
+  // Selecting the device (MPW1 Gemini)
+  const deviceDropdown = await window.waitForSelector('#deviceId');
+  await deviceDropdown.selectOption('MPW1');
+  await new Promise((resolve) => setTimeout(resolve, 2000)); // Wait for 2 seconds
+
+  // Selecting Clocking block
+  const clockingBlockSelector = '#app > div > div.top-row-container > div.main-table-container.main-border > div.top-l2 > div.top-l2-col2 > div.top-l2-col2-elem > div > div:nth-child(2) > div:nth-child(1) > div';
+  const clockingBlock = await window.waitForSelector(clockingBlockSelector);
+  await clockingBlock.click();
+  await new Promise((resolve) => setTimeout(resolve, 2000)); // Wait for 2 seconds
+
+  // Clicking on Add button
+  const addButtonSelector = '#app > div > div.table-container.main-border > div > div.power-and-table-wrapper > div.table-wrapper > button';
+  const addButton = await window.waitForSelector(addButtonSelector);
+  await addButton.click();
+  await new Promise((resolve) => setTimeout(resolve, 2000)); // Wait for 2 seconds
+
+  // Ensure modal is visible before interacting
+  const modalSelector = 'body > div:nth-child(3) > div > div.ant-modal-wrap > div';
+  await window.waitForSelector(modalSelector, { state: 'visible', timeout: 5000 }); // Wait for modal
+
+  // Typing description as 'test'
+  const descriptionSelector = 'body > div:nth-child(3) > div > div.ant-modal-wrap > div > div:nth-child(1) > div > div.ant-modal-body > div > form > div:nth-child(2) > input[type=text]';
+  const descriptionInput = await window.waitForSelector(descriptionSelector);
+  await descriptionInput.click();
+  await descriptionInput.fill('test');
+  await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait for 1 second
+
+  // Typing Port/Signal name as 'test'
+  const portSignalSelector = 'body > div:nth-child(3) > div > div.ant-modal-wrap > div > div:nth-child(1) > div > div.ant-modal-body > div > form > div:nth-child(3) > input[type=text]';
+  const portSignalInput = await window.waitForSelector(portSignalSelector);
+  await portSignalInput.click();
+  await portSignalInput.fill('test');
+  await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait for 1 second
+
+  // Clicking OK to submit the form
+  const okButtonSelector = 'body > div:nth-child(3) > div > div.ant-modal-wrap > div > div:nth-child(1) > div > div.ant-modal-footer > button.ant-btn.css-dev-only-do-not-override-apn68.ant-btn-primary.ant-btn-color-primary.ant-btn-variant-solid';
+  const okButton = await window.waitForSelector(okButtonSelector);
+  await okButton.click();
+
+  // Closing the test
+  await app.close();
+});