Add StringCollection to make it easier to work with strings

This commit is contained in:
Kim Biesbjerg
2016-12-09 05:18:04 +01:00
parent befd841457
commit 73801a9cc5
17 changed files with 204 additions and 111 deletions

View File

@@ -15,20 +15,20 @@ describe('DirectiveParser', () => {
it('should extract contents when no translate attribute value is provided', () => {
const contents = '<div translate>Hello World</div>';
const messages = parser.process(templateFilename, contents);
expect(messages).to.deep.equal(['Hello World']);
const keys = parser.extract(contents, templateFilename).keys();
expect(keys).to.deep.equal(['Hello World']);
});
it('should extract translate attribute if provided', () => {
const contents = '<div translate="KEY">Hello World<div>';
const messages = parser.process(templateFilename, contents);
expect(messages).to.deep.equal(['KEY']);
const keys = parser.extract(contents, templateFilename).keys();
expect(keys).to.deep.equal(['KEY']);
});
it('should extract bound translate attribute as key if provided', () => {
const contents = `<div [translate]="'KEY'">Hello World<div>`;
const messages = parser.process(templateFilename, contents);
expect(messages).to.deep.equal(['KEY']);
const keys = parser.extract(contents, templateFilename).keys();
expect(keys).to.deep.equal(['KEY']);
});
it('should extract direct text nodes when no translate attribute value is provided', () => {
@@ -39,8 +39,8 @@ describe('DirectiveParser', () => {
Hi <em>there</em>
</div>
`;
const messages = parser.process(templateFilename, contents);
expect(messages).to.deep.equal(['Hello', 'Hi']);
const keys = parser.extract(contents, templateFilename).keys();
expect(keys).to.deep.equal(['Hello', 'Hi']);
});
it('should extract direct text nodes of tags with a translate attribute', () => {
@@ -51,8 +51,8 @@ describe('DirectiveParser', () => {
<div translate>Hi there</div>
</div>
`;
const messages = parser.process(templateFilename, contents);
expect(messages).to.deep.equal(['Hello World', 'Hi there']);
const keys = parser.extract(contents, templateFilename).keys();
expect(keys).to.deep.equal(['Hello World', 'Hi there']);
});
it('should extract translate attribute if provided or direct text nodes if not', () => {
@@ -64,8 +64,8 @@ describe('DirectiveParser', () => {
<p [translate]="'OTHER_KEY'">Lorem Ipsum</p>
</div>
`;
const messages = parser.process(templateFilename, contents);
expect(messages).to.deep.equal(['KEY', 'Hi there', 'OTHER_KEY']);
const keys = parser.extract(contents, templateFilename).keys();
expect(keys).to.deep.equal(['KEY', 'Hi there', 'OTHER_KEY']);
});
it('should extract and parse inline template', () => {
@@ -76,26 +76,26 @@ describe('DirectiveParser', () => {
})
export class TestComponent { }
`;
const messages = parser.process(componentFilename, contents);
expect(messages).to.deep.equal(['Hello World']);
const keys = parser.extract(contents, componentFilename).keys();
expect(keys).to.deep.equal(['Hello World']);
});
it('should extract contents when no ng2-translate attribute value is provided', () => {
const contents = '<div ng2-translate>Hello World</div>';
const messages = parser.process(templateFilename, contents);
expect(messages).to.deep.equal(['Hello World']);
const keys = parser.extract(contents, templateFilename).keys();
expect(keys).to.deep.equal(['Hello World']);
});
it('should extract ng2-translate attribute if provided', () => {
const contents = '<div ng2-translate="KEY">Hello World<div>';
const messages = parser.process(templateFilename, contents);
expect(messages).to.deep.equal(['KEY']);
const keys = parser.extract(contents, templateFilename).keys();
expect(keys).to.deep.equal(['KEY']);
});
it('should extract bound ng2-translate attribute as key if provided', () => {
const contents = `<div [ng2-translate]="'KEY'">Hello World<div>`;
const messages = parser.process(templateFilename, contents);
expect(messages).to.deep.equal(['KEY']);
const keys = parser.extract(contents, templateFilename).keys();
expect(keys).to.deep.equal(['KEY']);
});
});

View File

@@ -14,20 +14,20 @@ describe('PipeParser', () => {
it('should extract interpolated strings using translate pipe', () => {
const contents = `Hello {{ 'World' | translate }}`;
const messages = parser.process(templateFilename, contents);
expect(messages).to.deep.equal(['World']);
const keys = parser.extract(contents, templateFilename).keys();
expect(keys).to.deep.equal(['World']);
});
it('should extract interpolated strings using translate pipe in attributes', () => {
const contents = `<span attr="{{ 'Hello World' | translate }}"></span>`;
const messages = parser.process(templateFilename, contents);
expect(messages).to.deep.equal(['Hello World']);
const keys = parser.extract(contents, templateFilename).keys();
expect(keys).to.deep.equal(['Hello World']);
});
it('should extract bound strings using translate pipe in attributes', () => {
const contents = `<span [attr]="'Hello World' | translate"></span>`;
const messages = parser.process(templateFilename, contents);
expect(messages).to.deep.equal(['Hello World']);
const keys = parser.extract(contents, templateFilename).keys();
expect(keys).to.deep.equal(['Hello World']);
});
});

View File

@@ -30,8 +30,8 @@ describe('ServiceParser', () => {
protected _translateService: TranslateService
) { }
`;
const messages = parser.extractTranslateServiceVar(contents);
expect(messages).to.equal('_translateService');
const name = parser.extractTranslateServiceVar(contents);
expect(name).to.equal('_translateService');
});
it('should extract strings in TranslateService\'s get() method', () => {
@@ -43,8 +43,8 @@ describe('ServiceParser', () => {
this._translateService.get('Hello World');
}
`;
const messages = parser.process(componentFilename, contents);
expect(messages).to.deep.equal(['Hello World']);
const keys = parser.extract(contents, componentFilename).keys();
expect(keys).to.deep.equal(['Hello World']);
});
it('should extract strings in TranslateService\'s instant() method', () => {
@@ -56,8 +56,8 @@ describe('ServiceParser', () => {
this._translateService.instant('Hello World');
}
`;
const messages = parser.process(componentFilename, contents);
expect(messages).to.deep.equal(['Hello World']);
const keys = parser.extract(contents, componentFilename).keys();
expect(keys).to.deep.equal(['Hello World']);
});
it('should extract array of strings in TranslateService\'s get() method', () => {
@@ -69,8 +69,8 @@ describe('ServiceParser', () => {
this._translateService.get(['Hello', 'World']);
}
`;
const messages = parser.process(componentFilename, contents);
expect(messages).to.deep.equal(['Hello', 'World']);
const keys = parser.extract(contents, componentFilename).keys();
expect(keys).to.deep.equal(['Hello', 'World']);
});
it('should extract array of strings in TranslateService\'s instant() method', () => {
@@ -82,8 +82,8 @@ describe('ServiceParser', () => {
this._translateService.instant(['Hello', 'World']);
}
`;
const messages = parser.process(componentFilename, contents);
expect(messages).to.deep.equal(['Hello', 'World']);
const key = parser.extract(contents, componentFilename).keys();
expect(key).to.deep.equal(['Hello', 'World']);
});
it('should not extract strings in get()/instant() methods of other services', () => {
@@ -99,8 +99,8 @@ describe('ServiceParser', () => {
this._otherService.instant('Hi there');
}
`;
const messages = parser.process(componentFilename, contents);
expect(messages).to.deep.equal([]);
const keys = parser.extract(contents, componentFilename).keys();
expect(keys).to.deep.equal([]);
});
});