test: replace indexOf with includes #12604

gwer · 2017-04-23T00:11:32Z

Partly fixes #12586

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
commit message follows commit guidelines

Affected core subsystem(s)

refack · 2017-04-23T00:18:41Z

@gwer Looks good. But we're still discussing the implication of #12586, so it might take some time to land (or might even be rejected). But thank you very much for the effort!

aqrln · 2017-04-23T00:19:10Z

test/addons-napi/test_constructor/test.js

-assert.ok(propertyNames.indexOf('readonlyValue') >= 0);
+assert.ok(propertyNames.includes('echo'));
+assert.ok(propertyNames.includes('readwriteValue'));
+assert.ok(propertyNames.includes('readonlyValue'));
 assert.ok(propertyNames.indexOf('hiddenValue') < 0);
 assert.ok(propertyNames.indexOf('readwriteAccessor1') < 0);
 assert.ok(propertyNames.indexOf('readwriteAccessor2') < 0);


These should be updated to !propertyNames.includes() too so that the code is consistent.

aqrln · 2017-04-23T00:19:31Z

test/addons-napi/test_properties/test.js

-assert.ok(propertyNames.indexOf('readonlyValue') >= 0);
+assert.ok(propertyNames.includes('echo'));
+assert.ok(propertyNames.includes('readwriteValue'));
+assert.ok(propertyNames.includes('readonlyValue'));
 assert.ok(propertyNames.indexOf('hiddenValue') < 0);


aqrln · 2017-04-23T00:23:31Z

test/addons/repl-domain-abort/test.js

@@ -54,7 +54,7 @@ dInput._read = function _read(size) {
 };

 dOutput._write = function _write(chunk, encoding, cb) {
-  if (chunk.toString().indexOf('cb_ran') === 0)
+  if (chunk.toString().startsWith('cb_ran'))


I think it makes sense to decouple changes to startsWith to a different PR. As far as I can see from the discussion in #12586, that PR won't be controversial like this one may potentially be :)

I agree, all === 0 could be in a separate PR, and land easily.

refack · 2017-04-23T00:25:37Z

test/addons-napi/test_constructor/test.js

+assert.ok(propertyNames.includes('readwriteValue'));
+assert.ok(propertyNames.includes('readonlyValue'));
+assert.ok(!propertyNames.includes('hiddenValue'));
+assert.ok(!propertyNames.includes('readwriteAccessor1'));


Partly fixes nodejs#12586

aqrln · 2017-04-23T00:33:51Z

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

mscdex · 2017-04-23T01:29:27Z

I'm -1 on this for the reasons I described in #12586.

jasnell

LGTM if CI is green

gwer · 2017-04-24T16:46:13Z

CI is green now.

jasnell · 2017-04-24T17:41:27Z

@mscdex ... can you use the "request changes" thing on here to put the big red X so folks don't miss your objection.

mscdex

I'm -1 on this for the reasons I described in #12586.

refack · 2017-04-27T01:12:14Z

@mscdex the @nodejs/lts have deceived that "theoretically test improvements wouldn't be backported to maintenance branches" will you be willing to lift your objection?

gibfahn · 2017-04-27T12:11:04Z

@mscdex at the last LTS meeting we agreed that test changes will not be backported (except in some once-in-a-blue-moon occasion where it's really crucial). Given that, do you still object?

cc/ @nodejs/lts , does anyone have an issue with these changes landing now?

mscdex · 2017-04-27T17:36:44Z

@gibfahn It's not just general test changes (e.g. adding common.mustCall() in places) but even things like non-semver-major changes that get backported that include tests (that may use .includes()). I guess as long as whoever is backporting doesn't mind having to change commit(s) for v4.x, then it's fine. Anyway, it seems I'm in the minority here, so I say go ahead.

no longer disapprove

MylesBorins · 2017-04-27T20:15:02Z

Test changes still need to be backport to v6.x

…

On Apr 27, 2017 1:36 PM, "Brian White" ***@***.***> wrote: @gibfahn <https://github.com/gibfahn> It's not just general test changes (e.g. adding common.mustCall() in places) but even things like non-semver-major changes that get backported that include tests (that may use .includes()). I guess as long as whoever is backporting doesn't mind having to change commit(s) for v4.x, then it's fine. Anyway, it seems I'm in the minority here, so I say go ahead. — You are receiving this because you are on a team that was mentioned. Reply to this email directly, view it on GitHub <#12604 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAecV1aOe51sQVfSSHJ6mImzE3pcvlSTks5r0NIxgaJpZM4NFQYt> .

refack · 2017-04-27T20:16:35Z

@MylesBorins are String.prototype.includes and Array.prototype.includes compatible with v6.x?

gibfahn · 2017-04-27T22:44:36Z

Seems to work for me:

> process.version
'v6.10.1'
> [1,2,3].includes(2)
true
> '123'.includes(2)
true

aqrln · 2017-04-29T21:40:48Z

Given that there are no more objections, I'm going to go ahead and land this.
Fresh CI: https://ci.nodejs.org/job/node-test-pull-request/7749/

aqrln · 2017-04-30T01:16:29Z

Landed in 0142276.

Start the transition to Array.prototype.includes() and String.prototype.includes(). This commit refactors most of the comparisons of Array.prototype.indexOf() and String.prototype.indexOf() return values with -1 to the former methods in tests. PR-URL: #12604 Refs: #12586 Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

Start the transition to Array.prototype.includes() and String.prototype.includes(). This commit refactors most of the comparisons of Array.prototype.indexOf() and String.prototype.indexOf() return values with -1 to the former methods in tests. PR-URL: nodejs#12604 Refs: nodejs#12586 Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

Start the transition to Array.prototype.includes() and String.prototype.includes(). This commit refactors most of the comparisons of Array.prototype.indexOf() and String.prototype.indexOf() return values with -1 to the former methods in tests. Backport-PR-URL: #19447 PR-URL: #12604 Refs: #12586 Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

nodejs-github-bot added addons Issues and PRs related to native addons. dont-land-on-v4.x inspector Issues and PRs related to the V8 inspector protocol node-api Issues and PRs related to the Node-API. test Issues and PRs related to the tests. labels Apr 23, 2017

refack removed addons Issues and PRs related to native addons. inspector Issues and PRs related to the V8 inspector protocol node-api Issues and PRs related to the Node-API. labels Apr 23, 2017

aqrln reviewed Apr 23, 2017

View reviewed changes

gwer force-pushed the indexOf-replace branch from 47c2af9 to 92fe4d9 Compare April 23, 2017 00:25

refack reviewed Apr 23, 2017

View reviewed changes

test: replace indexOf with includes

d918367

Partly fixes nodejs#12586

gwer force-pushed the indexOf-replace branch from 92fe4d9 to d918367 Compare April 23, 2017 00:27

aqrln approved these changes Apr 23, 2017

View reviewed changes

jasnell approved these changes Apr 24, 2017

View reviewed changes

gibfahn approved these changes Apr 24, 2017

View reviewed changes

mscdex previously requested changes Apr 24, 2017

View reviewed changes

refack mentioned this pull request Apr 27, 2017

Remove indexOf usage from tests in favor of includes #12586

Closed

29 tasks

aqrln added refactor to ES6+ labels Apr 29, 2017

aqrln closed this Apr 30, 2017

jasnell mentioned this pull request May 11, 2017

8.0.0 Release Proposal #12220

Closed

gibfahn mentioned this pull request Jun 15, 2017

Auditing for 6.11.1 nodejs/Release#230

Closed

3 tasks

gibfahn added land-on-v6.x and removed lts-watch-v6.x labels Jun 18, 2017

MylesBorins mentioned this pull request Jul 18, 2017

v6.11.2 proposal #14356

Merged

MylesBorins mentioned this pull request Apr 16, 2018

v6.14.2 proposal #19996

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: replace indexOf with includes #12604

test: replace indexOf with includes #12604

gwer commented Apr 23, 2017 •

edited

refack commented Apr 23, 2017

aqrln Apr 23, 2017

aqrln Apr 23, 2017

aqrln Apr 23, 2017

refack Apr 23, 2017

refack Apr 23, 2017

aqrln commented Apr 23, 2017

mscdex commented Apr 23, 2017

jasnell left a comment

gwer commented Apr 24, 2017

jasnell commented Apr 24, 2017

mscdex left a comment

refack commented Apr 27, 2017

gibfahn commented Apr 27, 2017

mscdex commented Apr 27, 2017

MylesBorins commented Apr 27, 2017 via email

refack commented Apr 27, 2017

gibfahn commented Apr 27, 2017 •

edited

aqrln commented Apr 29, 2017

aqrln commented Apr 30, 2017

test: replace indexOf with includes #12604

test: replace indexOf with includes #12604

Conversation

gwer commented Apr 23, 2017 • edited

Checklist

Affected core subsystem(s)

refack commented Apr 23, 2017

aqrln Apr 23, 2017

Choose a reason for hiding this comment

aqrln Apr 23, 2017

Choose a reason for hiding this comment

aqrln Apr 23, 2017

Choose a reason for hiding this comment

refack Apr 23, 2017

Choose a reason for hiding this comment

refack Apr 23, 2017

Choose a reason for hiding this comment

aqrln commented Apr 23, 2017

mscdex commented Apr 23, 2017

jasnell left a comment

Choose a reason for hiding this comment

gwer commented Apr 24, 2017

jasnell commented Apr 24, 2017

mscdex left a comment

Choose a reason for hiding this comment

refack commented Apr 27, 2017

gibfahn commented Apr 27, 2017

mscdex commented Apr 27, 2017

MylesBorins commented Apr 27, 2017 via email

refack commented Apr 27, 2017

gibfahn commented Apr 27, 2017 • edited

aqrln commented Apr 29, 2017

aqrln commented Apr 30, 2017

gwer commented Apr 23, 2017 •

edited

gibfahn commented Apr 27, 2017 •

edited