Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-06-24 18:27:39 +0400
committerVincent Petry <pvince81@owncloud.com>2014-06-24 18:32:18 +0400
commita7e7e86df0f8494de253e2d81e1fae13be2c138c (patch)
tree96e6b3c6a5ac446284828b29dd714076bd45406b /tests/karma.config.js
parent8c8209828126a55b9bf775e00cbc14d7ef7db5ae (diff)
Test runner now loads CSS and hides testArea
- serve CSS and font files properly to make sure that measurements are correct for the tests that need them (breadcrumb) - added opacity to testArea to make sure nothing is visible during testing
Diffstat (limited to 'tests/karma.config.js')
-rw-r--r--tests/karma.config.js18
1 files changed, 12 insertions, 6 deletions
diff --git a/tests/karma.config.js b/tests/karma.config.js
index 290790686b0..14a0d7e8464 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -110,15 +110,16 @@ module.exports = function(config) {
// core mocks
files.push(corePath + 'tests/specHelper.js');
+ var srcFile, i;
// add core library files
- for ( var i = 0; i < coreModule.libraries.length; i++ ) {
- var srcFile = corePath + coreModule.libraries[i];
+ for ( i = 0; i < coreModule.libraries.length; i++ ) {
+ srcFile = corePath + coreModule.libraries[i];
files.push(srcFile);
}
// add core modules files
- for ( var i = 0; i < coreModule.modules.length; i++ ) {
- var srcFile = corePath + coreModule.modules[i];
+ for ( i = 0; i < coreModule.modules.length; i++ ) {
+ srcFile = corePath + coreModule.modules[i];
files.push(srcFile);
if (enableCoverage) {
preprocessors[srcFile] = 'coverage';
@@ -155,12 +156,15 @@ module.exports = function(config) {
}
// add source files for apps to test
- for ( var i = 0; i < appsToTest.length; i++ ) {
+ for ( i = 0; i < appsToTest.length; i++ ) {
addApp(appsToTest[i]);
}
// serve images to avoid warnings
files.push({pattern: 'core/img/**/*', watched: false, included: false, served: true});
+
+ // include core CSS
+ files.push({pattern: 'core/css/*.css', watched: true, included: true, served: true});
config.set({
@@ -180,7 +184,9 @@ module.exports = function(config) {
proxies: {
// prevent warnings for images
- '/context.html//core/img/': 'http://localhost:9876/base/core/img/'
+ '/context.html//core/img/': 'http://localhost:9876/base/core/img/',
+ '/context.html//core/css/': 'http://localhost:9876/base/core/css/',
+ '/context.html//core/fonts/': 'http://localhost:9876/base/core/fonts/'
},
// test results reporter to use