summaryrefslogtreecommitdiff
path: root/spec/frontend/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-19 12:09:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-19 12:09:26 +0000
commitfa6c2426a5beed14dd7cfd0b4c493ff7ec886837 (patch)
tree58238851ff949fafbc162e03610602df8c0924a2 /spec/frontend/lib
parent38de2aa494589f6e250a1b11862cbab83c2ae4d1 (diff)
downloadgitlab-ce-fa6c2426a5beed14dd7cfd0b4c493ff7ec886837.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/lib')
-rw-r--r--spec/frontend/lib/utils/common_utils_spec.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/frontend/lib/utils/common_utils_spec.js b/spec/frontend/lib/utils/common_utils_spec.js
index 09eb362c77e..a0282e838cd 100644
--- a/spec/frontend/lib/utils/common_utils_spec.js
+++ b/spec/frontend/lib/utils/common_utils_spec.js
@@ -220,6 +220,7 @@ describe('common_utils', () => {
beforeEach(() => {
elem = document.createElement('div');
window.innerHeight = windowHeight;
+ window.mrTabs = { currentAction: 'show' };
jest.spyOn($.fn, 'animate');
jest.spyOn($.fn, 'offset').mockReturnValue({ top: elemTop });
});