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
Léo-Paul Géneau
gitlab-ce
Commits
835733a0
Commit
835733a0
authored
Sep 14, 2018
by
Lukas Eipert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix karma junit reports on CI
parent
18b99cca
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
config/karma.config.js
config/karma.config.js
+1
-1
spec/javascripts/test_bundle.js
spec/javascripts/test_bundle.js
+2
-3
No files found.
config/karma.config.js
View file @
835733a0
...
@@ -84,7 +84,7 @@ module.exports = function(config) {
...
@@ -84,7 +84,7 @@ module.exports = function(config) {
basePath
:
ROOT_PATH
,
basePath
:
ROOT_PATH
,
browsers
:
[
'
ChromeHeadlessCustom
'
],
browsers
:
[
'
ChromeHeadlessCustom
'
],
client
:
{
client
:
{
isCI
:
!
!
process
.
env
.
CI
color
:
!
process
.
env
.
CI
},
},
customLaunchers
:
{
customLaunchers
:
{
ChromeHeadlessCustom
:
{
ChromeHeadlessCustom
:
{
...
...
spec/javascripts/test_bundle.js
View file @
835733a0
/* eslint-disable
/* eslint-disable
jasmine/no-global-setup, jasmine/no-unsafe-spy, no-underscore-dangle, no-console
jasmine/no-global-setup, jasmine/no-unsafe-spy, no-underscore-dangle, no-console
*/
*/
/* global __karma__ */
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
'
vendor/jasmine-jquery
'
;
import
'
vendor/jasmine-jquery
'
;
...
@@ -42,8 +41,8 @@ jasmine.getJSONFixtures().fixturesPath = FIXTURES_PATH;
...
@@ -42,8 +41,8 @@ jasmine.getJSONFixtures().fixturesPath = FIXTURES_PATH;
beforeAll
(()
=>
{
beforeAll
(()
=>
{
jasmine
.
addMatchers
(
jasmine
.
addMatchers
(
jasmineDiff
(
jasmine
,
{
jasmineDiff
(
jasmine
,
{
colors
:
!
__karma__
.
config
.
isCi
,
colors
:
window
.
__karma__
.
config
.
color
,
inline
:
!
__karma__
.
config
.
isCi
,
inline
:
window
.
__karma__
.
config
.
color
,
}),
}),
);
);
jasmine
.
addMatchers
(
customMatchers
);
jasmine
.
addMatchers
(
customMatchers
);
...
...
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