Commit 0c6e4b4c authored by Winnie Hellmann's avatar Winnie Hellmann

Resolve differences in Karma test bundle between CE and EE

parent 1715622c
...@@ -122,19 +122,25 @@ afterEach(() => { ...@@ -122,19 +122,25 @@ afterEach(() => {
const axiosDefaultAdapter = getDefaultAdapter(); const axiosDefaultAdapter = getDefaultAdapter();
// render all of our tests // render all of our tests
const testsContext = require.context('.', true, /_spec$/); const testContexts = [
testsContext.keys().forEach(function(path) { require.context('spec', true, /_spec$/),
try { require.context('ee_spec', true, /_spec$/),
testsContext(path); ];
} catch (err) {
console.log(err); testContexts.forEach(context => {
console.error('[GL SPEC RUNNER ERROR] Unable to load spec: ', path); context.keys().forEach(path => {
describe('Test bundle', function() { try {
it(`includes '${path}'`, function() { context(path);
expect(err).toBeNull(); } catch (err) {
console.log(err);
console.error('[GL SPEC RUNNER ERROR] Unable to load spec: ', path);
describe('Test bundle', function() {
it(`includes '${path}'`, function() {
expect(err).toBeNull();
});
}); });
}); }
} });
}); });
describe('test errors', () => { describe('test errors', () => {
...@@ -204,24 +210,33 @@ if (process.env.BABEL_ENV === 'coverage') { ...@@ -204,24 +210,33 @@ if (process.env.BABEL_ENV === 'coverage') {
]; ];
describe('Uncovered files', function() { describe('Uncovered files', function() {
const sourceFiles = require.context('~', true, /\.(js|vue)$/); const sourceFilesContexts = [
require.context('~', true, /\.(js|vue)$/),
require.context('ee', true, /\.(js|vue)$/),
];
const allTestFiles = testContexts.reduce(
(accumulator, context) => accumulator.concat(context.keys()),
[],
);
$.holdReady(true); $.holdReady(true);
sourceFiles.keys().forEach(function(path) { sourceFilesContexts.forEach(context => {
// ignore if there is a matching spec file context.keys().forEach(path => {
if (testsContext.keys().indexOf(`${path.replace(/\.(js|vue)$/, '')}_spec`) > -1) { // ignore if there is a matching spec file
return; if (allTestFiles.indexOf(`${path.replace(/\.(js|vue)$/, '')}_spec`) > -1) {
} return;
it(`includes '${path}'`, function() {
try {
sourceFiles(path);
} catch (err) {
if (troubleMakers.indexOf(path) === -1) {
expect(err).toBeNull();
}
} }
it(`includes '${path}'`, function() {
try {
context(path);
} catch (err) {
if (troubleMakers.indexOf(path) === -1) {
expect(err).toBeNull();
}
}
});
}); });
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment