Merge ad62212 into b4d2cd2

geli-lms · Jul 12, 2019 · 91407d1 · 91407d1
2 parents b4d2cd2 + ad62212
commit 91407d1
Show file tree

Hide file tree

Showing 125 changed files with 773 additions and 4,013 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -81,6 +81,7 @@ jobs:
         - npm start &
         - cd ${TRAVIS_BUILD_DIR}/app/webFrontend
         - npm run lint
+        - npm run test
         - npm run e2e
         - npm run build
     - stage: deploy

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 -->
 
 ## [Unreleased]
+### Fixed
+- Karma test suite. [#655](https://github.com/geli-lms/geli/issues/655)
 
 ## [0.8.6] - 2019-05-07 - WS 18/19 🏁-Release
 ### Added

diff --git a/app/webFrontend/karma.conf.js b/app/webFrontend/karma.conf.js
@@ -13,13 +13,16 @@ module.exports = function (config) {
       require('@angular-devkit/build-angular/plugins/karma')
     ],
     client:{
-      clearContext: false // leave Jasmine Spec Runner output visible in browser
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
+      jasmine: {
+        random: false
+      }
     },
     coverageIstanbulReporter: {
       dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
       fixWebpackSourcePaths: true
     },
-    
+
     reporters: ['progress', 'kjhtml'],
     port: 9876,
     colors: true,