more tests

triskeljs · Nov 22, 2018 · 09b7ec3 · 09b7ec3
1 parent b8eebc6
commit 09b7ec3
Show file tree

Hide file tree

Showing 9 changed files with 979 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -17,7 +17,8 @@ eslint:
 
 build:
 	# $(shell npm bin)/rollup app.js --output.format cjs --output.file dist/app.cjs.js
-	$(shell npm bin)/rollup app.js --output.format umd --output.file dist/app.umd.js -n APP -c rollup.config.js
+	# $(shell npm bin)/rollup app.js --output.format umd --output.file dist/app.umd.js -n APP -c rollup.config.js
+	$(shell npm bin)/rollup tests/_karma-wrapper.js --output.format iife --output.file tests/_karma-app.js -c rollup.config.js
 
 test: install eslint build
 	$(shell npm bin)/karma start karma.conf.js

diff --git a/karma.conf.js b/karma.conf.js
@@ -15,9 +15,9 @@ module.exports = function(config) {
       'karma-mocha-reporter',
     ],
     files: [
-      'dist/app.umd.js',
-      'tests/_expose-render-nodes.js',
+      'tests/_karma-app.js',
       'tests/{,**/}*-tests.js',
+      'node_modules/@triskel/con-text/tests/{,**/}*-tests.js',
       'node_modules/@triskel/render/tests/{,**/}*-tests.js',
     ],
     // browsers: [ 'Chrome', 'Firefox' ],
@@ -34,7 +34,7 @@ module.exports = function(config) {
       // source files, that you wanna generate coverage for
       // do not include tests or libraries
       // (these files will be instrumented by Istanbul)
-      'dist/app.umd.js': ['coverage'],
+      'tests/_karma-app.js': ['coverage'],
     },
     coverageReporter: {
       type: 'lcov', // lcov or lcovonly are required for generating lcov.info files

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "rollup-plugin-node-resolve": "^3.4.0"
   },
   "dependencies": {
-    "@triskel/con-text": "1.0.13",
+    "@triskel/con-text": "1.0.21",
     "@triskel/render": "1.1.0"
   }
 }
diff --git a/tests/_expose-render-nodes.js b/tests/_expose-render-nodes.js