Commit dc31edfb authored by Tim Zallmann's avatar Tim Zallmann

Merge branch 'winh-fail-slow-karma-tests' into 'master'

Fail Karma tests that take longer than a second

Closes #44174

See merge request gitlab-org/gitlab-ce!20518
parents c495f8c1 d8edaf28
...@@ -91,6 +91,19 @@ beforeEach(() => { ...@@ -91,6 +91,19 @@ beforeEach(() => {
Vue.http.interceptors = builtinVueHttpInterceptors.slice(); Vue.http.interceptors = builtinVueHttpInterceptors.slice();
}); });
let longRunningTestTimeoutHandle;
beforeEach((done) => {
longRunningTestTimeoutHandle = setTimeout(() => {
done.fail('Test is running too long!');
}, 1000);
done();
});
afterEach(() => {
clearTimeout(longRunningTestTimeoutHandle);
});
const axiosDefaultAdapter = getDefaultAdapter(); const axiosDefaultAdapter = getDefaultAdapter();
// render all of our tests // render all of our tests
......
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