fix: add text/html to the ping accept headers (#294)

Makes it work with Vite.js server
cypress-io · Feb 8, 2021 · 42b9eb5 · 42b9eb5
1 parent 263b5ed
commit 42b9eb5
Show file tree

Hide file tree

Showing 13 changed files with 2,020 additions and 8 deletions.
diff --git a/.github/workflows/example-wait-on.yml b/.github/workflows/example-wait-on.yml
@@ -2,7 +2,7 @@ name: example-wait-on
 on: [push]
 jobs:
   wait:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -15,7 +15,7 @@ jobs:
           wait-on: 'http://localhost:3050'
 
   wait2:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -28,7 +28,7 @@ jobs:
           wait-on: 'http://localhost:3050'
 
   wait3:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -40,7 +40,7 @@ jobs:
           wait-on: 'http://localhost:3050'
 
   wait4:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -52,7 +52,7 @@ jobs:
           wait-on: 'http://localhost:3050'
 
   wait-multiple:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -66,7 +66,7 @@ jobs:
           wait-on: 'http://localhost:3050, http://localhost:3060, http://localhost:3070'
 
   wait-on-react-scripts:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -78,7 +78,7 @@ jobs:
           wait-on: 'http://localhost:3000'
 
   wait-using-custom-command:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -91,11 +91,23 @@ jobs:
           wait-on: 'npx wait-on --timeout 5000 http://localhost:3000'
 
   ping-cli:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Install dependencies
         uses: bahmutov/npm-install@v1
       - name: Run ping from CLI
         run: node src/ping-cli https://example.cypress.io
+
+  wait-on-vite:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Cypress tests
+        uses: ./
+        with:
+          working-directory: examples/wait-on-vite
+          start: npm start
+          wait-on: 'http://localhost:3000'
diff --git a/dist/index.js b/dist/index.js
@@ -84758,11 +84758,17 @@ const ping = (url, timeout) => {
 
   const start = +new Date()
   return got(url, {
+    headers: {
+      Accept: 'text/html, application/json, text/plain, */*'
+    },
     timeout: individualPingTimeout,
     errorCodes,
     retry: {
       limit,
       calculateDelay({ error, attemptCount }) {
+        if (error) {
+          core.debug(`got error ${JSON.stringify(error)}`)
+        }
         const now = +new Date()
         const elapsed = now - start
         core.debug(

diff --git a/examples/wait-on-vite/README.md b/examples/wait-on-vite/README.md
@@ -0,0 +1,3 @@
+# example: wait-on-vite
+
+This example confirms our action can wait for [Vite.js](https://vitejs.dev/) to respond.
diff --git a/examples/wait-on-vite/cypress.json b/examples/wait-on-vite/cypress.json
@@ -0,0 +1,6 @@
+{
+  "fixturesFolder": false,
+  "supportFile": false,
+  "pluginsFile": false,
+  "baseUrl": "http://localhost:3000"
+}
diff --git a/examples/wait-on-vite/cypress/integration/spec.js b/examples/wait-on-vite/cypress/integration/spec.js
@@ -0,0 +1,7 @@
+/// <reference types="cypress" />
+describe('example: wait-on-vite', () => {
+  it('loads', () => {
+    cy.visit('/')
+    cy.contains('h1', 'Hello Vite!').should('be.visible')
+  })
+})
diff --git a/examples/wait-on-vite/favicon.svg b/examples/wait-on-vite/favicon.svg
diff --git a/examples/wait-on-vite/index.html b/examples/wait-on-vite/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite App</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/main.js"></script>
+  </body>
+</html>
diff --git a/examples/wait-on-vite/main.js b/examples/wait-on-vite/main.js
@@ -0,0 +1,6 @@
+import './style.css'
+
+document.querySelector('#app').innerHTML = `
+  <h1>Hello Vite!</h1>
+  <a href="https://vitejs.dev/guide/features.html" target="_blank">Documentation</a>
+`