move refresh-endpoint e2e tests to development runtime

gatsbyjs · Jun 29, 2020 · 65684fb · 65684fb
1 parent 732e2aa
commit 65684fb
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 335 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -117,20 +117,6 @@ aliases:
       - notify-status:
           condition: << parameters.nightly >>
 
-  e2e_tests_development_refresh_endpoint_alias:
-    &e2e_tests_development_refresh_endpoint_alias
-    <<: *e2e-executor
-    parameters:
-      nightly:
-        type: boolean
-        default: false
-    steps:
-      - e2e-test:
-          test_path: e2e-tests/development-refresh-endpoint
-          skip_file_change_test: << parameters.nightly >>
-      - notify-status:
-          condition: << parameters.nightly >>
-
   e2e_tests_gatsby-image_alias: &e2e_tests_gatsby-image_alias
     <<: *e2e-executor
     parameters:
@@ -335,9 +321,6 @@ jobs:
   e2e_tests_gatsby-image_with_next_react:
     <<: *e2e_tests_gatsby-image_alias
 
-  e2e_tests_development_refresh_endpoint:
-    <<: *e2e_tests_development_refresh_endpoint_alias
-
   e2e_tests_development_runtime:
     <<: *e2e_tests_development_runtime_alias
 

diff --git a/e2e-tests/development-refresh-endpoint/.gitignore b/e2e-tests/development-refresh-endpoint/.gitignore
diff --git a/e2e-tests/development-refresh-endpoint/LICENSE b/e2e-tests/development-refresh-endpoint/LICENSE
diff --git a/e2e-tests/development-refresh-endpoint/README.md b/e2e-tests/development-refresh-endpoint/README.md
diff --git a/e2e-tests/development-refresh-endpoint/cypress.json b/e2e-tests/development-refresh-endpoint/cypress.json
diff --git a/e2e-tests/development-refresh-endpoint/cypress/plugins/index.js b/e2e-tests/development-refresh-endpoint/cypress/plugins/index.js
diff --git a/e2e-tests/development-refresh-endpoint/cypress/support/commands.js b/e2e-tests/development-refresh-endpoint/cypress/support/commands.js
diff --git a/e2e-tests/development-refresh-endpoint/cypress/support/index.js b/e2e-tests/development-refresh-endpoint/cypress/support/index.js
diff --git a/e2e-tests/development-refresh-endpoint/gatsby-config.js b/e2e-tests/development-refresh-endpoint/gatsby-config.js
diff --git a/e2e-tests/development-refresh-endpoint/gatsby-node.js b/e2e-tests/development-refresh-endpoint/gatsby-node.js
diff --git a/e2e-tests/development-refresh-endpoint/package.json b/e2e-tests/development-refresh-endpoint/package.json
diff --git a/e2e-tests/development-refresh-endpoint/src/images/gatsby-icon.png b/e2e-tests/development-refresh-endpoint/src/images/gatsby-icon.png
diff --git a/e2e-tests/development-refresh-endpoint/src/pages/page.js b/e2e-tests/development-refresh-endpoint/src/pages/page.js
diff --git a/...gration/functionality/refresh-endpoint.js → ...gration/functionality/refresh-endpoint.js b/...gration/functionality/refresh-endpoint.js → ...gration/functionality/refresh-endpoint.js
@@ -1,5 +1,7 @@
 describe(`When the refresh endpoint is hit multiple times`, () => {
-
+  afterEach(() => {
+    waitUntilServerRespondsSucessfully()
+  });
   it(`should put new requests with unique body in a queue`, () => {
     cy.request(`POST`, `/__refresh`).then(response => {
       expect(response.body).to.be.equal(``)
@@ -20,3 +22,11 @@ describe(`When the refresh endpoint is hit multiple times`, () => {
 
 })
 
+function waitUntilServerRespondsSucessfully() {
+  cy.waitUntil(() => cy.request("/").then((response) => {
+      return response.status == 200
+  }), {
+      timeout: 20000,
+      interval: 1000
+  })
+}
diff --git a/e2e-tests/development-runtime/cypress/support/commands.js b/e2e-tests/development-runtime/cypress/support/commands.js
@@ -1,4 +1,5 @@
 import "@testing-library/cypress/add-commands"
+import 'cypress-wait-until';
 
 Cypress.Commands.add(`lifecycleCallCount`, action =>
   cy

diff --git a/e2e-tests/development-runtime/package.json b/e2e-tests/development-runtime/package.json
@@ -46,6 +46,7 @@
     "@testing-library/cypress": "^4.0.4",
     "cross-env": "^5.2.0",
     "cypress": "3.4.1",
+    "cypress-wait-until": "1.7.1",
     "fs-extra": "^7.0.1",
     "gatsby-cypress": "^0.1.7",
     "is-ci": "^2.0.0",