cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: String.split(str, n) stops after n separator (#10408)

Browse Source
This commit is contained in:
Victor Berchet
2016-08-01 11:33:35 -07:00
committed by GitHub
parent e73d0511cf
commit 13c8211065
8 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/@angular/compiler/test/i18n/extractor_spec.ts
View File

@ -16,8 +16,8 @@ export function main() {
describe('MessageExtractor', () => {
describe('elements', () => {
it('should extract from elements', () => {
expect(extract('<div i18n="m|d">text<span>nested</span></div>')).toEqual([
[['text', '<span>nested</span>'], 'm', 'd'],
expect(extract('<div i18n="m|d|e">text<span>nested</span></div>')).toEqual([
[['text', '<span>nested</span>'], 'm', 'd|e'],
]);
});
@ -28,11 +28,11 @@ export function main() {
describe('blocks', () => {
it('should extract from blocks', () => {
expect(extract(`<!-- i18n: meaning1|desc1 -->message1<!-- /i18n -->
<!-- i18n: meaning2 -->message2<!-- /i18n -->
<!-- i18n: desc2 -->message2<!-- /i18n -->
<!-- i18n -->message3<!-- /i18n -->`))
.toEqual([
[['message1'], 'meaning1', 'desc1'],
[['message2'], 'meaning2', ''],
[['message2'], '', 'desc2'],
[['message3'], '', ''],
]);
});

4
modules/@angular/compiler/test/i18n/i18n_parser_spec.ts
View File

@ -133,11 +133,11 @@ export function main() {
describe('blocks', () => {
it('should extract from blocks', () => {
expect(_humanizeMessages(`<!-- i18n: meaning1|desc1 -->message1<!-- /i18n -->
<!-- i18n: meaning2 -->message2<!-- /i18n -->
<!-- i18n: desc2 -->message2<!-- /i18n -->
<!-- i18n -->message3<!-- /i18n -->`))
.toEqual([
[['message1'], 'meaning1', 'desc1'],
[['message2'], 'meaning2', ''],
[['message2'], '', 'desc2'],
[['message3'], '', ''],
]);
});

18
modules/@angular/compiler/test/util_spec.ts
View File

@ -9,7 +9,7 @@
import {fakeAsync} from '@angular/core/testing/fake_async';
import {beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
import {SyncAsyncResult} from '../src/util';
import {SyncAsyncResult, splitAtColon} from '../src/util';
export function main() {
describe('util', () => {
@ -20,5 +20,21 @@ export function main() {
sar.asyncResult.then((v: any) => expect(v).toBe(syncValue));
}));
});
describe('splitAtColon', () => {
it('should split when a single ":" is present', () => {
expect(splitAtColon('a:b', [])).toEqual(['a', 'b']);
});
it('should trim parts', () => { expect(splitAtColon(' a : b ', [])).toEqual(['a', 'b']); });
it('should support multiple ":"', () => {
expect(splitAtColon('a:b:c', [])).toEqual(['a', 'b:c']);
});
it('should use the default value when no ":" is present', () => {
expect(splitAtColon('ab', ['c', 'd'])).toEqual(['c', 'd']);
});
});
});
}