diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 18:08:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 18:08:08 +0300 |
commit | 946771d0b016ae92b15a60bc3290a33b94191ffe (patch) | |
tree | 64862c2433989483f5fce45d5539242577a362eb /spec/javascripts | |
parent | f1e2fca19a90a6992c2020cf8c2159cfb0b61bca (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/search_spec.js | 41 | ||||
-rw-r--r-- | spec/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js | 176 |
2 files changed, 0 insertions, 217 deletions
diff --git a/spec/javascripts/search_spec.js b/spec/javascripts/search_spec.js deleted file mode 100644 index 32f60508fa3..00000000000 --- a/spec/javascripts/search_spec.js +++ /dev/null @@ -1,41 +0,0 @@ -import $ from 'jquery'; -import Api from '~/api'; -import Search from '~/pages/search/show/search'; - -describe('Search', () => { - const fixturePath = 'search/show.html'; - const searchTerm = 'some search'; - const fillDropdownInput = dropdownSelector => { - const dropdownElement = document.querySelector(dropdownSelector).parentNode; - const inputElement = dropdownElement.querySelector('.dropdown-input-field'); - inputElement.value = searchTerm; - return inputElement; - }; - - preloadFixtures(fixturePath); - - beforeEach(() => { - loadFixtures(fixturePath); - new Search(); // eslint-disable-line no-new - }); - - it('requests groups from backend when filtering', done => { - spyOn(Api, 'groups').and.callFake(term => { - expect(term).toBe(searchTerm); - done(); - }); - const inputElement = fillDropdownInput('.js-search-group-dropdown'); - - $(inputElement).trigger('input'); - }); - - it('requests projects from backend when filtering', done => { - spyOn(Api, 'projects').and.callFake(term => { - expect(term).toBe(searchTerm); - done(); - }); - const inputElement = fillDropdownInput('.js-search-project-dropdown'); - - $(inputElement).trigger('input'); - }); -}); diff --git a/spec/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js b/spec/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js deleted file mode 100644 index 81f194395ef..00000000000 --- a/spec/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js +++ /dev/null @@ -1,176 +0,0 @@ -import Vue from 'vue'; -import mountComponent from 'spec/helpers/vue_mount_component_helper'; -import { GREEN_BOX_IMAGE_URL, RED_BOX_IMAGE_URL } from 'spec/test_constants'; -import imageDiffViewer from '~/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue'; - -describe('ImageDiffViewer', () => { - const requiredProps = { - diffMode: 'replaced', - newPath: GREEN_BOX_IMAGE_URL, - oldPath: RED_BOX_IMAGE_URL, - }; - let vm; - - function createComponent(props) { - const ImageDiffViewer = Vue.extend(imageDiffViewer); - vm = mountComponent(ImageDiffViewer, props); - } - - const triggerEvent = (eventName, el = vm.$el, clientX = 0) => { - const event = document.createEvent('MouseEvents'); - event.initMouseEvent( - eventName, - true, - true, - window, - 1, - clientX, - 0, - clientX, - 0, - false, - false, - false, - false, - 0, - null, - ); - - el.dispatchEvent(event); - }; - - const dragSlider = (sliderElement, dragPixel = 20) => { - triggerEvent('mousedown', sliderElement); - triggerEvent('mousemove', document.body, dragPixel); - triggerEvent('mouseup', document.body); - }; - - afterEach(() => { - vm.$destroy(); - }); - - it('renders image diff for replaced', done => { - createComponent(requiredProps); - - setTimeout(() => { - expect(vm.$el.querySelector('.added img').getAttribute('src')).toBe(GREEN_BOX_IMAGE_URL); - - expect(vm.$el.querySelector('.deleted img').getAttribute('src')).toBe(RED_BOX_IMAGE_URL); - - expect(vm.$el.querySelector('.view-modes-menu li.active').textContent.trim()).toBe('2-up'); - expect(vm.$el.querySelector('.view-modes-menu li:nth-child(2)').textContent.trim()).toBe( - 'Swipe', - ); - - expect(vm.$el.querySelector('.view-modes-menu li:nth-child(3)').textContent.trim()).toBe( - 'Onion skin', - ); - - done(); - }); - }); - - it('renders image diff for new', done => { - createComponent( - Object.assign({}, requiredProps, { - diffMode: 'new', - oldPath: '', - }), - ); - - setTimeout(() => { - expect(vm.$el.querySelector('.added img').getAttribute('src')).toBe(GREEN_BOX_IMAGE_URL); - - done(); - }); - }); - - it('renders image diff for deleted', done => { - createComponent( - Object.assign({}, requiredProps, { - diffMode: 'deleted', - newPath: '', - }), - ); - - setTimeout(() => { - expect(vm.$el.querySelector('.deleted img').getAttribute('src')).toBe(RED_BOX_IMAGE_URL); - - done(); - }); - }); - - it('renders image diff for renamed', done => { - vm = new Vue({ - components: { - imageDiffViewer, - }, - template: ` - <image-diff-viewer diff-mode="renamed" new-path="${GREEN_BOX_IMAGE_URL}" old-path=""> - <span slot="image-overlay" class="overlay">test</span> - </image-diff-viewer> - `, - }).$mount(); - - setTimeout(() => { - expect(vm.$el.querySelector('img').getAttribute('src')).toBe(GREEN_BOX_IMAGE_URL); - expect(vm.$el.querySelector('.overlay')).not.toBe(null); - - done(); - }); - }); - - describe('swipeMode', () => { - beforeEach(done => { - createComponent(requiredProps); - - setTimeout(() => { - done(); - }); - }); - - it('switches to Swipe Mode', done => { - vm.$el.querySelector('.view-modes-menu li:nth-child(2)').click(); - - vm.$nextTick(() => { - expect(vm.$el.querySelector('.view-modes-menu li.active').textContent.trim()).toBe('Swipe'); - done(); - }); - }); - }); - - describe('onionSkin', () => { - beforeEach(done => { - createComponent(requiredProps); - - setTimeout(() => { - done(); - }); - }); - - it('switches to Onion Skin Mode', done => { - vm.$el.querySelector('.view-modes-menu li:nth-child(3)').click(); - - vm.$nextTick(() => { - expect(vm.$el.querySelector('.view-modes-menu li.active').textContent.trim()).toBe( - 'Onion skin', - ); - done(); - }); - }); - - it('has working drag handler', done => { - vm.$el.querySelector('.view-modes-menu li:nth-child(3)').click(); - - vm.$nextTick(() => { - dragSlider(vm.$el.querySelector('.dragger')); - - vm.$nextTick(() => { - expect(vm.$el.querySelector('.dragger').style.left).toBe('20px'); - expect(vm.$el.querySelector('.added.frame').style.opacity).toBe('0.2'); - done(); - }); - }); - }); - }); -}); |