Merge branch 'main' into devx-2465-testcafe-reporter

saucelabs · Jan 3, 2024 · a515f9d · a515f9d
2 parents 47d57ad + 3af4169
commit a515f9d
Show file tree

Hide file tree

Showing 78 changed files with 2,372 additions and 1,116 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -16,7 +16,7 @@ jobs:
       version: ${{ steps.set_version.outputs.version }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set Release Version
         id: set_version
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,16 +14,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Unshallow
         run: |
           git fetch --prune --unshallow
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
 
       - uses: actions/cache@v3
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,12 +20,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
 
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Lint
         uses: golangci/golangci-lint-action@v3
@@ -37,12 +37,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           cache: true
 
       - name: Run tests
@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
         uses: actions/setup-node@v3
@@ -82,12 +82,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           cache: true
 
       - name: Build Project
@@ -119,7 +119,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download saucectl Binary
         uses: actions/download-artifact@v3
@@ -133,15 +133,15 @@ jobs:
         run: ./saucectl run -c .sauce/replay.yml --timeout 10m
 
       - name: Saucectl RUN - CLI Driven
-        run: ./saucectl run replay "tests/e2e/replay/recording.json" -c "" --name "CLI Driven" --timeout 10m
+        run: ./saucectl run replay "tests/e2e/replay/recording.json" -c "" --name "CLI Driven" --timeout 10m -r us-west-1
 
   playwright:
     needs: build
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download saucectl Binary
         uses: actions/download-artifact@v3
@@ -155,15 +155,15 @@ jobs:
         run: ./saucectl run -c .sauce/playwright.yml --timeout 10m
 
       - name: Saucectl RUN - CLI Driven
-        run: ./saucectl run playwright ".*.js" -c "" --name "CLI Driven" --browser chromium --rootDir tests/e2e/playwright/ --playwright.version 1.33.0 --timeout 10m
+        run: ./saucectl run playwright ".*.js" -c "" --name "CLI Driven" --browser chromium --rootDir tests/e2e/playwright/ --playwright.version 1.33.0 --timeout 10m -r us-west-1
 
   testcafe:
     needs: build
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download saucectl Binary
         uses: actions/download-artifact@v3
@@ -177,15 +177,15 @@ jobs:
         run: ./saucectl run -c .sauce/testcafe.yml --timeout 10m
 
       - name: Saucectl RUN - CLI Driven
-        run: ./saucectl run testcafe "*.test.js" -c "" --name "CLI Driven" --browser chrome --rootDir tests/e2e/testcafe/ --testcafe.version 2.5.0 --timeout 10m
+        run: ./saucectl run testcafe "*.test.js" -c "" --name "CLI Driven" --browser chrome --rootDir tests/e2e/testcafe/ --testcafe.version 2.5.0 --timeout 10m -r us-west-1
 
   cypress-v1alpha:
     needs: build
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download saucectl Binary
         uses: actions/download-artifact@v3
@@ -205,7 +205,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download saucectl Binary
         uses: actions/download-artifact@v3
@@ -221,7 +221,14 @@ jobs:
 
       - name: Saucectl RUN - CLI Driven
         run: |
-          ./saucectl run cypress "cypress/e2e/**/*.js" -c "" --name "CLI Driven" --rootDir tests/e2e/cypress_10/e2e/ --browser chrome --cypress.version 12.11.0 --cypress.configFile "cypress.config.js" --timeout 10m
+          ./saucectl run cypress "cypress/e2e/**/*.js" \
+          -c "" --name "CLI Driven" \
+          --rootDir tests/e2e/cypress_10/e2e/ \
+          --browser chrome \
+          --cypress.version 12.11.0 \
+          --cypress.configFile "cypress.config.js" \
+          --timeout 10m \
+          -r us-west-1
  
   cypress-windows:
     needs: build
@@ -232,7 +239,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download saucectl Binary
         uses: actions/download-artifact@v3
@@ -252,7 +259,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download saucectl Binary
         uses: actions/download-artifact@v3
@@ -268,30 +275,13 @@ jobs:
 
       - name: Saucectl RUN - CLI Driven
         run: |
-          ./saucectl run espresso -c "" --name "CLI Driven" --app ./tests/e2e/espresso/mda-1.0.17-20.apk --testApp ./tests/e2e/espresso/mda-androidTest-1.0.17-20.apk --emulator name="Android GoogleApi Emulator",platformVersion=11.0 --testOptions.size small
-      - name: Saucectl RUN - env var file
-        env:
-          REGION: us-west-1
-          CONCURRENCY: 2
-          TAG: env-tag
-          APP: ./tests/e2e/espresso/mda-1.0.17-20.apk
-          TEST_APP: ./tests/e2e/espresso/mda-androidTest-1.0.17-20.apk
-          SUITE_NAME: "Sauce test env var config file"
-          TEST_CLASS1: com.example.android.testing.androidjunitrunnersample.CalculatorAddParameterizedTest
-          TEST_CLASS2: com.example.android.testing.androidjunitrunnersample.CalculatorInstrumentationTest
-          EMULATOR_NAME: "Android GoogleApi Emulator"
-          PLATFORM_VERSION1: 11.0
-          PLATFORM_VERSION2: 10.0
-          GOOGLE_PIXEL_REAL_DEVICE: "Google Pixel C GoogleAPI Emulator"
-          PLATFORM_VERSION3: 8.1
-          ARTIFACTS_DOWNLOAD_WHEN: always
-          ARTIFACTS_MATCH1: junit.xml
-          ARTIFACTS_MATCH2: device.log
-          ARTIFACTS_DOWNLOAD_FOLDER: ./artifacts/
-          SLACK_CHANNEL: devx-slack-notifications
-          NOTIFICATION_SEND: always
-        run: |
-          ./saucectl run -c .sauce/espresso-env-var.yml
+          ./saucectl run espresso -c "" \
+          --name "CLI Driven" \
+          --app ./tests/e2e/espresso/mda-1.0.17-20.apk \
+          --testApp ./tests/e2e/espresso/mda-androidTest-1.0.17-20.apk \
+          --emulator name="Android GoogleApi Emulator",platformVersion=11.0 \
+          --testOptions.size small \
+          -r us-west-1
 
   xcuitest:
     needs: build
@@ -302,7 +292,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download saucectl Binary
         uses: actions/download-artifact@v3
@@ -326,7 +316,8 @@ jobs:
           --testApp ./tests/e2e/xcuitest/SauceLabs-Demo-App-Runner.XCUITest.ipa \
           --testOptions.class MyDemoAppUITests.ProductListingPageTest \
           --device name="iPhone.*" \
-          --timeout 10m
+          --timeout 10m \
+          -r us-west-1
 
   apitest:
     needs: build
@@ -339,7 +330,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download saucectl Binary
         uses: actions/download-artifact@v3
@@ -351,15 +342,15 @@ jobs:
 
       - name: Saucectl RUN - Config Driven
         run: |
-          ./saucectl run -c .sauce/apitest.yml
+          ./saucectl run -c .sauce/apitest.yml -r us-west-1
 
   playwright-cucumberjs:
     needs: build
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download saucectl Binary
         uses: actions/download-artifact@v3
@@ -381,7 +372,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download saucectl Binary
         uses: actions/download-artifact@v3
@@ -400,7 +391,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download saucectl Binary
         uses: actions/download-artifact@v3

diff --git a/.sauce/apitest.yml b/.sauce/apitest.yml
@@ -24,8 +24,3 @@ suites:
     useRemoteTests: true
     tests:
       - 6308e6d4c08b875edeee138e
-
-  - name: "Upload and Run tests for saucectl-example"
-    projectName: saucectl-example
-    testMatch:
-      - tests/api/*
diff --git a/.sauce/cypress-10.yml b/.sauce/cypress-10.yml
@@ -11,7 +11,7 @@ rootDir: tests/e2e/cypress_10/e2e/
 defaults:
   timeout: 5m
 cypress:
-  version: 12.17.4
+  version: 13.6.0
   configFile: "cypress.config.js"
 suites:
   # - name: "(experimental) webkit test"

diff --git a/.sauce/espresso-env-var.yml b/.sauce/espresso-env-var.yml
diff --git a/.sauce/imagerunner.yml b/.sauce/imagerunner.yml
@@ -15,3 +15,15 @@ suites:
         dst: "hello.txt"
     env: # Arbitrary Key-Value pairs set as environment variables inside the container.
      MY_FOO: bar
+    services:
+      - name: "service1"
+        image: "busybox:1.35.0"
+        imagePullAuth: # Credentials used to pull the container image
+          user: $DOCKER_USERNAME
+          token: $DOCKER_PASSWORD
+        entrypoint: "cat hello.txt" # What command to start the container with
+        files: # Which files should be uploaded and mounted within the container
+          - src: "tests/e2e/imagerunner/hello.txt"
+            dst: "hello.txt"
+        env: # Arbitrary Key-Value pairs set as environment variables inside the container.
+          MY_FOO: bar
diff --git a/.sauce/playwright.yml b/.sauce/playwright.yml
@@ -11,7 +11,7 @@ defaults:
   timeout: 5m
 rootDir: tests/e2e/playwright/
 playwright:
-  version: 1.37.1
+  version: 1.40.1
 suites:
   - name: "chromium test in sauce"
     platformName: "Windows 10"

diff --git a/.sauce/testcafe.yml b/.sauce/testcafe.yml
@@ -10,7 +10,7 @@ sauce:
 defaults:
   timeout: 5m
 testcafe:
-  version: 3.2.0
+  version: 3.4.0
 rootDir: tests/e2e/testcafe/
 suites:
   - name: Chrome in sauce

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the binary here
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
 
 WORKDIR /app