Skip to content
Snippets Groups Projects
Commit 426b0797 authored by Tim Zallmann's avatar Tim Zallmann
Browse files

Merge branch 'winh-raise-karma-timeout' into 'master'

Raise timeout for Karma tests to 2 seconds

See merge request gitlab-org/gitlab-ce!20963
parents 91040069 0abae9ee
No related branches found
No related tags found
1 merge request!10495Merge Requests - Assignee
Loading
Loading
@@ -98,7 +98,7 @@ let longRunningTestTimeoutHandle;
beforeEach((done) => {
longRunningTestTimeoutHandle = setTimeout(() => {
done.fail('Test is running too long!');
}, 1000);
}, 2000);
done();
});
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment