Skip to content

Commit

Permalink
Merge pull request #124 from amenadiel/passing_tests
Browse files Browse the repository at this point in the history
Waits for google to load, so as to pass karma tests
  • Loading branch information
arthur-e authored Feb 26, 2018
2 parents 13a7cdd + a189618 commit ab38c17
Show file tree
Hide file tree
Showing 3 changed files with 137 additions and 105 deletions.
47 changes: 28 additions & 19 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
module.exports = function (config) {
config.set({
basePath: '',
port: 9877,
colors: true,
logLevel: 'INFO',
autoWatch: false,
browsers: ['PhantomJS'],
singleRun: true,
frameworks: ['jasmine'],
reporters: ['mocha'],
files: [
'https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=geometry',
'wicket.js',
'wicket-gmap3.js',
'tests/wicket-gmap3-spec.js'
]
});
};
module.exports = function(config) {
config.set({
basePath: '',
port: 9877,
colors: true,
logLevel: 'INFO',
autoWatch: false,
browsers: ['PhantomJS'],
phantomjsLauncher: {
// Have phantomjs exit if a ResourceError is encountered (useful if karma exits without killing phantom)
exitOnResourceError: false,
flags: [
'--web-security=false',
'--load-images=false',
'--ignore-ssl-errors=true'
]
},
singleRun: true,
frameworks: ['jasmine'],
reporters: ['mocha'],
files: [
'https://maps.googleapis.com/maps/api/js?v=3.31&libraries=geometry',
'wicket.js',
'wicket-gmap3.js',
'tests/wicket-gmap3-spec.js'
]
});
};
Loading

0 comments on commit ab38c17

Please sign in to comment.