projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #9473 from civicrm/4.7.14-rc
[civicrm-core.git]
/
karma.conf.js
diff --git
a/karma.conf.js
b/karma.conf.js
index b04979c74437691c26af68d838772ac56cae603b..eada18ded519964e83d60c5e5d179d07534fd613 100644
(file)
--- a/
karma.conf.js
+++ b/
karma.conf.js
@@
-1,18
+1,7
@@
module.exports = function(config) {
config.set({
autoWatch: true,
module.exports = function(config) {
config.set({
autoWatch: true,
- browsers: ['PhantomJS', 'PhantomJS_custom'],
- customLaunchers: {
- 'PhantomJS_custom': {
- base: 'PhantomJS',
- options: {
- windowName: 'my-window',
- settings: {
- webSecurityEnabled: false
- }
- }
- }
- },
+ browsers: ['PhantomJS'],
exclude: [
],
files: [
exclude: [
],
files: [