fix: removing cy.server and cy.route

cypress-io · Nov 4, 2022 · f2bee8a · f2bee8a
1 parent 73504f1
commit f2bee8a
Show file tree

Hide file tree

Showing 23 changed files with 45,281 additions and 256 deletions.
diff --git a/examples/blogs__e2e-snapshots/cypress/e2e/api-spec.cy.js b/examples/blogs__e2e-snapshots/cypress/e2e/api-spec.cy.js
@@ -53,8 +53,7 @@ describe('via API', () => {
 
 describe('initial', () => {
   it('todos', () => {
-    cy.server()
-    cy.route('/todos', [
+    cy.intercept('/todos', [
       {
         title: 'mock first',
         completed: false,
@@ -123,11 +122,7 @@ describe('API', () => {
   })
 
   it('is adding todo item', () => {
-    cy.server()
-    cy.route({
-      method: 'POST',
-      url: '/todos',
-    }).as('postTodo')
+    cy.intercept('POST', '/todos').as('postTodo')
 
     // go through the UI
     enterTodo('first item') // id "1"
@@ -140,11 +135,7 @@ describe('API', () => {
   })
 
   it('is deleting a todo item', () => {
-    cy.server()
-    cy.route({
-      method: 'DELETE',
-      url: '/todos/1',
-    }).as('deleteTodo')
+    cy.intercept('DELETE', '/todos/1').as('deleteTodo')
 
     // go through the UI
     enterTodo('first item') // id "1"

diff --git a/examples/blogs__e2e-snapshots/cypress/e2e/store-spec.cy.js b/examples/blogs__e2e-snapshots/cypress/e2e/store-spec.cy.js
@@ -138,13 +138,14 @@ describe('Vuex store', () => {
 
   it('starts typing after delayed server response', () => {
     // this will force new todo item to be added only after a delay
-    cy.server()
-    cy.route({
-      method: 'POST',
-      url: '/todos',
-      delay: 3000,
-      response: {},
-    })
+    cy.intercept(
+      'POST',
+      '/todos',
+      {
+        delay: 3000,
+        body: {},
+      }
+    )
 
     const title = 'first todo'
 
@@ -249,13 +250,14 @@ describe('Store actions', () => {
   it('changes the state after delay', () => {
     // this will force store action "setNewTodo" to commit
     // change to the store only after 3 seconds
-    // cy.server()
-    cy.route({
-      method: 'POST',
-      url: '/todos',
-      delay: 3000,
-      response: {},
-    }).as('post')
+    cy.intercept(
+      'POST',
+      '/todos',
+      {
+        delay: 3000,
+        body: {},
+      }
+    ).as('post')
 
     getStore().then((store) => {
       store.dispatch('setNewTodo', 'a new todo')
@@ -287,11 +289,7 @@ describe('Store actions', () => {
   })
 
   it('calls server', () => {
-    cy.server()
-    cy.route({
-      method: 'POST',
-      url: '/todos',
-    }).as('postTodo')
+    cy.intercept('POST', '/todos').as('postTodo')
 
     getStore().then((store) => {
       store.dispatch('setNewTodo', 'a new todo')
@@ -306,13 +304,14 @@ describe('Store actions', () => {
   })
 
   it('calls server with delay', () => {
-    cy.server()
-    cy.route({
-      method: 'POST',
-      url: '/todos',
-      delay: 3000,
-      response: {},
-    }).as('postTodo')
+    cy.intercept(
+      'POST',
+      '/todos',
+      {
+        delay: 3000,
+        body: {},
+      }
+    ).as('postTodo')
 
     getStore().then((store) => {
       store.dispatch('setNewTodo', 'a new todo')

diff --git a/examples/blogs__e2e-snapshots/cypress/support/utils.js b/examples/blogs__e2e-snapshots/cypress/support/utils.js
@@ -21,8 +21,7 @@ export const visit = (skipWaiting) => {
 
   console.log('visit will wait for initial todos', waitForInitialLoad)
   if (waitForInitialLoad) {
-    cy.server()
-    cy.route('/todos').as('initialTodos')
+    cy.intercept('/todos').as('initialTodos')
   }
 
   cy.visit('/')

diff --git a/examples/blogs__iframes/cypress/e2e/xhr-spec.cy.js b/examples/blogs__iframes/cypress/e2e/xhr-spec.cy.js
@@ -55,8 +55,7 @@ describe('Recipe: blogs__iframes', () => {
 
       replaceIFrameFetchWithXhr()
       // spy on XHR before clicking the button
-      cy.server()
-      cy.route('/todos/1').as('getTodo')
+      cy.intercept('/todos/1').as('getTodo')
 
       getIframeBody().find('#run-button').should('have.text', 'Try it').click()
 
@@ -79,8 +78,7 @@ describe('Recipe: blogs__iframes', () => {
 
       replaceIFrameFetchWithXhr()
       // spy on XHR before clicking the button
-      cy.server()
-      cy.route('/todos/1', {
+      cy.intercept('/todos/1', {
         completed: true,
         id: 1,
         title: 'write tests',

diff --git a/examples/blogs__vue-vuex-rest/cypress/e2e/api-spec.cy.js b/examples/blogs__vue-vuex-rest/cypress/e2e/api-spec.cy.js
@@ -67,18 +67,16 @@ describe('Misc tests', () => {
   // waits for the alias "todos" to make sure
   // the application has actually made the request
   it('loads todos on start', () => {
-    cy.server()
-    cy.route('/todos').as('todos')
+    cy.intercept('/todos').as('todos')
     cy.visit('/')
     cy.wait('@todos')
   })
 
   // stubs expected API call with JSON response
   // from a fixture file
   it('loads todos from fixture file', () => {
-    cy.server()
     // loads response from "cypress/fixtures/todos.json"
-    cy.route('/todos', 'fixture:todos')
+    cy.intercept('/todos', 'fixture:todos')
     cy.visit('/')
     getTodoItems()
     .should('have.length', 2)
@@ -88,8 +86,7 @@ describe('Misc tests', () => {
   })
 
   it('initial todos', () => {
-    cy.server()
-    cy.route('/todos', [
+    cy.intercept('/todos', [
       {
         title: 'mock first',
         completed: false,
@@ -159,13 +156,7 @@ describe('API', () => {
   })
 
   it('is adding todo item', () => {
-    cy.server()
-    cy
-    .route({
-      method: 'POST',
-      url: '/todos',
-    })
-    .as('postTodo')
+    cy.intercept('POST', '/todos').as('postTodo')
 
     // go through the UI
     enterTodo('first item') // id "1"
@@ -180,13 +171,7 @@ describe('API', () => {
   })
 
   it('is deleting a todo item', () => {
-    cy.server()
-    cy
-    .route({
-      method: 'DELETE',
-      url: '/todos/1',
-    })
-    .as('deleteTodo')
+    cy.intercept('DELETE', '/todos/1').as('deleteTodo')
 
     // go through the UI
     enterTodo('first item') // id "1"

diff --git a/examples/blogs__vue-vuex-rest/cypress/e2e/speed-spec.cy.js b/examples/blogs__vue-vuex-rest/cypress/e2e/speed-spec.cy.js
@@ -80,8 +80,7 @@ describe('speed', () => {
     .should('have.length', 2)
 
     // delete one item and confirm it was deleted
-    cy.server()
-    cy.route('DELETE', '/todos/*').as('delete')
+    cy.intercept('DELETE', '/todos/*').as('delete')
     cy.contains('.todo-list li', 'be cool').find('.destroy').click({ force: true })
     cy.wait('@delete')
 
@@ -94,11 +93,10 @@ describe('speed', () => {
     // there is no need to reset the backend data
 
     // stub all network calls
-    cy.server()
     // initially return an empty list of todos
-    cy.route('GET', '/todos', [])
-    cy.route('POST', '/todos', {})
-    cy.route('DELETE', '/todos/*', {}).as('delete')
+    cy.intercept('GET', '/todos', [])
+    cy.intercept('POST', '/todos', {})
+    cy.intercept('DELETE', '/todos/*', {}).as('delete')
 
     // load the application
     cy.visit('/')
@@ -131,8 +129,7 @@ describe('speed', () => {
     })
 
     // spy on the application's XHR calls
-    cy.server()
-    cy.route('DELETE', '/todos/*').as('delete')
+    cy.intercept('DELETE', '/todos/*').as('delete')
 
     // load the application
     cy.visit('/')
@@ -168,8 +165,7 @@ describe('speed', () => {
     })
 
     // spy on the application's XHR calls
-    cy.server()
-    cy.route('DELETE', '/todos/*').as('delete')
+    cy.intercept('DELETE', '/todos/*').as('delete')
 
     // load the application
     cy.visit('/')

diff --git a/examples/blogs__vue-vuex-rest/cypress/e2e/store-spec.cy.js b/examples/blogs__vue-vuex-rest/cypress/e2e/store-spec.cy.js
@@ -162,13 +162,14 @@ describe('Vuex store', () => {
 
   it('starts typing after delayed server response', () => {
     // this will force new todo item to be added only after a delay
-    cy.server()
-    cy.route({
-      method: 'POST',
-      url: '/todos',
-      delay: 3000,
-      response: {},
-    })
+    cy.intercept(
+      'POST',
+      '/todos',
+      {
+        delay: 3000,
+        body: {},
+      }
+    )
 
     const title = 'first todo'
 
@@ -332,13 +333,14 @@ describe('Store actions', () => {
   it('changes the state after delay', () => {
     // this will force store action "setNewTodo" to commit
     // change to the store only after 3 seconds
-    cy.server()
-    cy.route({
-      method: 'POST',
-      url: '/todos',
-      delay: 3000,
-      response: {},
-    })
+    cy.intercept(
+      'POST',
+      '/todos',
+      {
+        delay: 3000,
+        body: {},
+      }
+    )
 
     getStore().then((store) => {
       store.dispatch('setNewTodo', 'a new todo')
@@ -376,11 +378,7 @@ describe('Store actions', () => {
   })
 
   it('calls server', () => {
-    cy.server()
-    cy.route({
-      method: 'POST',
-      url: '/todos',
-    }).as('postTodo')
+    cy.intercept('POST', '/todos').as('postTodo')
 
     getStore().then((store) => {
       store.dispatch('setNewTodo', 'a new todo')
@@ -399,13 +397,14 @@ describe('Store actions', () => {
   })
 
   it('calls server with delay', () => {
-    cy.server()
-    cy.route({
-      method: 'POST',
-      url: '/todos',
-      delay: 3000,
-      response: {},
-    }).as('postTodo')
+    cy.intercept(
+      'POST',
+      '/todos',
+      {
+        delay: 3000,
+        body: {},
+      }
+    ).as('postTodo')
 
     getStore().then((store) => {
       store.dispatch('setNewTodo', 'a new todo')

diff --git a/examples/blogs__vue-vuex-rest/cypress/support/utils.js b/examples/blogs__vue-vuex-rest/cypress/support/utils.js
@@ -22,8 +22,7 @@ export const visit = (skipWaiting) => {
 
   console.log('visit will wait for initial todos', waitForInitialLoad)
   if (waitForInitialLoad) {
-    cy.server()
-    cy.route('/todos').as('initialTodos')
+    cy.inspect('/todos').as('initialTodos')
   }
 
   cy.visit('/')

diff --git a/examples/logging-in__single-sign-on/cypress/e2e/logging-in-single-sign-on-spec.cy.js b/examples/logging-in__single-sign-on/cypress/e2e/logging-in-single-sign-on-spec.cy.js
@@ -169,9 +169,8 @@ describe('Logging In - Single Sign on', function () {
         cy.loginBySingleSignOn({ followRedirect: false })
         .then(responseToToken)
         .then((id_token) => {
-          cy.server()
           // observe the "GET /config" call from the application
-          cy.route('/config').as('getConfig')
+          cy.inspect('/config').as('getConfig')
 
           // now go visit our app
           cy.visit('/', {
@@ -240,9 +239,8 @@ describe('Logging In - Single Sign on', function () {
           // note again this test uses "function () { ... }" callback
           // in order to get access to the test context "this.token" saved above
 
-          cy.server()
           // observe the "GET /config" call from the application
-          cy.route('/config').as('getConfig')
+          cy.inspect('/config').as('getConfig')
 
           cy.visit('/')