Skip to content

feat(server): add transportMode #2116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hiroppy merged 8 commits into from
Aug 8, 2019
Merged

feat(server): add transportMode #2116

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae7d162
feat(server): add transport mode
knagaitsev Jul 11, 2019
d9afb64
fix(transport): update transport e2e test and rename tests
knagaitsev Jul 11, 2019
1b3e78d
test(options): fixed options test
knagaitsev Jul 11, 2019
c648678
refactor(server): move transport mode default setting into helper
knagaitsev Jul 23, 2019
a0d8a9e
Merge branch 'master' into transportMode-option
evilebottnawi Jul 30, 2019
90790a4
Merge branch 'master' into transportMode-option
evilebottnawi Jul 30, 2019
be8e864
Merge branch 'master' into transportMode-option
evilebottnawi Aug 6, 2019
aa17f7c
Merge branch 'master' into transportMode-option
evilebottnawi Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test(options): fixed options test
  • Loading branch information
@knagaitsev
knagaitsev committed Jul 29, 2019
commit 1b3e78d13fd5a086c6e12d5e8d5da40abfbc9f78
3 changes: 2 additions & 1 deletion lib/options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,8 @@
}
]
}
}
},
"additionalProperties": false
},
{
"enum": ["sockjs", "ws"]
Expand Down
38 changes: 28 additions & 10 deletions test/options.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,36 +403,54 @@ describe('options', () => {
'ws',
'sockjs',
{
server: 'sockjs',
transportMode: {
server: 'sockjs',
},
},
{
server: require.resolve('../lib/servers/SockJSServer'),
transportMode: {
server: require.resolve('../lib/servers/SockJSServer'),
},
},
{
server: SockJSServer,
transportMode: {
server: SockJSServer,
},
},
{
client: 'sockjs',
transportMode: {
client: 'sockjs',
},
},
{
client: require.resolve('../client/clients/SockJSClient'),
transportMode: {
client: require.resolve('../client/clients/SockJSClient'),
},
},
{
server: SockJSServer,
client: require.resolve('../client/clients/SockJSClient'),
transportMode: {
server: SockJSServer,
client: require.resolve('../client/clients/SockJSClient'),
},
},
],
failure: [
'nonexistent-implementation',
null,
{
notAnOption: true,
transportMode: {
notAnOption: true,
},
},
{
server: false,
transportMode: {
server: false,
},
},
{
client: () => {},
transportMode: {
client: () => {},
},
},
],
},
Expand Down