Updated swagger cypress package,

which works with proxies

Author: jc21

Jenkinsfile

@@ -127,6 +127,11 @@ pipeline {
 					junit 'test/results/junit/*'
 					sh 'docker-compose down --remove-orphans --volumes -t 30 || true'
 				}
+				unstable {
+					dir(path: 'testing/results') {
+						archiveArtifacts(allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml')
+					}
+				}
 			}
 		}
 		stage('Test Mysql') {
@@ -155,6 +160,11 @@ pipeline {
 					junit 'test/results/junit/*'
 					sh 'docker-compose down --remove-orphans --volumes -t 30 || true'
 				}
+				unstable {
+					dir(path: 'testing/results') {
+						archiveArtifacts(allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml')
+					}
+				}
 			}
 		}
 		stage('MultiArch Build') {

docker/docker-compose.dev.yml

@@ -1,7 +1,7 @@
 # WARNING: This is a DEVELOPMENT docker-compose file, it should not be used for production.
 services:
 
-  npm:
+  fullstack:
     image: nginxproxymanager:dev
     container_name: npm_core
     build:
@@ -67,7 +67,7 @@ services:
       URL: "http://npm:81/api/schema"
       PORT: '80'
     depends_on:
-      - npm
+      - fullstack
 
   squid:
     image: ubuntu/squid

test/cypress/config/ci.js

@@ -15,7 +15,7 @@ module.exports = defineConfig({
 			return require("../plugins/index.js")(on, config);
 		},
 		env: {
-			swaggerBase: 'http://fullstack:81/api/schema',
+			swaggerBase: '{{baseUrl}}/api/schema?ts=' + Date.now(),
 		},
 		baseUrl: 'http://fullstack:81',
 	}

test/cypress/config/dev.js

@@ -1,4 +1,4 @@
-/// <reference types="Cypress" />
+/// <reference types="cypress" />
 
 describe('Certificates endpoints', () => {
 	let token;
@@ -26,6 +26,7 @@ describe('Certificates endpoints', () => {
 	});
 
 	it('Custom certificate lifecycle', function() {
+		// Create custom cert
 		cy.task('backendApiPost', {
 			token: token,
 			path:  '/api/nginx/certificates',
@@ -38,6 +39,7 @@ describe('Certificates endpoints', () => {
 			expect(data).to.have.property('id');
 			certID = data.id;
 
+			// Upload files
 			cy.task('backendApiPostFiles', {
 				token: token,
 				path:  `/api/nginx/certificates/${certID}/upload`,
@@ -46,31 +48,31 @@ describe('Certificates endpoints', () => {
 					certificate_key: 'test.example.com-key.pem',
 				},
 			}).then((data) => {
-				cy.validateSwaggerSchema('post', 201, '/nginx/certificates/upload', data);
+				cy.validateSwaggerSchema('post', 200, '/nginx/certificates/{certID}/upload', data);
 				expect(data).to.have.property('certificate');
 				expect(data).to.have.property('certificate_key');
 
-				cy.task('backendApiDelete', {
+				// Get all certs
+				cy.task('backendApiGet', {
 					token: token,
-					path:  `/api/nginx/certificates/${certID}`
+					path:  '/api/nginx/certificates?expand=owner'
 				}).then((data) => {
-					cy.validateSwaggerSchema('delete', 200, '/nginx/certificates/{certID}', data);
-					expect(data).to.be.equal(true);
+					cy.validateSwaggerSchema('get', 200, '/nginx/certificates', data);
+					expect(data.length).to.be.greaterThan(0);
+
+					// Delete cert
+					cy.task('backendApiDelete', {
+						token: token,
+						path:  `/api/nginx/certificates/${certID}`
+					}).then((data) => {
+						cy.validateSwaggerSchema('delete', 200, '/nginx/certificates/{certID}', data);
+						expect(data).to.be.equal(true);
+					});
 				});
 			});
 		});
 	});
 
-	it('Should be able to get all certs', function() {
-		cy.task('backendApiGet', {
-			token: token,
-			path:  '/api/nginx/certificates?expand=owner'
-		}).then((data) => {
-			cy.validateSwaggerSchema('get', 200, '/nginx/certificates', data);
-			expect(data.length).to.be.greaterThan(0);
-		});
-	});
-
 	it('Request Certificate - CVE-2024-46256/CVE-2024-46257', function() {
 		cy.task('backendApiPost', {
 			token: token,

test/cypress/e2e/api/Certificates.cy.js

@@ -1,4 +1,4 @@
-/// <reference types="Cypress" />
+/// <reference types="cypress" />
 
 describe('Basic API checks', () => {
 	it('Should return a valid health payload', function () {
@@ -12,7 +12,7 @@ describe('Basic API checks', () => {
 
 	it('Should return a valid schema payload', function () {
 		cy.task('backendApiGet', {
-			path: '/api/schema',
+			path: '/api/schema?ts=' + Date.now(),
 		}).then((data) => {
 			expect(data.openapi).to.be.equal('3.1.0');
 		});

test/cypress/e2e/api/Health.cy.js

@@ -1,4 +1,4 @@
-/// <reference types="Cypress" />
+/// <reference types="cypress" />
 
 describe('Hosts endpoints', () => {
 	let token;

test/cypress/e2e/api/Hosts.cy.js

@@ -1,4 +1,4 @@
-/// <reference types="Cypress" />
+/// <reference types="cypress" />
 
 describe('Users endpoints', () => {
 	let token;

test/cypress/e2e/api/Users.cy.js

@@ -80,7 +80,7 @@ BackendApi.prototype._handleError = function(err, resolve, reject, returnOnError
  * @returns {Promise<object>}
  */
 BackendApi.prototype.request = function (method, path, returnOnError, data) {
-	logger(method.toUpperCase(), this.config.baseUrl + path);
+	logger(method.toUpperCase(), path);
 	const options = this._prepareOptions(returnOnError);
 
 	return new Promise((resolve, reject) => {

test/cypress/plugins/backendApi/client.js

@@ -1,4 +1,4 @@
-const {SwaggerValidation} = require('@jc21/cypress-swagger-validation');
+const { SwaggerValidation } = require('@jc21/cypress-swagger-validation');
 
 module.exports = (on, config) => {
 	// Replace swaggerBase config var wildcard