diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js index 18c3ff38..0ef48674 100644 --- a/e2e/protractor.conf.js +++ b/e2e/protractor.conf.js @@ -11,7 +11,12 @@ exports.config = { capabilities: { browserName: 'chrome', chromeOptions: { - args: ['--no-sandbox', "--headless", "--disable-gpu", "--window-size=800x600"] + args: ['--no-sandbox', '--headless', '--disable-gpu', '--window-size=800,600', '--lang=de-DE'], + prefs: { + intl: { + 'accept_languages': 'de-DE' + } + }, } }, directConnect: false, diff --git a/e2e/src/settings.e2e-spec.ts b/e2e/src/settings.e2e-spec.ts index a9c40d4b..b2221525 100644 --- a/e2e/src/settings.e2e-spec.ts +++ b/e2e/src/settings.e2e-spec.ts @@ -26,8 +26,8 @@ describe('Settings', () => { page.navigateTo('#/settings'); }); - it('should have a title saying Settings', () => { - expect(page.getPageTitle()).toBe('Settings'); + it('should have a localized title saying "Einstellungen"', () => { + expect(page.getPageTitle()).toBe('Einstellungen'); }); }); }); diff --git a/package.json b/package.json index 8e857a0a..cd79547c 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "build:fake": "ng build --configuration=fake", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md && git commit -m 'docs: update changelog'", "check-configuration": "openstapps-configuration", - "e2e": "ng e2e --no-webdriver-update", + "e2e": "LANGUAGE=de-DE ng e2e --no-webdriver-update", "docker:build": "sudo docker run -p 8100:8100 -p 35729:35729 -p 53703:53703 -v $PWD:/app -it registry.gitlab.com/openstapps/app bash -c \"npm install && npm run build\"", "docker:enter": "sudo docker run -p 8100:8100 -p 35729:35729 -p 53703:53703 -v $PWD:/app -it registry.gitlab.com/openstapps/app bash", "docker:fresh": "sudo docker pull registry.gitlab.com/openstapps/app", diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 4a048610..eff8483c 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -20,6 +20,7 @@ import {StatusBar} from '@ionic-native/status-bar/ngx'; import {Platform} from '@ionic/angular'; import {TranslateService} from '@ngx-translate/core'; +import {ThingTranslateService} from './translation/thing-translate.service'; import {AppComponent} from './app.component'; import {ConfigProvider} from './modules/config/config.provider'; import {SettingsProvider} from './modules/settings/settings.provider'; @@ -32,6 +33,7 @@ describe('AppComponent', () => { let platformReadySpy: any; let platformSpy: jasmine.SpyObj; let translateServiceSpy: jasmine.SpyObj; + let thingTranslateServiceSpy: jasmine.SpyObj; let settingsProvider: jasmine.SpyObj; let configProvider: jasmine.SpyObj; let ngxLogger: jasmine.SpyObj; @@ -42,6 +44,7 @@ describe('AppComponent', () => { platformReadySpy = Promise.resolve(); platformSpy = jasmine.createSpyObj('Platform', { ready: platformReadySpy }); translateServiceSpy = jasmine.createSpyObj('TranslateService', ['setDefaultLang', 'use']); + thingTranslateServiceSpy = jasmine.createSpyObj('ThingTranslateService', ['init']); settingsProvider = jasmine.createSpyObj('SettingsProvider', ['getSettingValue', 'provideSetting', 'setCategoriesOrder']); configProvider = jasmine.createSpyObj('ConfigProvider', @@ -56,6 +59,7 @@ describe('AppComponent', () => { {provide: SplashScreen, useValue: splashScreenSpy}, {provide: Platform, useValue: platformSpy}, {provide: TranslateService, useValue: translateServiceSpy}, + {provide: ThingTranslateService, useValue: thingTranslateServiceSpy}, {provide: SettingsProvider, useValue: settingsProvider}, {provide: ConfigProvider, useValue: configProvider}, {provide: NGXLogger, useValue: ngxLogger},