From 7876015790839e74d1448c7186a8d1cc6f28b1fd Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Mon, 13 May 2024 16:10:29 +0100 Subject: [PATCH] ci: install swagger-mock-validator globally --- .github/workflows/build.yml | 9 ++++----- Makefile | 9 ++++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23f81f1..43a9bba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,8 +25,7 @@ jobs: # - run: make do_provider_test - run: make do_generate_consumer - run: make do_consumer_test - # - run: make do_consumer_pact_verify_openapi - - run: | - cat openapi/openapi.yaml - cat typescript-fetch-pact-consumer/pacts/DefaultApi-consumer-DefaultApi.json - - run: npx --yes @pactflow/swagger-mock-validator openapi/openapi.yaml typescript-fetch-pact-consumer/pacts/DefaultApi-consumer-DefaultApi.json + - run: make do_consumer_pact_verify_openapi + # - run: | + # cat openapi/openapi.yaml + # cat typescript-fetch-pact-consumer/pacts/DefaultApi-consumer-DefaultApi.json diff --git a/Makefile b/Makefile index 484219d..4b3c45b 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ do_soapui_test: soapui_run ## Run SoapUI test suite do_generate_consumer: swagger_codegen_cli_fetch swagger_codegen_generators_fetch swagger_codegen_generators_build swagger_codegen_generators_generate consumer_project_install ## Generate consumer project do_consumer_test: consumer_project_test ## Test consumer -do_consumer_pact_verify_openapi: consumer_project_verify_pact_openapi ## Verify consumer with Pact and OpenAPI +do_consumer_pact_verify_openapi: install_swagger_mock_validator consumer_project_verify_pact_openapi ## Verify consumer with Pact and OpenAPI do_generate_provider: provider_project_fetch provider_project_install ## Generate provider project do_provider_test: provider_start_test_stop ## Test provider @@ -138,7 +138,7 @@ swagger_codegen_generators_fetch: ## Get a fork of Swagger-Code-Generators conta git clone -b typescript-fetch-pact https://github.com/you54f/swagger-codegen-generators swagger_codegen_generators_build: ## Build the swagger-codegen-generators project with Java - cd swagger-codegen-generators && mvn package + cd swagger-codegen-generators && jenv local 1.8 || echo "jenv not found" && mvn package swagger_codegen_generators_generate: ## Generate a templated project from a given OpenAPI specification echo '{ "npmName": "typescript-fetch-pact-consumer" }'>codegen.config.json @@ -151,8 +151,11 @@ consumer_project_install: ## Install the templated project consumer_project_test: ## Test the templated project with Pact cd typescript-fetch-pact-consumer && npm test +install_swagger_mock_validator: + npm -g install @pactflow/swagger-mock-validator + consumer_project_verify_pact_openapi: ## Verify the templated project with Pact and OpenAPI - npx --yes @pactflow/swagger-mock-validator openapi/openapi.yaml typescript-fetch-pact-consumer/pacts/DefaultApi-consumer-DefaultApi.json + swagger-mock-validator openapi/openapi.yaml typescript-fetch-pact-consumer/pacts/DefaultApi-consumer-DefaultApi.json ################################ ### API Func Testing - SoapUI ###