Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
f7133089
Commit
f7133089
authored
Jun 20, 2016
by
Andy Armstrong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't auto-update during Karma test runs
parent
5e4ce786
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
8 deletions
+18
-8
common/static/common/js/karma.common.conf.js
+18
-8
No files found.
common/static/common/js/karma.common.conf.js
View file @
f7133089
...
...
@@ -172,7 +172,7 @@ var defaultNormalizeFunc = function (appRoot, pattern) {
pattern
=
path
.
join
(
appRoot
,
'/common/static/'
+
pattern
);
}
else
if
(
pattern
.
match
(
/^xmodule_js
\/
common_static/
))
{
pattern
=
path
.
join
(
appRoot
,
'/common/static/'
+
pattern
.
replace
(
/^xmodule_js
\/
common_static
\/
/
,
''
));
pattern
.
replace
(
/^xmodule_js
\/
common_static
\/
/
,
''
));
}
return
pattern
;
};
...
...
@@ -183,7 +183,7 @@ var normalizePathsForCoverage = function(files, normalizeFunc) {
files
.
forEach
(
function
(
file
)
{
if
(
!
file
.
ignoreCoverage
)
{
filesForCoverage
[
normalizeFn
(
appRoot
,
file
.
pattern
)]
=
[
'coverage'
];
filesForCoverage
[
normalizeFn
(
appRoot
,
file
.
pattern
)]
=
[
'coverage'
];
}
});
...
...
@@ -325,8 +325,18 @@ var getBaseConfig = function (config, useRequireJs) {
// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
browsers
:
[
'Firefox'
],
browsers
:
[
'FirefoxNoUpdates'
],
customLaunchers
:
{
// Firefox configuration that doesn't perform auto-updates
FirefoxNoUpdates
:
{
base
:
'Firefox'
,
prefs
:
{
'app.update.auto'
:
false
,
'app.update.enabled'
:
false
}
}
},
// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
...
...
@@ -366,7 +376,7 @@ var configure = function(config, options) {
);
if
(
useRequireJs
)
{
files
.
unshift
({
pattern
:
'common/js/utils/require-serial.js'
,
included
:
true
});
files
.
unshift
({
pattern
:
'common/js/utils/require-serial.js'
,
included
:
true
});
}
// Karma sets included=true by default.
...
...
@@ -388,9 +398,9 @@ var configure = function(config, options) {
// If we give symlink paths to Istanbul, coverage for each path gets tracked
// separately. So we pass absolute paths to the karma-coverage preprocessor.
var
preprocessors
=
_
.
extend
(
{},
options
.
preprocessors
,
normalizePathsForCoverage
(
filesForCoverage
,
options
.
normalizePathsForCoverageFunc
)
{},
options
.
preprocessors
,
normalizePathsForCoverage
(
filesForCoverage
,
options
.
normalizePathsForCoverageFunc
)
);
config
.
set
(
_
.
extend
(
baseConfig
,
{
...
...
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