Upgrade cypress tests

tnicola · Nov 30, 2023 · 4f07809 · 4f07809
1 parent c02eb9a
commit 4f07809
Show file tree

Hide file tree

Showing 47 changed files with 1,326 additions and 1,025 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,6 +38,9 @@ jobs:
     - name: Execute tests with defaults
       run: |
         npm run serve-and-test:parallel
+    - name: Execute only some tests
+      run: |
+        npm run serve-and-test:parallel:some
     - name: Execute tests with spec reporter
       run: |
         npm run serve-and-test:parallel:spec

diff --git a/cypress-parallel b/cypress-parallel
diff --git a/cypress.config.js b/cypress.config.js
@@ -0,0 +1,13 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  video: false,
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    },
+    baseUrl: 'http://localhost:3000',
+  },
+})
diff --git a/cypress.json b/cypress.json
diff --git a/cypress/integration/1/[foo].js → cypress/e2e/1/[foo].cy.js b/cypress/integration/1/[foo].js → cypress/e2e/1/[foo].cy.js
diff --git a/cypress/integration/3/delete-pizza.js → cypress/e2e/1/delete-pizza.cy.js b/cypress/integration/3/delete-pizza.js → cypress/e2e/1/delete-pizza.cy.js
@@ -1,19 +1,18 @@
 describe('Delete pizza', () => {
   beforeEach(() => {
-    cy.server();
-    cy.fixture('pizzas').as('pizzasAPI');
+
+    cy.fixture('pizzas').then((pizzas) => {
+      cy.intercept({
+        method: 'DELETE',
+        url: '/api/pizzas/*'
+      }, pizzas).as('deletePizza');
+
+      cy.intercept({
+        method: 'GET',
+        url: '/api/pizzas'
+      }, pizzas).as('getPizzas');
+    });
     cy.fixture('addTopping').as('addToppingAPI');
-    cy.route({
-      method: 'DELETE',
-      url: '/api/pizzas/*',
-      response: {}
-    }).as('deletePizza');
-    cy.route({
-      method: 'GET',
-      status: 200,
-      url: '/api/pizzas',
-      response: '@pizzasAPI'
-    }).as('getPizzas');
 
     cy.visit('');
   });
@@ -31,9 +30,6 @@ describe('Delete pizza', () => {
       .contains('Delete Pizza')
       .click();
 
-    cy.wait('@deletePizza')
-      .should(res => {
-          expect(res.status).to.equal(200);
-      });
+    cy.wait('@deletePizza').its('response.statusCode').should('eq', 200)
   });
 });
diff --git a/cypress/integration/4/modify-pizza.spec.js → cypress/e2e/1/modify-pizza.cy.js b/cypress/integration/4/modify-pizza.spec.js → cypress/e2e/1/modify-pizza.cy.js
@@ -1,18 +1,17 @@
 describe('Modify pizza', () => {
   beforeEach(() => {
-    cy.server();
-    cy.fixture('pizzas').as('pizzasAPI');
+    cy.fixture('pizzas').then((pizzas) => {  
+      cy.intercept({
+        method: 'GET',
+        url: '/api/pizzas'}, pizzas).as('getPizzas');
+    });
+
     cy.fixture('addTopping').as('addToppingAPI');
-    cy.route({
+
+    cy.intercept({
       method: 'PUT',
       url: '/api/pizzas/*'
     }).as('addTopping');
-    cy.route({
-      method: 'GET',
-      status: 200,
-      url: '/api/pizzas',
-      response: '@pizzasAPI'
-    }).as('getPizzas');
 
     cy.visit('');
   });
@@ -33,7 +32,7 @@ describe('Modify pizza', () => {
       .click();
 
     cy.wait('@addTopping')
-      .its('requestBody')
+      .its('request.body')
       .then(res => {
         expect(res.toppings).to.deep.equal([
           { id: 6, name: 'mushroom' },
@@ -62,7 +61,7 @@ describe('Modify pizza', () => {
       .click();
 
     cy.wait('@addTopping')
-      .its('requestBody')
+      .its('request.body')
       .then(res => {
         expect(res.toppings).to.deep.equal([
           { id: 10, name: 'pepperoni' },
@@ -88,7 +87,7 @@ describe('Modify pizza', () => {
       .click();
 
     cy.wait('@addTopping')
-      .its('requestBody')
+      .its('response.body')
       .then(res => {
         expect(res.toppings).to.deep.equal([
           { id: 10, name: 'pepperoni' },

diff --git a/cypress/integration/1/new-pizza.spec.js → cypress/e2e/1/new-pizza.cy.js b/cypress/integration/1/new-pizza.spec.js → cypress/e2e/1/new-pizza.cy.js
@@ -1,14 +1,11 @@
 describe('Create pizza', () => {
   beforeEach(() => {
-    cy.server();
-    cy.fixture('pizzas').as('pizzasAPI');
-    cy.route({ method: 'POST', url: '/api/pizzas' }).as('postNewPizza');
-    cy.route({
-      method: 'GET',
-      status: 200,
-      url: '/api/pizzas',
-      response: '@pizzasAPI'
-    }).as('getPizzas');
+
+    cy.fixture('pizzas').then((pizzas) => {
+      cy.intercept('GET', '/api/pizzas', pizzas).as('getPizzas');
+    });
+
+    cy.intercept({ method: 'POST', url: '/api/pizzas' }).as('postNewPizza');
 
     cy.visit('');
   });
@@ -43,7 +40,7 @@ describe('Create pizza', () => {
 
     // This test intentionally fail
     cy.wait('@postNewPizza')
-      .its('requestBody')
+      .its('request.body')
       .then((res) => {
         expect(res.name).to.equal('My new pizza');
         expect(res.toppings).to.deep.equal([

diff --git a/cypress/integration/2/pizza.spec.js → cypress/e2e/1/pizzas.cy.js b/cypress/integration/2/pizza.spec.js → cypress/e2e/1/pizzas.cy.js
@@ -1,13 +1,8 @@
 describe('Pizza', () => {
     beforeEach(() => {
-        cy.server();
-        cy.fixture('pizzas').as('pizzasAPI');
-        cy.route({
-          method: 'GET',
-          status: 200,
-          url: '/api/pizzas',
-          response: '@pizzasAPI'
-        }).as('getPizzas');
+        cy.fixture('pizzas').then((pizzas) => {
+            cy.intercept('GET', '/api/pizzas', pizzas).as('getPizzas');
+          });
 
         cy.visit('');
     });

diff --git a/cypress/integration/2/[foo].js → cypress/e2e/2/[foo].cy.js b/cypress/integration/2/[foo].js → cypress/e2e/2/[foo].cy.js
diff --git a/cypress/integration/2/delete-pizza.js → cypress/e2e/2/delete-pizza.cy.js b/cypress/integration/2/delete-pizza.js → cypress/e2e/2/delete-pizza.cy.js
@@ -1,19 +1,18 @@
 describe('Delete pizza', () => {
   beforeEach(() => {
-    cy.server();
-    cy.fixture('pizzas').as('pizzasAPI');
+
+    cy.fixture('pizzas').then((pizzas) => {
+      cy.intercept({
+        method: 'DELETE',
+        url: '/api/pizzas/*'
+      }, pizzas).as('deletePizza');
+
+      cy.intercept({
+        method: 'GET',
+        url: '/api/pizzas'
+      }, pizzas).as('getPizzas');
+    });
     cy.fixture('addTopping').as('addToppingAPI');
-    cy.route({
-      method: 'DELETE',
-      url: '/api/pizzas/*',
-      response: {}
-    }).as('deletePizza');
-    cy.route({
-      method: 'GET',
-      status: 200,
-      url: '/api/pizzas',
-      response: '@pizzasAPI'
-    }).as('getPizzas');
 
     cy.visit('');
   });
@@ -31,9 +30,6 @@ describe('Delete pizza', () => {
       .contains('Delete Pizza')
       .click();
 
-    cy.wait('@deletePizza')
-      .should(res => {
-          expect(res.status).to.equal(200);
-      });
+    cy.wait('@deletePizza').its('response.statusCode').should('eq', 200)
   });
 });
diff --git a/cypress/integration/2/modify-pizza.spec.js → cypress/e2e/2/modify-pizza.cy.js b/cypress/integration/2/modify-pizza.spec.js → cypress/e2e/2/modify-pizza.cy.js
@@ -1,18 +1,17 @@
 describe('Modify pizza', () => {
   beforeEach(() => {
-    cy.server();
-    cy.fixture('pizzas').as('pizzasAPI');
+    cy.fixture('pizzas').then((pizzas) => {  
+      cy.intercept({
+        method: 'GET',
+        url: '/api/pizzas'}, pizzas).as('getPizzas');
+    });
+
     cy.fixture('addTopping').as('addToppingAPI');
-    cy.route({
+
+    cy.intercept({
       method: 'PUT',
       url: '/api/pizzas/*'
     }).as('addTopping');
-    cy.route({
-      method: 'GET',
-      status: 200,
-      url: '/api/pizzas',
-      response: '@pizzasAPI'
-    }).as('getPizzas');
 
     cy.visit('');
   });
@@ -33,7 +32,7 @@ describe('Modify pizza', () => {
       .click();
 
     cy.wait('@addTopping')
-      .its('requestBody')
+      .its('request.body')
       .then(res => {
         expect(res.toppings).to.deep.equal([
           { id: 6, name: 'mushroom' },
@@ -62,7 +61,7 @@ describe('Modify pizza', () => {
       .click();
 
     cy.wait('@addTopping')
-      .its('requestBody')
+      .its('request.body')
       .then(res => {
         expect(res.toppings).to.deep.equal([
           { id: 10, name: 'pepperoni' },
@@ -88,7 +87,7 @@ describe('Modify pizza', () => {
       .click();
 
     cy.wait('@addTopping')
-      .its('requestBody')
+      .its('response.body')
       .then(res => {
         expect(res.toppings).to.deep.equal([
           { id: 10, name: 'pepperoni' },

diff --git a/cypress/integration/3/new-pizza.spec.js → cypress/e2e/2/new-pizza.cy.js b/cypress/integration/3/new-pizza.spec.js → cypress/e2e/2/new-pizza.cy.js
@@ -1,14 +1,11 @@
 describe('Create pizza', () => {
   beforeEach(() => {
-    cy.server();
-    cy.fixture('pizzas').as('pizzasAPI');
-    cy.route({ method: 'POST', url: '/api/pizzas' }).as('postNewPizza');
-    cy.route({
-      method: 'GET',
-      status: 200,
-      url: '/api/pizzas',
-      response: '@pizzasAPI'
-    }).as('getPizzas');
+
+    cy.fixture('pizzas').then((pizzas) => {
+      cy.intercept('GET', '/api/pizzas', pizzas).as('getPizzas');
+    });
+
+    cy.intercept({ method: 'POST', url: '/api/pizzas' }).as('postNewPizza');
 
     cy.visit('');
   });
@@ -35,23 +32,16 @@ describe('Create pizza', () => {
     cy.get('.products__new a').click();
 
     cy.get('.pizza-form__input').type('My new pizza');
-    cy.get('.pizza-toppings-item')
-      .contains('bacon')
-      .click();
-    cy.get('.pizza-toppings-item')
-      .contains('basil')
-      .click();
-    cy.get('.pizza-toppings-item')
-      .contains('tomato')
-      .click();
-
-    cy.get('button')
-      .contains('Create Pizza')
-      .click();
+    cy.get('.pizza-toppings-item').contains('bacon').click();
+    cy.get('.pizza-toppings-item').contains('basil').click();
+    cy.get('.pizza-toppings-item').contains('tomato').click();
+
+    cy.get('button').contains('Create Pizza').click();
 
+    // This test intentionally fail
     cy.wait('@postNewPizza')
-      .its('requestBody')
-      .then(res => {
+      .its('request.body')
+      .then((res) => {
         expect(res.name).to.equal('My new pizza');
         expect(res.toppings).to.deep.equal([
           { id: 2, name: 'bacon' },

diff --git a/cypress/integration/1/pizzas.spec.js → cypress/e2e/2/pizza.cy.js b/cypress/integration/1/pizzas.spec.js → cypress/e2e/2/pizza.cy.js
@@ -1,13 +1,8 @@
 describe('Pizza', () => {
     beforeEach(() => {
-        cy.server();
-        cy.fixture('pizzas').as('pizzasAPI');
-        cy.route({
-          method: 'GET',
-          status: 200,
-          url: '/api/pizzas',
-          response: '@pizzasAPI'
-        }).as('getPizzas');
+        cy.fixture('pizzas').then((pizzas) => {
+            cy.intercept('GET', '/api/pizzas', pizzas).as('getPizzas');
+          });
 
         cy.visit('');
     });

diff --git a/cypress/integration/3/[foo].js → cypress/e2e/3/[foo].cy.js b/cypress/integration/3/[foo].js → cypress/e2e/3/[foo].cy.js
diff --git a/cypress/integration/5/delete-pizza.js → cypress/e2e/3/delete-pizza.cy.js b/cypress/integration/5/delete-pizza.js → cypress/e2e/3/delete-pizza.cy.js
@@ -1,19 +1,18 @@
 describe('Delete pizza', () => {
   beforeEach(() => {
-    cy.server();
-    cy.fixture('pizzas').as('pizzasAPI');
+
+    cy.fixture('pizzas').then((pizzas) => {
+      cy.intercept({
+        method: 'DELETE',
+        url: '/api/pizzas/*'
+      }, pizzas).as('deletePizza');
+
+      cy.intercept({
+        method: 'GET',
+        url: '/api/pizzas'
+      }, pizzas).as('getPizzas');
+    });
     cy.fixture('addTopping').as('addToppingAPI');
-    cy.route({
-      method: 'DELETE',
-      url: '/api/pizzas/*',
-      response: {}
-    }).as('deletePizza');
-    cy.route({
-      method: 'GET',
-      status: 200,
-      url: '/api/pizzas',
-      response: '@pizzasAPI'
-    }).as('getPizzas');
 
     cy.visit('');
   });
@@ -31,9 +30,6 @@ describe('Delete pizza', () => {
       .contains('Delete Pizza')
       .click();
 
-    cy.wait('@deletePizza')
-      .should(res => {
-          expect(res.status).to.equal(200);
-      });
+    cy.wait('@deletePizza').its('response.statusCode').should('eq', 200)
   });
 });