Skip to content

Commit

Permalink
Feat/enable aws for e2e (#44)
Browse files Browse the repository at this point in the history
- Optimized e2e tests
- Added support for testing AWS cloud provider resources with the help of Localstack
  • Loading branch information
ramgrandhi authored Apr 4, 2021
1 parent d0e86e2 commit 67f547f
Show file tree
Hide file tree
Showing 19 changed files with 307 additions and 382 deletions.
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ Just follow these simple steps.
# Troubleshooting
If you run into issues running above scripts then you may try these steps individually.

a. Run the docker image of **WSO2 API Manager 2.6.0**.
a. Start the following docker containers separately in multiple terminals.

> `docker run -it --name api-manager-260 -p 127.0.0.1:8260:8243 -p 127.0.0.1:9260:9443 --rm wso2/wso2am:2.6.0`
> `docker run --name api-manager-260 -p 127.0.0.1:8260:8243 -p 127.0.0.1:9260:9443 --rm wso2/wso2am:2.6.0`
b. Run the docker image of **WSO2 API Manager 3.2.0**.
> `docker run --name api-manager-320 -p 127.0.0.1:8320:8243 -p 127.0.0.1:9320:9443 --rm wso2/wso2am:3.2.0`
> `docker run -it --name api-manager-320 -p 127.0.0.1:8320:8243 -p 127.0.0.1:9320:9443 --rm wso2/wso2am:3.2.0`
> `docker run --name localstack -p 127.0.0.1:4566:4566 -p 127.0.0.1:4571:4571 --rm localstack/localstack`
c. Start regression tests.
b. Start regression tests.

> `yarn test:e2e`
Binary file modified assets/e2e-tests-ok.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,16 @@
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"test:unit": "jest \"^(.*/)*(.*\\.)*(spec)\\.js$\" --verbose --collectCoverage",
"test:e2e:setup": "echo \"***** Make sure Docker daemon is running.. *****\" && docker stop /api-manager-260 && docker stop /api-manager-320 && concurrently --kill-others true \"docker run --name api-manager-260 -p 127.0.0.1:8260:8243 -p 127.0.0.1:9260:9443 --rm wso2/wso2am:2.6.0\" \"docker run --name api-manager-320 -p 127.0.0.1:8320:8243 -p 127.0.0.1:9320:9443 --rm wso2/wso2am:3.2.0\"",
"test:e2e:setup": "yarn test:e2e:destroy && concurrently \"yarn start:wso2-2.6.0\" \"yarn start:wso2-3.2.0\" \"yarn start:localstack\"",
"test:e2e": "jest e2e --verbose",
"test:e2e:killall": "echo \"***** Make sure Docker daemon is running.. *****\" && docker stop /api-manager-260 & docker stop /api-manager-320 & docker rm /api-manager-260 & docker rm /api-manager-320",
"test:e2e:destroy": "yarn stop:wso2-2.6.0 && yarn stop:wso2-3.2.0 && yarn stop:localstack",
"test": "yarn test:unit",
"start:wso2-2.6.0": "docker run --name api-manager-260 -p 127.0.0.1:8260:8243 -p 127.0.0.1:9260:9443 --rm wso2/wso2am:2.6.0",
"start:wso2-3.2.0": "docker run --name api-manager-320 -p 127.0.0.1:8320:8243 -p 127.0.0.1:9320:9443 --rm wso2/wso2am:3.2.0",
"start:localstack": "docker run --name localstack -p 127.0.0.1:4566:4566 -p 127.0.0.1:4571:4571 --rm localstack/localstack",
"stop:wso2-2.6.0": "docker stop api-manager-260 || true && docker rm api-manager-260 || true",
"stop:wso2-3.2.0": "docker stop api-manager-320 || true && docker rm api-manager-320 || true",
"stop:localstack": "docker stop localstack || true && docker rm localstack || true",
"release:alpha": "release pre alpha --skip-questions",
"release:patch": "release patch --skip-questions",
"release:minor": "release minor --skip-questions",
Expand Down Expand Up @@ -44,6 +50,8 @@
"jest": "^26.6.3",
"qs": "^6.9.6",
"release": "^6.3.0",
"serverless-deployment-bucket": "^1.4.1",
"serverless-localstack": "^0.4.30",
"split-ca": "^1.0.1"
},
"dependencies": {
Expand Down
53 changes: 0 additions & 53 deletions src/__tests__/e2e/2.6.0/valid-backend-jms-topic/serverless.yml

This file was deleted.

45 changes: 0 additions & 45 deletions src/__tests__/e2e/2.6.0/valid-enabled-flag-unset/serverless.yml

This file was deleted.

72 changes: 0 additions & 72 deletions src/__tests__/e2e/2.6.0/valid-swaggerSpec/serverless.yml

This file was deleted.

40 changes: 0 additions & 40 deletions src/__tests__/e2e/3.2.0/invalid-swaggerSpec/serverless.yml

This file was deleted.

46 changes: 0 additions & 46 deletions src/__tests__/e2e/3.2.0/valid-backend-http-baseUrl/serverless.yml

This file was deleted.

23 changes: 0 additions & 23 deletions src/__tests__/e2e/3.2.0/valid-backend-http-certChain/cert.cer

This file was deleted.

Loading

0 comments on commit 67f547f

Please sign in to comment.