Merge "REST: Fix api-testing npm script causing false positive"

wikimedia · Feb 20, 2025 · 4dbbabe · 4dbbabe
2 parents bc35106 + c57fe0b
commit 4dbbabe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/repo/rest-api/package.json b/repo/rest-api/package.json
@@ -4,12 +4,12 @@
 	"description": "OpenAPI definition of Wikibase REST API",
 	"scripts": {
 		"test": "npm run lint",
+		"api-testing:e2e-rest": "npm run mocha -- tests/mocha",
 		"api-testing:e2e-crud": "npm run mocha -- --require ../domains/crud/tests/mocha/api-testing/fixtures.cjs ../domains/crud/tests/mocha/api-testing",
-		"api-testing:e2e-rest": "npm run mocha -- tests/mocha/",
 		"api-testing:e2e-search": "npm run mocha -- ../domains/search/tests/mocha/api-testing",
 		"api-testing:spec-crud": "npm run mocha -- ../domains/crud/tests/mocha/openapi-validation",
 		"api-testing:spec-search": "npm run mocha -- ../domains/search/tests/mocha/openapi-validation",
-		"api-testing": "npm-run-all build:spec api-testing:*",
+		"api-testing": "npm-run-all api-testing:*",
 		"mocha": "mocha --timeout 0 --inline-diffs",
 		"lint": "npm-run-all --parallel lint:*",
 		"lint:openapi": "npm run spec:join && redocly lint specs/openapi-joined.json",

diff --git a/repo/rest-api/tests/mocha/GetOpenApiDocTest.js b/repo/rest-api/tests/mocha/GetOpenApiDocTest.js
@@ -1,12 +1,14 @@
 'use strict';
 
+const { execSync } = require( 'node:child_process' );
 const { bundle, loadConfig } = require( '@redocly/openapi-core' );
 const { expect } = require( './helpers/chaiHelper' );
 const { RequestBuilder } = require( './helpers/RequestBuilder' );
 
 describe( 'GET /openapi.json', () => {
 
 	it( 'can GET the latest version of the OpenAPI document', async () => {
+		execSync( 'npm run spec:join' );
 		const config = await loadConfig( { configPath: 'redocly.yaml' } );
 		const schema = ( await bundle( { ref: './specs/openapi-joined.json', config, dereference: true } ) ).bundle.parsed;
 		const response = await new RequestBuilder()