diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-12-12 22:49:10 +0100 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-12-12 22:49:45 +0100 |
| commit | 14d3b53aa8821f1c86faccd01a3e32a4f0c7fe05 (patch) | |
| tree | e87703f33f5c05530f7926911b2853cb377e0a65 /spec/javascripts | |
| parent | f5eddb807440b1d41244d00323f8523179f24e16 (diff) | |
| download | gitlab-ce-14d3b53aa8821f1c86faccd01a3e32a4f0c7fe05.tar.gz | |
Comment user avatar Image, Changed Fixtures, added new shadow colortz-user-popover-follow-up
Needed to reorder css variables
Neede to reorder vars again
Added Changelog
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/user_popovers_spec.js | 11 | ||||
| -rw-r--r-- | spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js | 9 |
2 files changed, 9 insertions, 11 deletions
diff --git a/spec/javascripts/user_popovers_spec.js b/spec/javascripts/user_popovers_spec.js index 6cf8dd81b36..c6537e71850 100644 --- a/spec/javascripts/user_popovers_spec.js +++ b/spec/javascripts/user_popovers_spec.js @@ -2,6 +2,9 @@ import initUserPopovers from '~/user_popovers'; import UsersCache from '~/lib/utils/users_cache'; describe('User Popovers', () => { + const fixtureTemplate = 'merge_requests/diff_comment.html.raw'; + preloadFixtures(fixtureTemplate); + const selector = '.js-user-link'; const dummyUser = { name: 'root' }; @@ -15,11 +18,7 @@ describe('User Popovers', () => { }; beforeEach(() => { - setFixtures(` - <a href="/root" data-user-id="1" class="js-user-link" data-username="root" data-original-title="" title=""> - Root - </a> - `); + loadFixtures(fixtureTemplate); const usersCacheSpy = () => Promise.resolve(dummyUser); spyOn(UsersCache, 'retrieveById').and.callFake(userId => usersCacheSpy(userId)); @@ -39,7 +38,7 @@ describe('User Popovers', () => { expect(shownPopover).not.toBeNull(); expect(shownPopover.innerHTML).toContain(dummyUser.name); - expect(UsersCache.retrieveById).toHaveBeenCalledWith('1'); + expect(UsersCache.retrieveById).toHaveBeenCalledWith('58'); triggerEvent('mouseleave', document.querySelector(selector)); diff --git a/spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js b/spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js index 1578b0f81f9..71f6f1587ed 100644 --- a/spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js +++ b/spec/javascripts/vue_shared/components/user_popover/user_popover_spec.js @@ -17,14 +17,13 @@ const DEFAULT_PROPS = { const UserPopover = Vue.extend(userPopover); describe('User Popover Component', () => { + const fixtureTemplate = 'merge_requests/diff_comment.html.raw'; + preloadFixtures(fixtureTemplate); + let vm; beforeEach(() => { - setFixtures(` - <a href="/root" data-user-id="1" class="js-user-link" title="testuser"> - Root - </a> - `); + loadFixtures(fixtureTemplate); }); afterEach(() => { |