reorganize browser tests (#818)

rename chrome directory to browser
run edge test in ubuntu-22.04
remove electron test from chrome test
add cypress run scripts for different browsers
update image-size to 1.0.2

Co-authored-by: Matt Henkes <[email protected]>

Author: MikeMcC399

.github/workflows/example-chrome.yml

@@ -23,60 +23,46 @@ jobs:
           # print information about detected browsers, etc
           # see https://on.cypress.io/command-line#cypress-info
           build: npx cypress info
-          working-directory: examples/v9/chrome
-
-      - name: Electron
-        uses: ./
-        with:
-          working-directory: examples/v9/chrome
-
-      # store screenshot captured during the test
-      - uses: actions/upload-artifact@v3
-        with:
-          name: screenshots-in-electron-v9
-          path: examples/v9/chrome/cypress/screenshots
-
-      - run: npx image-size cypress/screenshots/**/*.png
-        working-directory: examples/v9/chrome
+          working-directory: examples/v9/browser
 
       - name: Chrome
         uses: ./
         with:
-          working-directory: examples/v9/chrome
+          working-directory: examples/v9/browser
           browser: chrome
 
       - uses: actions/upload-artifact@v3
         with:
           name: screenshots-in-chrome-v9
-          path: examples/v9/chrome/cypress/screenshots
+          path: examples/v9/browser/cypress/screenshots
 
       - uses: actions/upload-artifact@v3
         with:
           name: video-in-chrome-v9
-          path: examples/v9/chrome/cypress/videos
+          path: examples/v9/browser/cypress/videos
 
       - run: npx image-size cypress/screenshots/**/*.png
-        working-directory: examples/v9/chrome
+        working-directory: examples/v9/browser
 
       - name: Chrome headed
         uses: ./
         with:
-          working-directory: examples/v9/chrome
+          working-directory: examples/v9/browser
           browser: chrome
           headed: true
 
       - uses: actions/upload-artifact@v3
         with:
           name: screenshots-in-headed-chrome-v9
-          path: examples/v9/chrome/cypress/screenshots
+          path: examples/v9/browser/cypress/screenshots
 
       - uses: actions/upload-artifact@v3
         with:
           name: video-in-headed-chrome-v9
-          path: examples/v9/chrome/cypress/videos
+          path: examples/v9/browser/cypress/videos
 
       - run: npx image-size cypress/screenshots/**/*.png
-        working-directory: examples/v9/chrome
+        working-directory: examples/v9/browser
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Cypress v10 and higher ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #
 
@@ -93,57 +79,43 @@ jobs:
           # print information about detected browsers, etc
           # see https://on.cypress.io/command-line#cypress-info
           build: npx cypress info
-          working-directory: examples/chrome
-
-      - name: Electron
-        uses: ./
-        with:
-          working-directory: examples/chrome
-
-      # store screenshot captured during the test
-      - uses: actions/upload-artifact@v3
-        with:
-          name: screenshots-in-electron
-          path: examples/chrome/cypress/screenshots
-
-      - run: npx image-size cypress/screenshots/**/*.png
-        working-directory: examples/chrome
+          working-directory: examples/browser
 
       - name: Chrome
         uses: ./
         with:
-          working-directory: examples/chrome
+          working-directory: examples/browser
           browser: chrome
 
       - uses: actions/upload-artifact@v3
         with:
           name: screenshots-in-chrome
-          path: examples/chrome/cypress/screenshots
+          path: examples/browser/cypress/screenshots
 
       - uses: actions/upload-artifact@v3
         with:
           name: video-in-chrome
-          path: examples/chrome/cypress/videos
+          path: examples/browser/cypress/videos
 
       - run: npx image-size cypress/screenshots/**/*.png
-        working-directory: examples/chrome
+        working-directory: examples/browser
 
       - name: Chrome headless
         uses: ./
         with:
-          working-directory: examples/chrome
+          working-directory: examples/browser
           browser: chrome
           headed: false
 
       - uses: actions/upload-artifact@v3
         with:
           name: screenshots-in-headless-chrome
-          path: examples/chrome/cypress/screenshots
+          path: examples/browser/cypress/screenshots
 
       - uses: actions/upload-artifact@v3
         with:
           name: video-in-headless-chrome
-          path: examples/chrome/cypress/videos
+          path: examples/browser/cypress/videos
 
       - run: npx image-size cypress/screenshots/**/*.png
-        working-directory: examples/chrome
+        working-directory: examples/browser

.github/workflows/example-edge.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   tests:
-    runs-on: windows-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -20,5 +20,5 @@ jobs:
           # print information about detected browsers, etc
           # see https://on.cypress.io/command-line#cypress-info
           build: npm run info
-          working-directory: examples/chrome
+          working-directory: examples/browser
           browser: edge

README.md

@@ -139,7 +139,7 @@ name: Edge
 on: push
 jobs:
   edge:
-    runs-on: windows-latest
+    runs-on: ubuntu-22.04
     name: E2E on Edge
     steps:
       - uses: actions/checkout@v3

examples/chrome/cypress.config.js renamed to examples/browser/cypress.config.js

@@ -0,0 +1,20 @@
+{
+  "name": "example-browser",
+  "version": "1.1.0",
+  "description": "running Cypress using different browsers",
+  "main": "index.js",
+  "scripts": {
+    "test": "npm run cy:run",
+    "info": "cypress info",
+    "cy:run": "cypress run",
+    "cy:run:chrome": "cypress run --browser chrome",
+    "cy:run:edge": "cypress run --browser edge"
+  },
+  "author": "",
+  "license": "ISC",
+  "private": true,
+  "devDependencies": {
+    "cypress": "12.7.0",
+    "image-size": "^1.0.2"
+  }
+}

examples/chrome/cypress/e2e/spec.cy.js renamed to examples/browser/cypress/e2e/spec.cy.js

@@ -1,16 +1,19 @@
 {
   "name": "example-firefox",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "running Cypress using Firefox",
   "main": "index.js",
   "scripts": {
-    "test": "cypress run"
+    "test": "npm run cy:run:firefox",
+    "info": "cypress info",
+    "cy:run": "cypress run",
+    "cy:run:firefox": "cypress run --browser firefox"
   },
   "author": "",
   "license": "ISC",
   "private": true,
   "devDependencies": {
     "cypress": "12.7.0",
-    "image-size": "0.8.3"
+    "image-size": "^1.0.2"
   }
 }