Skip to content
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

Jump to bottom

[JSConf CN Code&Learn] Replace the string concatenation with template literals #14284

Closed
wants to merge 2 commits into from
Closed

[JSConf CN Code&Learn] Replace the string concatenation with template literals #14284

wants to merge 2 commits into from

Conversation

HSUCHING
Copy link
Contributor

[JSConf CN Code&Learn]

Replace string concatenation in test /parallel/test-http-upgrade-client2.js with template literals.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)

no.
Just update tests.

@nodejs-github-bot nodejs-github-bot added the test Issues and PRs related to the tests. label Jul 16, 2017
@TimothyGu TimothyGu added the code-and-learn Issues related to the Code-and-Learn events and PRs submitted during the events. label Jul 16, 2017
Trott
Trott requested changes Jul 16, 2017
View reviewed changes
Copy link
Member

@Trott Trott left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this changes the string. First, \r\n is now just \n. Second, spaces are added at the start of lines (that probably invalidate the http headers).

How about something more like this?:

socket.write(`HTTP/1.1 101 Ok${CRLF}` +
               `Connection: Upgrade${CRLF}` +
               `Upgrade: Test${CRLF}${CRLF}` +
               'head');

@HSUCHING HSUCHING closed this Jul 16, 2017
@targos targos reopened this Jul 16, 2017
Trott
Trott reviewed Jul 16, 2017
View reviewed changes
Copy link
Member

@Trott Trott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM if CI is green

TimothyGu
TimothyGu approved these changes Jul 16, 2017
View reviewed changes
Copy link
Member

@TimothyGu TimothyGu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most other files just use \r\n explicitly. I'd actually prefer that, but LGTM either way.

大部分其它HTTP的测试都直接写\r\n。我觉得那样会更直截了当一些，但是不管怎么说都 LGTM。

@tniessen
Copy link
Member

@Trott PTAL

@vsemozhetbyt
Copy link
Contributor

CI: https://ci.nodejs.org/job/node-test-pull-request/9172/

@Trott
Copy link
Member

Trott commented Jul 17, 2017

Lone CI failure is unrelated to this change. CI is effectively green. This seems trivial enough that if someone wanted to land it before the 72 hour window, that would be fine IMO.

jasnell
jasnell reviewed Jul 17, 2017
View reviewed changes
test/parallel/test-http-upgrade-client2.js
'Upgrade: Test' + CRLF + CRLF + 'head');
socket.write(`HTTP/1.1 101 Ok${CRLF}` +
`Connection: Upgrade${CRLF}` +
`Upgrade: Test${CRLF}${CRLF}` +
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the CRLF is a bit pointless here. I'd just replace it with \r\n literals and avoid the template string entirely.

Trott pushed a commit to Trott/io.js that referenced this pull request Jul 26, 2017
@HSUCHING @Trott
test: replace concatenation with template literal
66a6a15 
PR-URL: nodejs#14284
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
@Trott
Copy link
Member

Trott commented Jul 26, 2017

Landed in 66a6a15.

Thanks for the contribution! 🎉

@Trott Trott closed this Jul 26, 2017
addaleax pushed a commit that referenced this pull request Jul 27, 2017
@HSUCHING @addaleax
test: replace concatenation with template literal
6420a73 
PR-URL: #14284
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
@addaleax addaleax mentioned this pull request Aug 2, 2017
Merged
MylesBorins pushed a commit that referenced this pull request Aug 16, 2017
@HSUCHING @MylesBorins
test: replace concatenation with template literal
fb6df52 
PR-URL: #14284
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
@MylesBorins MylesBorins mentioned this pull request Aug 16, 2017
Merged
MylesBorins pushed a commit that referenced this pull request Aug 16, 2017
@HSUCHING @MylesBorins
test: replace concatenation with template literal
fd5d6c9 
PR-URL: #14284
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
MylesBorins pushed a commit that referenced this pull request Sep 3, 2017
@HSUCHING @MylesBorins
test: replace concatenation with template literal
303b1cc 
PR-URL: #14284
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
MylesBorins pushed a commit that referenced this pull request Sep 5, 2017
@HSUCHING @MylesBorins
test: replace concatenation with template literal
3ba55d8 
PR-URL: #14284
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
@beevelop beevelop mentioned this pull request Sep 5, 2017
Closed
This was referenced Sep 5, 2017
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasnell jasnell jasnell left review comments

@Trott Trott Trott approved these changes

@TimothyGu TimothyGu TimothyGu approved these changes

@tniessen tniessen tniessen approved these changes

@gireeshpunathil gireeshpunathil gireeshpunathil approved these changes

@gibfahn gibfahn gibfahn approved these changes

Assignees
No one assigned
Labels
code-and-learn Issues related to the Code-and-Learn events and PRs submitted during the events. test Issues and PRs related to the tests.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.