Skip to content

Fixing string shims #88

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
rorticus merged 1 commit into from
Aug 30, 2018
Merged

Fixing string shims #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion src/shim/string.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,14 @@ if (has('es6-string') && has('es6-string-raw')) {
};

endsWith = function endsWith(text: string, search: string, endPosition?: number): boolean {
if (endPosition == null) {
if (search === '') {
return true;
}

if (typeof endPosition === 'undefined') {
endPosition = text.length;
} else if (endPosition === null || isNaN(endPosition)) {
return false;
}

[text, search, endPosition] = normalizeSubstringArgs('endsWith', text, search, endPosition, true);
Expand Down
2 changes: 1 addition & 1 deletion src/shim/support/has.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ add(
let callSite = getCallSite`a\n${b}`;

(callSite as any).raw = ['a\\n'];
const supportsTrunc = global.String.raw(callSite, 42) === 'a:\\n';
const supportsTrunc = global.String.raw(callSite, 42) === 'a\\n';

return supportsTrunc;
}
Expand Down
41 changes: 31 additions & 10 deletions tests/shim/unit/string.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,37 @@ registerSuite('shim - string functions', {
},

'position is Infinity, not included, or NaN'() {
const counts = [Infinity, undefined as any, null, NaN];
for (let count of counts) {
assert.isTrue(stringUtil.endsWith('abc', '', count));
assert.isFalse(stringUtil.endsWith('abc', '\0', count));
assert.isTrue(stringUtil.endsWith('abc', 'c', count));
assert.isFalse(stringUtil.endsWith('abc', 'b', count));
assert.isTrue(stringUtil.endsWith('abc', 'bc', count));
assert.isTrue(stringUtil.endsWith('abc', 'abc', count));
assert.isFalse(stringUtil.endsWith('abc', 'abcd', count));
}
assert.isTrue(stringUtil.endsWith('abc', '', Infinity));
assert.isFalse(stringUtil.endsWith('abc', '\0', Infinity));
assert.isTrue(stringUtil.endsWith('abc', 'c', Infinity));
assert.isFalse(stringUtil.endsWith('abc', 'b', Infinity));
assert.isTrue(stringUtil.endsWith('abc', 'bc', Infinity));
assert.isTrue(stringUtil.endsWith('abc', 'abc', Infinity));
assert.isFalse(stringUtil.endsWith('abc', 'abcd', Infinity));

assert.isTrue(stringUtil.endsWith('abc', '', undefined));
assert.isFalse(stringUtil.endsWith('abc', '\0', undefined));
assert.isTrue(stringUtil.endsWith('abc', 'c', undefined));
assert.isFalse(stringUtil.endsWith('abc', 'b', undefined));
assert.isTrue(stringUtil.endsWith('abc', 'bc', undefined));
assert.isTrue(stringUtil.endsWith('abc', 'abc', undefined));
assert.isFalse(stringUtil.endsWith('abc', 'abcd', undefined));

assert.isTrue(stringUtil.endsWith('abc', '', null as any));
assert.isFalse(stringUtil.endsWith('abc', '\0', null as any));
assert.isFalse(stringUtil.endsWith('abc', 'c', null as any));
assert.isFalse(stringUtil.endsWith('abc', 'b', null as any));
assert.isFalse(stringUtil.endsWith('abc', 'bc', null as any));
assert.isFalse(stringUtil.endsWith('abc', 'abc', null as any));
assert.isFalse(stringUtil.endsWith('abc', 'abcd', null as any));

assert.isTrue(stringUtil.endsWith('abc', '', NaN));
assert.isFalse(stringUtil.endsWith('abc', '\0', NaN));
assert.isFalse(stringUtil.endsWith('abc', 'c', NaN));
assert.isFalse(stringUtil.endsWith('abc', 'b', NaN));
assert.isFalse(stringUtil.endsWith('abc', 'bc', NaN));
assert.isFalse(stringUtil.endsWith('abc', 'abc', NaN));
assert.isFalse(stringUtil.endsWith('abc', 'abcd', NaN));
},

'position is 0 or negative'() {
Expand Down