Merge pull request #21 from Gregcop1/hotfix/travis

fix: tests and build

Author: Gregcop1

.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

.travis.yml

@@ -13,9 +13,7 @@ install:
 - npm install
 
 script:
-- ng build
-- ng test
+- ng test --watch false
 
-branches:
-  only:
-    - master
+after_script:
+- cat coverage/lcov.info | node_modules/coveralls/bin/coveralls.js

README.md

@@ -0,0 +1,9 @@
+Hm-admin
+-----------
+
+[![Build Status](https://travis-ci.org/coopTilleuls/hm-admin.svg?branch=master)](https://travis-ci.org/coopTilleuls/hm-admin)
+[![Coverage Status](https://coveralls.io/repos/github/coopTilleuls/hm-admin/badge.svg?branch=master)](https://coveralls.io/github/coopTilleuls/hm-admin?branch=master)
+[![Issue Count](https://codeclimate.com/github/coopTilleuls/hm-admin/badges/issue_count.svg)](https://codeclimate.com/github/coopTilleuls/hm-admin)
+
+
+

angular-cli.json

@@ -4,7 +4,7 @@
     "name": "hm-admin"
   },
   "apps": [
-    {"main": "src/main.ts", "tsconfig": "src/tsconfig.json"}
+    {"main": "src/app/hm-admin/hm-admin.component.ts", "tsconfig": "src/tsconfig.json"}
   ],
   "addons": [],
   "packages": [],

config/karma-test-shim.js

@@ -48,4 +48,4 @@ System.import('system-config.js').then(function() {
     allSpecFiles.map(function (moduleName) {
       return System.import(moduleName);
     }));
-}).then(__karma__.start, __karma__.error);
+}).then(__karma__.start, __karma__.error);

config/karma.conf.js

@@ -1,42 +1,59 @@
-module.exports = function (config) {
-  config.set({
-    basePath: '..',
-    frameworks: ['jasmine'],
-    plugins: [
-      require('karma-jasmine'),
-      require('karma-chrome-launcher')
-    ],
-    customLaunchers: {
-      // chrome setup for travis CI using chromium
-      Chrome_travis_ci: {
-        base: 'Chrome',
-        flags: ['--no-sandbox']
-      }
-    },
-    files: [
-      { pattern: 'dist/vendor/es6-shim/es6-shim.js', included: true, watched: false },
-      { pattern: 'dist/vendor/zone.js/dist/zone.js', included: true, watched: false },
-      { pattern: 'dist/vendor/reflect-metadata/Reflect.js', included: true, watched: false },
-      { pattern: 'dist/vendor/systemjs/dist/system-polyfills.js', included: true, watched: false },
-      { pattern: 'dist/vendor/systemjs/dist/system.src.js', included: true, watched: false },
-      { pattern: 'dist/vendor/zone.js/dist/async-test.js', included: true, watched: false },
+var configuration = {
+  basePath: '..',
+  frameworks: ['jasmine'],
+  plugins: [
+    require('karma-jasmine'),
+    require('karma-coverage'),
+    require('karma-chrome-launcher'),
+  ],
+  customLaunchers: {
+    // chrome setup for travis CI using chromium
+    Chrome_travis_ci: {
+      base: 'Chrome',
+      flags: ['--no-sandbox']
+    }
+  },
+  files: [
+    { pattern: 'dist/vendor/es6-shim/es6-shim.js', included: true, watched: false },
+    { pattern: 'dist/vendor/zone.js/dist/zone.js', included: true, watched: false },
+    { pattern: 'dist/vendor/reflect-metadata/Reflect.js', included: true, watched: false },
+    { pattern: 'dist/vendor/systemjs/dist/system-polyfills.js', included: true, watched: false },
+    { pattern: 'dist/vendor/systemjs/dist/system.src.js', included: true, watched: false },
+    { pattern: 'dist/vendor/zone.js/dist/async-test.js', included: true, watched: false },
+
+    { pattern: 'config/karma-test-shim.js', included: true, watched: true },
+
+    // Distribution folder.
+    { pattern: 'dist/**/*', included: false, watched: true }
+  ],
+  exclude: [
+    // Vendor packages might include spec files. We don't want to use those.
+    'dist/vendor/**/*.spec.js'
+  ],
+  preprocessors: {
+    'dist/app/**/!(*spec|*mock).js': ['coverage']
+  },
+  reporters: ['progress', 'coverage'],
+  port: 9876,
+  colors: true,
+  autoWatch: true,
+  browsers: ['Chrome'],
+  singleRun: false,
+  
+  coverageReporter: {
+    type: 'lcov',
+    dir: 'coverage/',
+    subdir: '.',
+    file: 'lcov.info'
+  },
+};
+
+if (process.env.TRAVIS) {
+  configuration.browsers = ['Chrome_travis_ci'];
+}
 
-      { pattern: 'config/karma-test-shim.js', included: true, watched: true },
+module.exports = function (config) {
+  configuration.logLevel = config.LOG_INFO;
 
-      // Distribution folder.
-      { pattern: 'dist/**/*', included: false, watched: true }
-    ],
-    exclude: [
-      // Vendor packages might include spec files. We don't want to use those.
-      'dist/vendor/**/*.spec.js'
-    ],
-    preprocessors: {},
-    reporters: ['progress'],
-    port: 9876,
-    colors: true,
-    logLevel: config.LOG_INFO,
-    autoWatch: true,
-    browsers: ['Chrome'],
-    singleRun: false
-  });
+  config.set(configuration);
 };

package.json

@@ -36,11 +36,13 @@
     "@angular/common": "2.0.0-rc.1",
     "@angular/compiler": "2.0.0-rc.1",
     "@angular/core": "2.0.0-rc.1",
+    "@angular/http": "2.0.0-rc.1",
     "@angular/platform-browser": "2.0.0-rc.1",
     "@angular/platform-browser-dynamic": "2.0.0-rc.1",
     "@angular/router": "2.0.0-rc.1",
-    "@angular/http": "2.0.0-rc.1",
+    "coveralls": "^2.11.9",
     "es6-shim": "^0.35.0",
+    "karma-coverage": "^1.0.0",
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
     "systemjs": "0.19.26",

src/exemples/admin/admin.ts renamed to src/app/exemples/admin/admin.ts

@@ -1,7 +1,7 @@
 import {Component} from '@angular/core';
 import {bootstrap} from '@angular/platform-browser-dynamic';
-import {HmAdminComponent} from '../../hm-admin/hm-admin.component';
 import configuration from './configuration';
+import {HmAdminComponent} from '../../hm-admin/hm-admin.component';
 
 @Component({
   selector: 'app',