summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-02-04 13:52:15 +0100
committerWinnie Hellmann <winnie@gitlab.com>2019-02-19 14:28:04 +0100
commit9a3fa5cb0b400665132427b55441f8f623c0d26e (patch)
tree318fb457bbc0b725783bb98b0d434a59e1827c36
parent028aa8110473dafd5a59b9649abab6695d65665d (diff)
downloadgitlab-ce-winh-upgrade-vue-test-utils.tar.gz
Remove custom Vue error handler from test bundlewinh-upgrade-vue-test-utils
-rw-r--r--spec/javascripts/test_bundle.js12
1 files changed, 1 insertions, 11 deletions
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js
index b2b0a50911d..2f9dd83a1c2 100644
--- a/spec/javascripts/test_bundle.js
+++ b/spec/javascripts/test_bundle.js
@@ -35,12 +35,6 @@ Vue.config.warnHandler = (msg, vm, trace) => {
fail(`${msg}${trace}`);
};
-let hasVueErrors = false;
-Vue.config.errorHandler = function(err) {
- hasVueErrors = true;
- fail(err);
-};
-
Vue.use(VueResource);
Vue.use(Translate);
@@ -136,7 +130,7 @@ testsContext.keys().forEach(function(path) {
describe('test errors', () => {
beforeAll(done => {
- if (hasUnhandledPromiseRejections || hasVueWarnings || hasVueErrors) {
+ if (hasUnhandledPromiseRejections || hasVueWarnings) {
setTimeout(done, 1000);
} else {
done();
@@ -151,10 +145,6 @@ describe('test errors', () => {
expect(hasVueWarnings).toBe(false);
});
- it('has no Vue error', () => {
- expect(hasVueErrors).toBe(false);
- });
-
it('restores axios adapter after mocking', () => {
if (getDefaultAdapter() !== axiosDefaultAdapter) {
fail('axios adapter is not restored! Did you forget a restore() on MockAdapter?');