Skip to content

Commit

Permalink
Merge pull request #137 from lazaromenezes/karma-setup
Browse files Browse the repository at this point in the history
Using karma custom template properties to override HTMLs
  • Loading branch information
lathonez authored Aug 27, 2016
2 parents bb3a749 + 32a45fa commit c25782c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"build": "gulp --gulpfile test/gulpfile.ts --cwd ./ build-app",
"e2e": "gulp --gulpfile test/gulpfile.ts --cwd ./ build-e2e && protractor test/protractor.conf.js",
"karma": "gulp --gulpfile test/gulpfile.ts --cwd ./ karma-debug",
"postinstall": "ionic state restore && typings install && webdriver-manager update && cp test/karma-static/*.html node_modules/karma/static",
"postinstall": "ionic state restore && typings install && webdriver-manager update",
"start": "ionic serve",
"test": "gulp --gulpfile test/gulpfile.ts --cwd ./ unit-test"
},
Expand Down
7 changes: 6 additions & 1 deletion test/karma.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,12 @@ module.exports = function(config) {

// https://github.com/lathonez/clicker/issues/82
// try increasing this value if you see the error "Disconnected (1 times), because no message in 30000 ms."
browserNoActivityTimeout: 30000
browserNoActivityTimeout: 30000,

customContextFile: "test/karma-static/context.html",

customDebugFile: "test/karma-static/debug.html",

});

if (process.env.TRAVIS || process.env.CIRCLECI) {
Expand Down

0 comments on commit c25782c

Please sign in to comment.