mirror of https://github.com/vector-im/riot-web
Fix test for npm 3
npm 3 puts files in slightly saner places, so we have to look for the gemini css in two placespull/21833/head
parent
51fe77122b
commit
ae1220a6a4
|
@ -1,6 +1,7 @@
|
||||||
// karma.conf.js - the config file for karma, which runs our tests.
|
// karma.conf.js - the config file for karma, which runs our tests.
|
||||||
|
|
||||||
var path = require('path');
|
var path = require('path');
|
||||||
|
var fs = require('fs');
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We use webpack to build our tests. It's a pain to have to wait for webpack
|
* We use webpack to build our tests. It's a pain to have to wait for webpack
|
||||||
|
@ -17,6 +18,21 @@ var path = require('path');
|
||||||
|
|
||||||
process.env.PHANTOMJS_BIN = 'node_modules/.bin/phantomjs';
|
process.env.PHANTOMJS_BIN = 'node_modules/.bin/phantomjs';
|
||||||
|
|
||||||
|
function fileExists(name) {
|
||||||
|
try {
|
||||||
|
fs.statSync(gsCss);
|
||||||
|
return true;
|
||||||
|
} catch (e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// try find the gemini-scrollbar css in an npm-version-agnostic way
|
||||||
|
var gsCss = 'node_modules/gemini-scrollbar/gemini-scrollbar.css';
|
||||||
|
if (!fileExists(gsCss)) {
|
||||||
|
gsCss = 'node_modules/react-gemini-scrollbar/'+gsCss;
|
||||||
|
}
|
||||||
|
|
||||||
module.exports = function (config) {
|
module.exports = function (config) {
|
||||||
config.set({
|
config.set({
|
||||||
// frameworks to use
|
// frameworks to use
|
||||||
|
@ -26,9 +42,7 @@ module.exports = function (config) {
|
||||||
// list of files / patterns to load in the browser
|
// list of files / patterns to load in the browser
|
||||||
files: [
|
files: [
|
||||||
'test/tests.js',
|
'test/tests.js',
|
||||||
|
gsCss,
|
||||||
// XXX this will break on npm 3
|
|
||||||
'node_modules/react-gemini-scrollbar/node_modules/gemini-scrollbar/gemini-scrollbar.css',
|
|
||||||
],
|
],
|
||||||
|
|
||||||
// list of files to exclude
|
// list of files to exclude
|
||||||
|
|
Loading…
Reference in New Issue