BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
fdf0741c
Commit
fdf0741c
authored
Feb 16, 2017
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'instrument-in-karma' into 'master'
Move babel config for instanbul to karma config See merge request !9286
parents
0135935c
038ed9ad
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
1 deletion
+15
-1
instrument-in-karma.yml
changelogs/unreleased/instrument-in-karma.yml
+4
-0
karma.config.js
config/karma.config.js
+11
-0
webpack.config.js
config/webpack.config.js
+0
-1
No files found.
changelogs/unreleased/instrument-in-karma.yml
0 → 100644
View file @
fdf0741c
---
title
:
Move babel config for instanbul to karma config
merge_request
:
9286
author
:
winniehell
config/karma.config.js
View file @
fdf0741c
...
...
@@ -2,6 +2,17 @@ var path = require('path');
var
webpackConfig
=
require
(
'./webpack.config.js'
);
var
ROOT_PATH
=
path
.
resolve
(
__dirname
,
'..'
);
// add coverage instrumentation to babel config
if
(
webpackConfig
&&
webpackConfig
.
module
&&
webpackConfig
.
module
.
rules
)
{
var
babelConfig
=
webpackConfig
.
module
.
rules
.
find
(
function
(
rule
)
{
return
rule
.
loader
===
'babel-loader'
;
});
babelConfig
.
options
=
babelConfig
.
options
||
{};
babelConfig
.
options
.
plugins
=
babelConfig
.
options
.
plugins
||
[];
babelConfig
.
options
.
plugins
.
push
(
'istanbul'
);
}
// Karma configuration
module
.
exports
=
function
(
config
)
{
var
progressReporter
=
process
.
env
.
CI
?
'mocha'
:
'progress'
;
...
...
config/webpack.config.js
View file @
fdf0741c
...
...
@@ -55,7 +55,6 @@ var config = {
exclude
:
/
(
node_modules|vendor
\/
assets
)
/
,
loader
:
'babel-loader'
,
options
:
{
plugins
:
IS_PRODUCTION
?
[]
:
[
'istanbul'
],
presets
:
[
[
"es2015"
,
{
"modules"
:
false
}],
'stage-2'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment