Merge branch 'feature/fix-test-cordova' into develop

Author: dweber019

README.md

@@ -171,14 +171,14 @@ Integration tests are performed with [Protractor](http://angular.github.io/protr
 
 ## Environment confugration
 There is a configuration management in place. Three standart environments are already set (devlopment, test and production).
-You can also add more environments with ```--env <env-name>``` but there is a catch: You have to add ```--``` for each npm command you
+You can also add more environments with ```--env.target <env-name>``` but there is a catch: You have to add ```--``` for each npm command you
 run throw so if your like to set the evnirnment for ```npm start``` you have to do this like so:
 
   ```shell
-  npm start -- -- --env <json-file-name-without-extension>
+  npm start -- -- --env.target <json-file-name-without-extension>
   ```
 
-This because ```npm start``` runs ```npm run server:dev``` and then the target command, so we have to to pass the ```--env``` by providing two times ```--```.
+This because ```npm start``` runs ```npm run server:dev``` and then the target command, so we have to to pass the ```--env.target``` by providing two times ```--```.
 You can find the configurations in ```<root>/environment```.
 
 ## HTML5 pushState routing
@@ -191,26 +191,7 @@ extra confuration to enable this.
 Initiate cordova with the following commands:
 ```shell
 npm install -g cordova
-npm run cordova:init
-```
-
-Finally add the following code just before the ```</body>``` closing tag:
-```
-<!-- Cordova -->
-<script src="cordova.js"></script>
-```
-
-Cordova has a issue in the way they serve the source code files to the WebView in the platforms. So we have to remove/alter the following code
-to make sure everything works in cordova.
-
-Remove the following line in src/index.ejs
-```
-12: <base href="<%= htmlWebpackPlugin.options.baseUrl %>">
-```
-
-Remove the following line in src/app/app.ts
-```
-8: config.options.pushState = true;
+npm run mobile:setup
 ```
 
 ### Run and build
@@ -235,10 +216,10 @@ So make sure you run for example ```npm run build``` first before runing/buildin
 - [X] add i18n
 - [ ] add materialize.css
 - [ ] Add all important libs like moment, lodash ...
-- [ ] Add cordova
+- [X] Add cordova
 - [X] Add travis
 - [ ] Add greenkeeper
-- [ ] polyfill ES6 promises for tests => replaced phantom with firefox
+- [X] polyfill ES6 promises for tests => replaced phantom with firefox
 - [ ] Add electron
 - [ ] Add wallaby.js
 - [ ] Add typedocs

config/config-environment.js

@@ -1,25 +1,24 @@
 "use strict";
 
 const webpack = require('webpack');
-const minimist = require('minimist')(process.argv.slice(2));
 
 /**
  * Environment Config
  */
 const configEnv = function (options) {
   return {
 		plugins: [
-			new webpack.DefinePlugin(getDefinitions(options.env, options.name, options.version))
+			new webpack.DefinePlugin(getDefinitions(options.env, options.name, options.version, options.platform))
 		]
 	};
 };
 
-function getDefinitions(env, name, version) {
-  const environment = minimist.env || env;
+function getDefinitions(env, name, version, platform) {
   return {
     NAME: JSON.stringify(name),
     VERSION: JSON.stringify(version),
-    CONFIG: JSON.stringify(require(process.cwd() + `/environment/${environment}.json`))
+    PLATFORM: JSON.stringify(platform),
+    CONFIG: JSON.stringify(require(process.cwd() + `/environment/${env}.json`))
 	};
 
 }

package.json

@@ -33,7 +33,10 @@
     "webpack": "cross-env ./node_modules/.bin/webpack",
     "webpack-dev-server": "cross-env ./node_modules/.bin/webpack-dev-server",
     "server:coverage": "http-server ./test/coverage --cors",
-    "cordova:init": "node ./config/init-cordova.js"
+    "mobile:setup": "node ./config/setup-mobile.js",
+    "mobile:build": "npm run build:dev -- --env.platform mobile",
+    "mobile:release": "npm run build:prod -- --env.platform mobile"
+
   },
   "repository": {
     "type": "git",

src/app/app-config.ts

@@ -0,0 +1,18 @@
+/**
+ * Gets and defines the environment configruation
+ */
+declare var NAME: string;
+declare var VERSION: string;
+declare var ENV: string;
+declare var PLATFORM: string;
+declare var CONFIG: AppConfig.IAppConfigEnv;
+
+const AppConfig: AppConfig.IAppConfig = {
+  NAME: NAME,
+  VERSION: VERSION,
+  ENV: ENV,
+  PLATFORM: PLATFORM,
+  CONFIG: CONFIG
+};
+
+export default AppConfig;

src/app/main.ts

@@ -1,20 +1,12 @@
 /**
- * Gets and defines the environment configruation
+ * Import the main sass file for all the styles
  */
-declare var NAME: string;
-declare var VERSION: string;
-declare var CONFIG: AppConfig.IAppConfigEnv;
-
-const AppConfig: AppConfig.IAppConfig = {
-  NAME: NAME,
-  VERSION: VERSION,
-  CONFIG: CONFIG
-};
+import '../scss/main.scss';
 
 /**
- * Import the main sass file for all the styles
+ * App configuration import
  */
-import '../scss/main.scss';
+import AppConfig from './app-config';
 
 /**
  * Aurelia imports

test/karma.conf.js

@@ -38,7 +38,7 @@ module.exports = function(config) {
       'spec-bundle.js': ['coverage', 'webpack', 'sourcemap']
     },
 
-    webpack: require('../webpack.config'),
+    webpack: require('../webpack.config')(),
 
     coverageReporter: {
       reporters: [{

test/unit/app.spec.ts

@@ -1,8 +1,16 @@
 import '../lib/setup';
 import { App } from '../../src/app/app';
+import { I18N } from 'aurelia-i18n';
+import {BindingSignaler} from 'aurelia-templating-resources';
+import {EventAggregator} from 'aurelia-event-aggregator';
+import EnglishTranslation from '../../src/locales/en.json';
+import AppConfig from '../../src/app/app-config';
 
 class RouterStub {
 	public routes;
+	public options = {
+    pushState: undefined
+  };
 
 	public configure(handler): void {
 		handler(this);
@@ -19,7 +27,21 @@ describe('the App module', () => {
 
 	beforeEach(() => {
 		mockedRouter = new RouterStub();
-		sut = new App();
+
+		// Translation setup
+    sut = new I18N(new EventAggregator(), new BindingSignaler());
+    sut.setup({
+      resources: {
+        en: {
+					translation: EnglishTranslation
+				}
+      },
+      lng: 'en',
+      fallbackLng: 'en',
+      debug: false
+    });
+
+		sut = new App(sut, AppConfig);
 		sut.configureRouter(mockedRouter, mockedRouter);
 	});
 
@@ -28,7 +50,7 @@ describe('the App module', () => {
 	});
 
 	it('configures the router title', () => {
-		expect(sut.router.title).toEqual('Aurelia');
+		expect(sut.router.title).toEqual('Transaltion Title');
 	});
 
 	it('should have a welcome route', () => {

typings_custom/app-config.d.ts

@@ -6,7 +6,9 @@ declare namespace AppConfig {
 
 	export interface IAppConfig {
 		NAME: string;
-		VERSION: string;
-		CONFIG: IAppConfigEnv;
+    VERSION: string;
+    ENV: string;
+    PLATFORM: string;
+    CONFIG: IAppConfigEnv;
 	}
 }

webpack.config.js

@@ -15,7 +15,7 @@ module.exports = function (envArguments) {
   const ENV = process.env.NODE_ENV && process.env.NODE_ENV.toLowerCase() || 'development';
   const pkg = require(path.join(process.cwd(), 'package.json'));
   let PLATFORM = 'web';
-  let TARGET = 'development';
+  let TARGET = ENV;
   if (envArguments) {
     PLATFORM = envArguments.platform || PLATFORM;
     TARGET = envArguments.target || TARGET;