Skip to content

Commit

Permalink
test(ivy): i18n - add compile time translation to integration test (a…
Browse files Browse the repository at this point in the history
  • Loading branch information
petebacondarwin authored and ODAVING committed Oct 18, 2019
1 parent 9bcdd8f commit 9c0731c
Show file tree
Hide file tree
Showing 19 changed files with 1,839 additions and 1,843 deletions.
1 change: 1 addition & 0 deletions integration/.gitignore
@@ -1,6 +1,7 @@
built/
dist/
vendor/
tmp/
*/src/*.d.ts
*/src/*.js
!karma.conf.js
Expand Down
37 changes: 24 additions & 13 deletions integration/cli-hello-world-ivy-i18n/angular.json
Expand Up @@ -16,6 +16,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"progress": false,
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
Expand All @@ -31,6 +32,9 @@
"scripts": []
},
"configurations": {
"view-engine": {
"tsConfig": "src/tsconfig.view-engine.json"
},
"production": {
"fileReplacements": [
{
Expand All @@ -55,9 +59,8 @@
}
]
},
"legacy-id-mode": {
"tsConfig": "src/tsconfig.legacy-id-mode.json",
"polyfills": "src/polyfills.legacy-id-mode.ts",
"translated-legacy": {
"tsConfig": "src/tsconfig.legacy.json",
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
Expand All @@ -66,7 +69,7 @@
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"buildOptimizer": true
}
}
},
Expand All @@ -85,17 +88,15 @@
"ci-production": {
"browserTarget": "cli-hello-world-ivy-compat:build:production",
"progress": false
},
"legacy-id-mode": {
"browserTarget": "cli-hello-world-ivy-compat:build:legacy-id-mode",
"progress": false
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "cli-hello-world-ivy-compat:build"
"browserTarget": "cli-hello-world-ivy-compat:build:view-engine",
"outputPath": "../tmp/legacy-locales/",
"outFile": "messages.legacy.xlf"
}
},
"test": {
Expand Down Expand Up @@ -137,8 +138,9 @@
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "cli-hello-world-ivy-compat:serve"
"protractorConfig": "e2e/runtime/protractor.conf.js",
"devServerTarget": "cli-hello-world-ivy-compat:serve",
"webdriverUpdate": true
},
"configurations": {
"production": {
Expand All @@ -150,8 +152,17 @@
"ci-production": {
"devServerTarget": "cli-hello-world-ivy-compat:serve:ci-production"
},
"legacy-id-mode": {
"devServerTarget": "cli-hello-world-ivy-compat:serve:legacy-id-mode"
"translated-legacy": {
"devServerTarget": "",
"protractorConfig": "e2e/legacy/protractor.conf.js"
},
"translated-fr": {
"devServerTarget": "",
"protractorConfig": "e2e/fr/protractor.conf.js"
},
"translated-de": {
"devServerTarget": "",
"protractorConfig": "e2e/de/protractor.conf.js"
}
}
},
Expand Down
38 changes: 38 additions & 0 deletions integration/cli-hello-world-ivy-i18n/e2e/README.md
@@ -0,0 +1,38 @@
## E2E tests

There are four different sets of e2e tests in this folder. They are all testing different
translation scenarios, but they are all built with IVY enabled.

### runtime

Translations are provided at runtime by calling `loadTranslations()` in the polyfill.ts

### de and fr

The application is built (into the `dist` folder) and then two sets of translations
(`src/locales/messages.(de|fr).json`) are used to generate two copies of the app, which have
been translated (compile-time inlined).

These translated apps are stored in `tmp/translations/(de|fr)`.

### legacy

The legacy `ng xi18n` tool extracts the messages from the Angular templates, into the XLIFF 1.2
format with legacy message ids (`tmp/legacy-locales/messages.legacy.xlf`).

The translation file is modified to apply a simple translation.

The app must be compiled using the `i18nLegacyMessageIdFormat` option set to ensure that the correct
message ids are used to match those in the translation files.

The app is translated using the compile-time inlining tool to generate a copy that has the
translated message in it.

## Hosting

Since the CLI hosts from and in-memory file-system the compile-time inliner is not able to
translate the output files. So the `de`, `fr` and `legacy` apps must be statically built to
disk and translated there.

Since the translated app is now on disk, we cannot use the CLI to serve it. Instead we use
a simple static HTTP server instead.
17 changes: 17 additions & 0 deletions integration/cli-hello-world-ivy-i18n/e2e/de/app.e2e-spec.ts
@@ -0,0 +1,17 @@
import {AppPage} from '../app.po';

describe('cli-hello-world-ivy App', () => {
let page: AppPage;
beforeEach(() => {
page = new AppPage();
page.navigateTo();
});

it('should display title', () => {
expect(page.getHeading()).toEqual('Guten Tag, cli-hello-world-ivy-compat! (inline)');
});

it('should display welcome message', () => {
expect(page.getParagraph('message')).toEqual('Willkommen in der i18n App. (inline)');
});
});
@@ -0,0 +1,5 @@
const {config} = require('../protractor.conf');
exports.config = {
...config,
specs: ['./app.e2e-spec.ts'],
};
16 changes: 16 additions & 0 deletions integration/cli-hello-world-ivy-i18n/e2e/fr/app.e2e-spec.ts
@@ -0,0 +1,16 @@
import {AppPage} from '../app.po';

describe('cli-hello-world-ivy App', () => {
let page: AppPage;
beforeEach(() => {
page = new AppPage();
page.navigateTo();
});

it('should display title',
() => { expect(page.getHeading()).toEqual('Bonjour, cli-hello-world-ivy-compat! (inline)'); });

it('should display welcome message', () => {
expect(page.getParagraph('message')).toEqual('Bienvenue sur l\'application i18n. (inline)');
});
});
@@ -0,0 +1,5 @@
const {config} = require('../protractor.conf');
exports.config = {
...config,
specs: ['./app.e2e-spec.ts'],
};
18 changes: 18 additions & 0 deletions integration/cli-hello-world-ivy-i18n/e2e/legacy/app.e2e-spec.ts
@@ -0,0 +1,18 @@
import {AppPage} from '../app.po';

describe('cli-hello-world-ivy App', () => {
let page: AppPage;
beforeEach(() => {
page = new AppPage();
page.navigateTo();
});

it('should display translated title',
() => { expect(page.getHeading()).toEqual('Bonjour cli-hello-world-ivy-compat!'); });

it('should display untranslated welcome message', () => {
// This message does not get translated because we did not provide a translation for it
// See "translated:legacy:extract-and-update" in package.json.
expect(page.getParagraph('message')).toEqual('Welcome to the i18n app.');
});
});
@@ -0,0 +1,5 @@
const {config} = require('../protractor.conf');
exports.config = {
...config,
specs: ['./app.e2e-spec.ts'],
};
@@ -1,4 +1,4 @@
import {AppPage} from './app.po';
import {AppPage} from '../app.po';

describe('cli-hello-world-ivy App', () => {
let page: AppPage;
Expand Down
@@ -0,0 +1,5 @@
const {config} = require('../protractor.conf');
exports.config = {
...config,
specs: ['./app.e2e-spec.ts'],
};
23 changes: 20 additions & 3 deletions integration/cli-hello-world-ivy-i18n/package.json
Expand Up @@ -10,7 +10,22 @@
"postinstall": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG",
"start": "ng serve",
"pretest": "ng version",
"test": "ng test --progress=false --watch=false && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production && yarn e2e --configuration=legacy-id-mode"
"test": "ng test --progress=false --watch=false && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production && yarn translated:test && yarn translated:legacy:test",
"translate": "localize-translate -r \"dist/\" -s \"**/*\" -t \"src/locales/messages.*\" -o \"tmp/translations/{{LOCALE}}\"",

"translated:test": "yarn build && yarn translate && yarn translated:fr:e2e && yarn translated:de:e2e",

"translated:fr:serve": "serve tmp/translations/fr --listen 4200",
"translated:fr:e2e": "npm-run-all -p -r translated:fr:serve \"ng e2e --configuration=translated-fr --webdriver-update=false\"",

"translated:de:serve": "serve tmp/translations/de --listen 4200",
"translated:de:e2e": "npm-run-all -p -r translated:de:serve \"ng e2e --configuration=translated-de --webdriver-update=false\"",

"translated:legacy:test": "yarn translated:legacy:extract-and-update && ng build --configuration=translated-legacy && yarn translated:legacy:translate && yarn translated:legacy:e2e",
"translated:legacy:extract-and-update": "ng xi18n && sed -i.bak -e 's/source>/target>'/ -e 's/Hello/Bonjour/' -e 's/source-language=\"en\"/source-language=\"en\" target-language=\"legacy\"/' tmp/legacy-locales/messages.legacy.xlf",
"translated:legacy:translate": "localize-translate -r \"dist/\" -s \"**/*\" -t \"tmp/legacy-locales/messages.legacy.xlf\" -o \"tmp/translations/{{LOCALE}}\"",
"translated:legacy:serve": "serve tmp/translations/legacy --listen 4200",
"translated:legacy:e2e": "npm-run-all -p -r translated:legacy:serve \"ng e2e --configuration=translated-legacy --webdriver-update=false\""
},
"private": true,
"dependencies": {
Expand All @@ -24,13 +39,15 @@
"@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
"@angular/router": "file:../../dist/packages-dist/router",
"core-js": "file:../../node_modules/core-js",
"npm-run-all": "^4.1.5",
"rxjs": "file:../../node_modules/rxjs",
"serve": "^11.2.0",
"tslib": "^1.9.3",
"zone.js": "file:../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.803.0-next.1",
"@angular/cli": "^8.3.0-next.1",
"@angular-devkit/build-angular": "^0.900.0-next.8",
"@angular/cli": "9.0.0-next.8",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@angular/language-service": "file:../../dist/packages-dist/language-service",
"@types/jasmine": "~2.8.8",
Expand Down
@@ -0,0 +1,7 @@
{
"locale": "de",
"translations": {
"1638894134994447485": " Guten Tag, {$INTERPOLATION}! (inline)",
"6762263703087737643": "Willkommen in der i18n App. (inline)"
}
}
@@ -0,0 +1,7 @@
{
"locale": "fr",
"translations": {
"1638894134994447485": " Bonjour, {$INTERPOLATION}! (inline)",
"6762263703087737643": "Bienvenue sur l'application i18n. (inline)"
}
}
104 changes: 0 additions & 104 deletions integration/cli-hello-world-ivy-i18n/src/polyfills.legacy-id-mode.ts

This file was deleted.

@@ -0,0 +1,6 @@
{
"extends": "./tsconfig.app.json",
"angularCompilerOptions": {
"enableIvy": false
}
}

0 comments on commit 9c0731c

Please sign in to comment.