Websocket Integration Tests #778

computerpunc · 2019-08-13T05:57:05Z

Currently, WebSocket has 35 tests that are not part of npm run test.
This PR will make the WebSocket tests be part of the regular testing flow.

To Do:

Remove dependancy on running npm link in order use current branch serverless-offline in testing.
Remove dependancy on running local DynamoDB instance for testing.
Move from __test__/manual/websocket to __test__/integration/websocket.
Use jest instead of mocha as a testing platform.
After Authorizer support in Websocket #732 is merged into master, prepare this PR for merge.

Added the plugin source to the project and changed the way the plugin handles auth.

Also, fixed 'should not open a connection when has an exception in connect function'. doAction now returns a promise.

…ess-offline into websocket-fixes-authorizer

… into websocket-fixes-authorizer

… into websocket-fixes-authorizer # Conflicts: # manual_test_websocket/RouteSelection/scripts/deploy_to_aws.sh # manual_test_websocket/main/handler.js # manual_test_websocket/main/scripts/deploy_to_offline.sh # manual_test_websocket/main/test/e2e/ws.e2e.js # manual_test_websocket/main/test/support/WebSocketTester.js # package-lock.json # src/ApiGatewayWebSocket.js # src/__tests__/manual/websocket/RouteSelection/handler.js # src/__tests__/manual/websocket/RouteSelection/scripts/deploy_to_aws.sh # src/__tests__/manual/websocket/RouteSelection/scripts/deploy_to_offline.sh # src/__tests__/manual/websocket/RouteSelection/scripts/serverless.offline.yml # src/__tests__/manual/websocket/RouteSelection/test/e2e/ws.e2e.js # src/__tests__/manual/websocket/RouteSelection/test/support/WebSocketTester.js # src/__tests__/manual/websocket/main/scripts/deploy_to_aws.sh # src/__tests__/manual/websocket/main/scripts/deploy_to_offline.sh # src/__tests__/manual/websocket/main/test/support/WebSocketTester.js # src/__tests__/manual/websocket/scripts/deploy_to_aws.sh # src/__tests__/manual/websocket/scripts/deploy_to_offline.sh # src/__tests__/manual/websocket/test/support/WebSocketTester.js # src/index.js # src/websocketHelpers.js

… into websocket-fixes-authorizer # Conflicts: # src/ApiGatewayWebSocket.js

… into websocket-fixes-authorizer

Support authorizers.

fix a few typos

… into websocket-fixes-authorizer

Depolyment and tests are run based on category.

… into websocket-fixes-authorizer

…talled.

computerpunc · 2019-08-14T05:59:14Z

@dnalborczyk

This PR continues where #732 left-off.

Before continuing with this PR, I'll wait for #732 to be merged into master (via your branch).

This updated PR, in comparison to #732, contains only improvements to WebSocket testing. I've simplified testing by removing the need to use npm link and serverless=dynamodb-local.

So if you want, you can merge this PR to your branch and see if WebSocket testing works for you.

In order to run the tests, you now only have to go to ./src/__tests__/manual/websocket and then :

npm i
Set you AWS credentials. I use export AWS_PROFILE=XXXXX.
npm run test-e2e.

You can view logs in ./src/__tests__/manual/websocket/.logs folder.
The read me file is located at ./src/__tests__/manual/websocket/README.md.

If you still have problems, I'll try to help.

dnalborczyk · 2019-09-02T18:57:50Z

@computerpunc I'm still planning on pulling this in! Mind if I re-open?

dnalborczyk · 2019-09-08T19:58:14Z

#732 (comment) and #732 (comment)

computerpunc · 2019-09-16T19:23:39Z

@dnalborczyk

If there is no planed refactoring effort, how about I open a new PR based on alpha and add there WebSocket integration tests?

dnalborczyk · 2019-09-16T20:54:23Z

hey @computerpunc ! that would be absolutely fantastic!

I'm still refactoring, but I leave the test folder structure alone until your PR is merged, I promise!
whichever tests are failing you could just test.skip 'em for now.

computerpunc · 2019-09-17T03:33:24Z

I'm still refactoring, but I leave the test folder structure alone until your PR is merged, I promise!

Thanks

whichever tests are failing you could just test.skip 'em for now.

Will do

computerpunc · 2019-09-19T13:36:14Z

This PR will continue in #814

computerpunc added 30 commits June 28, 2019 22:23

Removed hapi-plugin-websocket

f5c7829

Added the plugin source to the project and changed the way the plugin handles auth.

Moved deploy aws/offline scripts to shared 'scripts' folder

0e62f9c

Support for authorizer (default header Auth)

2b9cbb3

Moved to using 'sec-websocket-key' as connectionId

ffbbd5b

Also, fixed 'should not open a connection when has an exception in connect function'. doAction now returns a promise.

Merge branch 'websocket-fixes' of https://github.com/dherault/serverl…

e97d411

…ess-offline into websocket-fixes-authorizer

Fix merge issues

90d1cd9

Merge branch 'master' of https://github.com/dherault/serverless-offline…

7ac7f04

… into websocket-fixes-authorizer

Added event and context to auth function

f4dee9d

Fix merge

2e5e53b

Updated package-lock.json & lint

83219a9

Another fix for lint.

11e92c0

Merge from upstream/master

5b44cdd

Merge branch 'master' of https://github.com/dherault/serverless-offline…

479e91e

… into websocket-fixes-authorizer # Conflicts: # src/ApiGatewayWebSocket.js

Added support for identitySource in authorizer

492ba23

Merge branch 'master' of https://github.com/dherault/serverless-offline…

8d405dd

… into websocket-fixes-authorizer

Fix auth not working correctly

fe7eaed

Merge branch 'master' of https://github.com/dherault/serverless-offline…

659e766

… into websocket-fixes-authorizer

Fix merge issues.

0fc906b

Updated README

fe09df5

Support authorizers.

Update README

bf61f96

fix a few typos

Update README

c454dec

Merge branch 'master' of https://github.com/dherault/serverless-offline…

5d353ed

… into websocket-fixes-authorizer

Fix merge issues

4710cdf

Merge branch 'master' of https://github.com/dherault/serverless-offline…

85a27e6

… into websocket-fixes-authorizer

Merge branch 'master' of https://github.com/dherault/serverless-offline…

5ad7914

… into websocket-fixes-authorizer

1st step in consolidating e2e tests

030a038

Move into folders test, config & support.

caeaf3c

Categories - main, authorizer or RouteSelection

e8f2ee6

Depolyment and tests are run based on category.

Created unified data scheme for all tests

a2dfb37

computerpunc added 11 commits July 18, 2019 21:38

Fix doesn't pass result of $connect function

263a2e0

Merge branch 'master' of https://github.com/dherault/serverless-offline…

1bcd631

… into websocket-fixes-authorizer

Fix no capital letter in 'Authorization' header

76c446b

Fix plugin reply when handler doesn't answer

f4a11a1

Merge branch 'master' of https://github.com/dherault/serverless-offline…

9619657

… into websocket-fixes-authorizer

Fix 'npm run test' not working

66f320c

Fixed WebSocket tests

ed0a12b

When running 'deploy-dynamodb-local', fix no 'serverless-offline' ins…

fee2f7d

…talled.

Add deploying of local dynamodb to test-e2e

e541794

Removed the need to use 'npm link' in order to use serverless-offline

ce5e8ff

Remove DynamoDB Local dependency

1e4e2ee

dnalborczyk force-pushed the master branch from 1eec7ff to 3f47b66 Compare August 16, 2019 19:40

computerpunc mentioned this pull request Aug 17, 2019

"serverless-offline" v6 alpha feedback #768

Closed

67 tasks

dnalborczyk force-pushed the master branch from 3e29af6 to e275fc8 Compare August 24, 2019 20:29

dnalborczyk force-pushed the master branch from 72d4db0 to e872a4c Compare September 2, 2019 01:30

computerpunc closed this Sep 2, 2019

computerpunc mentioned this pull request Sep 2, 2019

Authorizer support in Websocket #732

Closed

4 tasks

dnalborczyk reopened this Sep 8, 2019

dnalborczyk force-pushed the master branch 3 times, most recently from 826a135 to d0695ce Compare September 16, 2019 04:15

computerpunc mentioned this pull request Sep 19, 2019

WebSocket Integration Tests (Take 2) #814

Open

9 tasks

computerpunc closed this Sep 19, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Websocket Integration Tests #778

Websocket Integration Tests #778

computerpunc commented Aug 13, 2019 •

edited

computerpunc commented Aug 14, 2019

dnalborczyk commented Sep 2, 2019

dnalborczyk commented Sep 8, 2019

computerpunc commented Sep 16, 2019

dnalborczyk commented Sep 16, 2019

computerpunc commented Sep 17, 2019

computerpunc commented Sep 19, 2019

Websocket Integration Tests #778

Websocket Integration Tests #778

Conversation

computerpunc commented Aug 13, 2019 • edited

computerpunc commented Aug 14, 2019

dnalborczyk commented Sep 2, 2019

dnalborczyk commented Sep 8, 2019

computerpunc commented Sep 16, 2019

dnalborczyk commented Sep 16, 2019

computerpunc commented Sep 17, 2019

computerpunc commented Sep 19, 2019

computerpunc commented Aug 13, 2019 •

edited