fix(e2e): Missing RBAC tests (#5419)

Co-authored-by: Wadii Zaim <wadii.zaim@flagsmith.com>

Author: khvn26

.github/workflows/.reusable-docker-e2e-tests.yml

@@ -12,16 +12,16 @@ on:
         type: string
         description: Frontend Docker with E2E capabilities image to use, e.g., `ghcr.io/flagsmith/flagsmith-e2e:main`
         required: true
-      tests:
+      args:
         type: string
-        description: Space-delimited list of E2E tests to be executed
+        description: Additional arguments to testcafe
         required: false
         default: ''
       concurrency:
         type: number
         description: The concurrent number of browsers to be used on testing
         required: false
-        default: 3
+        default: 16
       runs-on:
         type: string
         description: The runner label to use. Defaults to `depot-ubuntu-latest`
@@ -77,7 +77,7 @@ jobs:
           retry_on: error
           timeout_minutes: 20
         env:
-          opts: ${{ inputs.tests }}
+          opts: ${{ inputs.args }}
           API_IMAGE: ${{ inputs.api-image }}
           E2E_IMAGE: ${{ inputs.e2e-image }}
           E2E_CONCURRENCY: ${{ inputs.concurrency }}

.github/workflows/manual-e2e-tests.yml

@@ -1,19 +1,15 @@
-name: 'Manual E2E tests'
+name: Run E2E tests against a deployed API instance
 
 on:
   workflow_dispatch:
     inputs:
       e2e-token:
-        description: 'The authentication token used by the E2E process'
+        description: The authentication token used by the E2E process
         required: true
-      e2e-concurrency:
-        description: 'The concurrency value to use when running the E2E process'
-        default: 3
-        type: number
       api-url:
-        description: 'Which database service to use to run the API against'
+        description: An API URL to run the E2E tests against
         default: 'https://api.flagsmith.com/api/v1/'
-
+        
 jobs:
   run-e2e-tests:
     runs-on: depot-ubuntu-latest
@@ -31,7 +27,6 @@ jobs:
         env:
           E2E_TEST_AUTH_TOKEN: ${{ inputs.e2e-token }}
           FLAGSMITH_API_URL: ${{ inputs.api-url }}
-          E2E_CONCURRENCY: ${{ inputs.e2e-concurrency }}
         run: |
           npm ci
           npm run env

.github/workflows/platform-docker-build-test-publish.yml

@@ -72,18 +72,20 @@ jobs:
     with:
       runs-on: ${{ matrix.runs-on }}
       e2e-image: ${{ needs.docker-build-e2e.outputs.image }}
-      api-image: ${{ matrix.api-image }}
-      concurrency: 16
+      api-image: ${{ matrix.args.api-image }}
+      args: ${{ matrix.args.args }}
     secrets:
       GCR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       SLACK_TOKEN: ${{ secrets.SLACK_TOKEN }}
 
     strategy:
       matrix:
         runs-on: [depot-ubuntu-latest-16, depot-ubuntu-latest-arm-16]
-        api-image:
-          - ${{ needs.docker-build-api.outputs.image }}
-          - ${{ needs.docker-build-private-cloud-api.outputs.image }}
+        args:
+          - api-image: ${{ needs.docker-build-api.outputs.image }}
+            args: --meta-filter category=oss
+          - api-image: ${{ needs.docker-build-private-cloud-api.outputs.image }}
+            args: --meta-filter category=oss,category=enterprise
 
   # Publish to dockerhub
 

.github/workflows/platform-pull-request.yml

@@ -137,17 +137,7 @@ jobs:
       runs-on: ${{ matrix.runs-on }}
       e2e-image: ${{ needs.docker-build-e2e.outputs.image }}
       api-image: ${{ needs.docker-build-api.outputs.image }}
-      concurrency: 16
-      tests: >-
-        segment-part-1 
-        segment-part-2
-        segment-part-3
-        environment
-        signup
-        flag
-        invite
-        project
-        versioning
+      args: --meta-filter category=oss
     secrets:
       GCR_TOKEN: ${{ needs.permissions-check.outputs.can-write == 'true' && secrets.GITHUB_TOKEN || '' }}
       SLACK_TOKEN: ${{ needs.permissions-check.outputs.can-write == 'true' && secrets.SLACK_TOKEN || '' }}
@@ -164,12 +154,7 @@ jobs:
       runs-on: ${{ matrix.runs-on }}
       e2e-image: ${{ needs.docker-build-e2e.outputs.image }}
       api-image: ${{ needs.docker-build-private-cloud.outputs.image }}
-      concurrency: 16
-      tests: >-
-        organisation-permission
-        environment-permission
-        project-permission
-        roles
+      args: --meta-filter category=enterprise
     secrets:
       GCR_TOKEN: ${{ needs.permissions-check.outputs.can-write == 'true' && secrets.GITHUB_TOKEN || '' }}
       SLACK_TOKEN: ${{ needs.permissions-check.outputs.can-write == 'true' && secrets.SLACK_TOKEN || '' }}

docker/common/e2e/.e2e-tests.yml

@@ -50,7 +50,7 @@ services:
       SLACK_TOKEN: ${SLACK_TOKEN}
       GITHUB_ACTION_URL: ${GITHUB_ACTION_URL}
     ports:
-      - 8080:8080
+      - 3000:3000
     depends_on:
       flagsmith-api:
         condition: service_healthy