Full run e2e on every branch

Author: jeffsmale90

.github/workflows/build-lint-test.yml

@@ -20,13 +20,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x, 20.x, 22.x]
+        node-version: [20.x, 22.x]
     steps:
       - name: Checkout and setup environment
         uses: MetaMask/action-checkout-and-setup@v1
         with:
           is-high-risk-environment: false
-          cache-node-modules: ${{ matrix.node-version == '22.x' }}
+          cache-node-modules: true
           submodules: 'recursive'
 
       - name: Install Foundry

.github/workflows/end-to-end-tests.yml

@@ -13,28 +13,21 @@ on:
       NPM_CLIENT:
         type: string
         default: 'yarn'
-      RUN_FULL_TESTS:
-        type: boolean
-        default: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') }}
   workflow_dispatch:
-    inputs:
-      RUN_FULL_TESTS:
-        type: boolean
-        default: true
 
 jobs:
   pipeline:
     name: Turbo Pipeline
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
     steps:
       - name: Checkout and setup environment
         uses: MetaMask/action-checkout-and-setup@v1
         with:
           is-high-risk-environment: false
-          cache-node-modules: ${{ matrix.node-version == '22.x' }}
+          cache-node-modules: true
           submodules: 'recursive'
 
       - name: Install Foundry
@@ -60,9 +53,4 @@ jobs:
           NODE_ENV: production
 
       - name: Run end-to-end tests
-        run: |
-          if [[ "${{ inputs.RUN_FULL_TESTS }}" == "true" ]]; then
-            yarn e2etest:full
-          else
-            yarn e2etest:smoketest
-          fi
+        run: yarn test:e2e

.github/workflows/main.yml

@@ -83,7 +83,6 @@ jobs:
         with:
           commit-starts-with: 'Release [version],Release v[version],Release/[version],Release/v[version],Release `[version]`'
 
-
   publish-release:
     needs: is-release
     if: needs.is-release.outputs.IS_RELEASE == 'true'

CONTRIBUTING.md

@@ -42,7 +42,7 @@ yarn test
 Run the `delegator-e2e` integration test suite:
 
 ```sh
-yarn e2etest:full
+yarn e2etest
 ```
 
 # Contributing

package.json

@@ -23,8 +23,7 @@
     "generate:abi": "cd ./shared/abi/scripts && ./generate-abi.sh",
     "lint": "turbo lint",
     "test": "turbo run test --filter='!./packages/delegator-e2e'",
-    "e2etest:full": "turbo run e2etest:full --filter='./packages/delegator-e2e'",
-    "e2etest:smoketest": "turbo run e2etest:smoketest --filter='./packages/delegator-e2e'",
+    "test:e2e": "turbo run test:e2e --filter='./packages/delegator-e2e'",
     "test:watch": "turbo run test:watch"
   },
   "devDependencies": {

packages/delegator-e2e/README.md

@@ -20,10 +20,7 @@ When developing end-to-end tests, you can run step 2 repeatedly without having t
 
 ### Test Types
 
-There are two types of test suites available:
-
-- **Full Tests** (`yarn e2etest:full`): Runs the complete test suite including all test cases. This is used in the main branch and release branches to ensure comprehensive testing.
-- **Smoke Tests** (`yarn e2etest:smoketest`): Runs only the main test cases, skipping edge cases and alternative scenarios. This is used in feature branches for faster feedback during development.
+The end-to-end test suite runs the complete test suite including all test cases using `yarn test:e2e`.
 
 ## Adding tests
 
@@ -42,7 +39,7 @@ Some guidelines for creating tests:
 
 ### Test Structure
 
-When creating a test file, follow this structure to support both full and smoke test runs:
+When creating a test file, follow this structure:
 
 ```typescript
 import { beforeEach, expect, test } from 'vitest';
@@ -63,12 +60,10 @@ beforeEach(async () => {
   - Any important context
 */
 
-// Main test case that will run in both full and smoke tests
-test('maincase: Description of the main functionality', async () => {
+test('Description of the main functionality', async () => {
   ...
 });
 
-// Additional test cases that will only run in full test suite
 test('Description of edge case or alternative scenario', async () => {
   ...
 });
@@ -80,29 +75,15 @@ test('Description of failure case', async () => {
 
 Key points about test structure:
 
-1. **Main Test Case**:
-   - Prefix the main test case with `maincase:` in the test description
-   - This test will run in both full and smoke test suites
-   - Should cover the primary happy path functionality
-
-2. **Additional Test Cases**:
-   - These will only run in the full test suite
-   - Can include:
-     - Edge cases
-     - Alternative scenarios
-     - Failure cases
-
-3. **Test Organization**:
+1. **Test Organization**:
    - Use `beforeEach` for common setup
    - Group related assertions together
    - Use descriptive test names that explain the scenario
    - Include a block comment describing the user story
 
-4. **Common Patterns**:
+2. **Common Patterns**:
    - Use helper functions from `utils/helpers.ts` for common operations
    - Use assertion functions from `utils/assertions.ts` for consistent validation
    - Generate unique addresses and keys for each test
    - Clean up state in `beforeEach` to ensure test isolation
-   - `runTest_expectSuccess` and `runTest_expectFailure` to abstract common functionality out of each test within the file
-
-The smoke test runner will only execute tests with `maincase:` in their description, while the full test runner will execute all test cases. This allows for quick feedback during development while maintaining comprehensive testing in the main and release branches.
+   - `runTest_expectSuccess` and `runTest_expectFailure` to abstract common functionality out of each test within the file

packages/delegator-e2e/package.json

@@ -14,10 +14,8 @@
   "scripts": {
     "build": "cd contracts && forge build && cd ..",
     "setup": "yarn build && docker compose up -d && npx tsx src/await-dependencies.ts",
-    "run-test:full": "npx vitest run",
-    "run-test:smoketest": "npx vitest run --testNamePattern maincase",
-    "e2etest:full": "yarn setup && yarn run-test:full; EXIT_CODE=$?; yarn teardown; exit $EXIT_CODE",
-    "e2etest:smoketest": "yarn setup && yarn run-test:smoketest; EXIT_CODE=$?; yarn teardown; exit $EXIT_CODE",
+    "test": "npx vitest run",
+    "test:e2e": "yarn setup && yarn test; EXIT_CODE=$?; yarn teardown; exit $EXIT_CODE",
     "teardown": "docker compose down"
   },
   "peerDependencies": {

turbo.json

@@ -13,10 +13,7 @@
     "test": {
       "dependsOn": ["^build", "^test"]
     },
-    "e2etest:full": {
-      "dependsOn": ["^build"]
-    },
-    "e2etest:smoketest": {
+    "test:e2e": {
       "dependsOn": ["^build"]
     },
     "test:watch": {