Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
4043c35a
Commit
4043c35a
authored
Mar 13, 2019
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve differences in Karma config between CE and EE
parent
ef9b6012
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
15 deletions
+19
-15
config/karma.config.js
config/karma.config.js
+19
-15
No files found.
config/karma.config.js
View file @
4043c35a
...
@@ -6,6 +6,7 @@ const argumentsParser = require('commander');
...
@@ -6,6 +6,7 @@ const argumentsParser = require('commander');
const
webpackConfig
=
require
(
'
./webpack.config.js
'
);
const
webpackConfig
=
require
(
'
./webpack.config.js
'
);
const
ROOT_PATH
=
path
.
resolve
(
__dirname
,
'
..
'
);
const
ROOT_PATH
=
path
.
resolve
(
__dirname
,
'
..
'
);
const
SPECS_PATH
=
/^
(?:\.[\\\/])?(
ee
[\\\/])?
spec
[\\\/]
javascripts
[\\\/]
/
;
function
fatalError
(
message
)
{
function
fatalError
(
message
)
{
console
.
error
(
chalk
.
red
(
`\nError:
${
message
}
\n`
));
console
.
error
(
chalk
.
red
(
`\nError:
${
message
}
\n`
));
...
@@ -41,9 +42,19 @@ const specFilters = argumentsParser
...
@@ -41,9 +42,19 @@ const specFilters = argumentsParser
)
)
.
parse
(
process
.
argv
).
filterSpec
;
.
parse
(
process
.
argv
).
filterSpec
;
if
(
specFilters
.
length
)
{
const
createContext
=
(
specFiles
,
regex
,
suffix
)
=>
{
const
specsPath
=
/^
(?:\.[\\\/])?
spec
[\\\/]
javascripts
[\\\/]
/
;
const
newContext
=
specFiles
.
reduce
((
context
,
file
)
=>
{
const
relativePath
=
file
.
replace
(
SPECS_PATH
,
''
);
context
[
file
]
=
`./
${
relativePath
}
`
;
return
context
;
},
{});
webpackConfig
.
plugins
.
push
(
new
webpack
.
ContextReplacementPlugin
(
regex
,
path
.
join
(
ROOT_PATH
,
suffix
),
newContext
),
);
};
if
(
specFilters
.
length
)
{
// resolve filters
// resolve filters
let
filteredSpecFiles
=
specFilters
.
map
(
filter
=>
let
filteredSpecFiles
=
specFilters
.
map
(
filter
=>
glob
glob
...
@@ -64,23 +75,15 @@ if (specFilters.length) {
...
@@ -64,23 +75,15 @@ if (specFilters.length) {
fatalError
(
'
Your filter did not match any test files.
'
);
fatalError
(
'
Your filter did not match any test files.
'
);
}
}
if
(
!
filteredSpecFiles
.
every
(
file
=>
specsPath
.
test
(
file
)))
{
if
(
!
filteredSpecFiles
.
every
(
file
=>
SPECS_PATH
.
test
(
file
)))
{
fatalError
(
'
Test files must be located within /spec/javascripts.
'
);
fatalError
(
'
Test files must be located within /spec/javascripts.
'
);
}
}
const
newContext
=
filteredSpecFiles
.
reduce
((
context
,
file
)
=>
{
const
CE_FILES
=
filteredSpecFiles
.
filter
(
file
=>
!
file
.
startsWith
(
'
ee
'
));
const
relativePath
=
file
.
replace
(
specsPath
,
''
);
createContext
(
CE_FILES
,
/
[^
e
]{2}[\\\/]
spec
[\\\/]
javascripts$/
,
'
spec/javascripts
'
);
context
[
file
]
=
`./
${
relativePath
}
`
;
return
context
;
},
{});
webpackConfig
.
plugins
.
push
(
const
EE_FILES
=
filteredSpecFiles
.
filter
(
file
=>
file
.
startsWith
(
'
ee
'
));
new
webpack
.
ContextReplacementPlugin
(
createContext
(
EE_FILES
,
/ee
[\\\/]
spec
[\\\/]
javascripts$/
,
'
ee/spec/javascripts
'
);
/spec
[\\\/]
javascripts$/
,
path
.
join
(
ROOT_PATH
,
'
spec/javascripts
'
),
newContext
,
),
);
}
}
// Karma configuration
// Karma configuration
...
@@ -111,6 +114,7 @@ module.exports = function(config) {
...
@@ -111,6 +114,7 @@ module.exports = function(config) {
],
],
preprocessors
:
{
preprocessors
:
{
'
spec/javascripts/**/*.js
'
:
[
'
webpack
'
,
'
sourcemap
'
],
'
spec/javascripts/**/*.js
'
:
[
'
webpack
'
,
'
sourcemap
'
],
'
ee/spec/javascripts/**/*.js
'
:
[
'
webpack
'
,
'
sourcemap
'
],
},
},
reporters
:
[
'
mocha
'
],
reporters
:
[
'
mocha
'
],
webpack
:
webpackConfig
,
webpack
:
webpackConfig
,
...
...
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