summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-10-04 11:20:06 +0200
committerTim Zallmann <tzallmann@gitlab.com>2017-10-04 17:27:56 +0200
commit0a671c8223d7fab14acdb40d30a7a74696885d75 (patch)
tree5f72616c87647c4762adffe3389c33aec102aedc
parent5c07687b3eedfc4200c9b3fcdffbc79026c285db (diff)
downloadgitlab-ce-0a671c8223d7fab14acdb40d30a7a74696885d75.tar.gz
Fixes the unhandled promise rejection
-rw-r--r--spec/javascripts/repo/components/repo_sidebar_spec.js2
-rw-r--r--spec/javascripts/vue_mr_widget/services/mr_widget_service_spec.js1
2 files changed, 3 insertions, 0 deletions
diff --git a/spec/javascripts/repo/components/repo_sidebar_spec.js b/spec/javascripts/repo/components/repo_sidebar_spec.js
index 5a81c6e611f..bcc03ed743d 100644
--- a/spec/javascripts/repo/components/repo_sidebar_spec.js
+++ b/spec/javascripts/repo/components/repo_sidebar_spec.js
@@ -161,6 +161,8 @@ describe('RepoSidebar', () => {
window.dispatchEvent(popEvent);
expect(Helper.getContent.calls.mostRecent().args[0].url).toContain(file1.url);
+
+ window.history.pushState({}, null, '/');
});
});
});
diff --git a/spec/javascripts/vue_mr_widget/services/mr_widget_service_spec.js b/spec/javascripts/vue_mr_widget/services/mr_widget_service_spec.js
index b63633c03b8..e667b4b3677 100644
--- a/spec/javascripts/vue_mr_widget/services/mr_widget_service_spec.js
+++ b/spec/javascripts/vue_mr_widget/services/mr_widget_service_spec.js
@@ -31,6 +31,7 @@ describe('MRWidgetService', () => {
});
it('should have methods defined', () => {
+ window.history.pushState({}, null, '/');
const service = new MRWidgetService(mr);
expect(service.merge()).toBeDefined();