Skip to content

G
gitlab-ce
Commit 03b4f77a authored by Enrique Alcántara's avatar Enrique Alcántara
Browse files
Options

Merge branch 'renovate/gitlab-uisvg' into 'master' 

Update GitLab UI/SVG

See merge request gitlab-org/gitlab!37456
parents f4b8fb60 951521f3
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 78 deletions
ee/spec/frontend/epic/components/epic_app_spec.js
View file @ 03b4f77a
...@@ -9,17 +9,15 @@ import { initialRequest } from 'jest/issue_show/mock_data'; ...@@ -9,17 +9,15 @@ import { initialRequest } from 'jest/issue_show/mock_data';
import { TEST_HOST } from 'spec/test_constants'; import { TEST_HOST } from 'spec/test_constants';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { mockEpicMeta, mockEpicData } from '../mock_data'; import { mockEpicMeta, mockEpicData } from '../mock_data';
import { useMockIntersectionObserver } from 'helpers/mock_dom_observer';
describe('EpicAppComponent', () => { describe('EpicAppComponent', () => {
useMockIntersectionObserver();
let vm; let vm;
let mock; let mock;
beforeEach(() => { beforeEach(() => {
window.IntersectionObserver = class {
disconnect = jest.fn();
observe = jest.fn();
};
mock = new MockAdapter(axios); mock = new MockAdapter(axios);
mock.onGet(`${TEST_HOST}/realtime_changes`).reply(200, initialRequest); mock.onGet(`${TEST_HOST}/realtime_changes`).reply(200, initialRequest);
...@@ -34,7 +32,6 @@ describe('EpicAppComponent', () => { ...@@ -34,7 +32,6 @@ describe('EpicAppComponent', () => {
}); });
afterEach(() => { afterEach(() => {
delete window.IntersectionObserver;
mock.restore(); mock.restore();
vm.$destroy(); vm.$destroy();
}); });
......
ee/spec/frontend/epic/components/epic_body_spec.js
View file @ 03b4f77a
...@@ -9,17 +9,15 @@ import { initialRequest } from 'jest/issue_show/mock_data'; ...@@ -9,17 +9,15 @@ import { initialRequest } from 'jest/issue_show/mock_data';
import { TEST_HOST } from 'spec/test_constants'; import { TEST_HOST } from 'spec/test_constants';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { mockEpicMeta, mockEpicData } from '../mock_data'; import { mockEpicMeta, mockEpicData } from '../mock_data';
import { useMockIntersectionObserver } from 'helpers/mock_dom_observer';
describe('EpicBodyComponent', () => { describe('EpicBodyComponent', () => {
useMockIntersectionObserver();
let vm; let vm;
let mock; let mock;
beforeEach(() => { beforeEach(() => {
window.IntersectionObserver = class {
disconnect = jest.fn();
observe = jest.fn();
};
mock = new MockAdapter(axios); mock = new MockAdapter(axios);
mock.onGet(`${TEST_HOST}/realtime_changes`).reply(200, initialRequest); mock.onGet(`${TEST_HOST}/realtime_changes`).reply(200, initialRequest);
...@@ -34,7 +32,6 @@ describe('EpicBodyComponent', () => { ...@@ -34,7 +32,6 @@ describe('EpicBodyComponent', () => {
}); });
afterEach(() => { afterEach(() => {
delete window.IntersectionObserver;
mock.restore(); mock.restore();
vm.$destroy(); vm.$destroy();
}); });
......
spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap
View file @ 03b4f77a
...@@ -31,9 +31,7 @@ exports[`Design management list item component with no notes renders item with c ...@@ -31,9 +31,7 @@ exports[`Design management list item component with no notes renders item with c
</span> </span>
</div> </div>
<gl-intersection-observer-stub <gl-intersection-observer-stub>
options="[object Object]"
>
<!----> <!---->
<img <img
...@@ -99,9 +97,7 @@ exports[`Design management list item component with no notes renders item with c ...@@ -99,9 +97,7 @@ exports[`Design management list item component with no notes renders item with c
</span> </span>
</div> </div>
<gl-intersection-observer-stub <gl-intersection-observer-stub>
options="[object Object]"
>
<!----> <!---->
<img <img
...@@ -167,9 +163,7 @@ exports[`Design management list item component with no notes renders item with c ...@@ -167,9 +163,7 @@ exports[`Design management list item component with no notes renders item with c
</span> </span>
</div> </div>
<gl-intersection-observer-stub <gl-intersection-observer-stub>
options="[object Object]"
>
<!----> <!---->
<img <img
...@@ -222,9 +216,7 @@ exports[`Design management list item component with no notes renders item with n ...@@ -222,9 +216,7 @@ exports[`Design management list item component with no notes renders item with n
> >
<!----> <!---->
<gl-intersection-observer-stub <gl-intersection-observer-stub>
options="[object Object]"
>
<!----> <!---->
<img <img
...@@ -277,9 +269,7 @@ exports[`Design management list item component with no notes renders loading spi ...@@ -277,9 +269,7 @@ exports[`Design management list item component with no notes renders loading spi
> >
<!----> <!---->
<gl-intersection-observer-stub <gl-intersection-observer-stub>
options="[object Object]"
>
<gl-loading-icon-stub <gl-loading-icon-stub
color="orange" color="orange"
label="Loading" label="Loading"
...@@ -337,9 +327,7 @@ exports[`Design management list item component with notes renders item with mult ...@@ -337,9 +327,7 @@ exports[`Design management list item component with notes renders item with mult
> >
<!----> <!---->
<gl-intersection-observer-stub <gl-intersection-observer-stub>
options="[object Object]"
>
<!----> <!---->
<img <img
...@@ -409,9 +397,7 @@ exports[`Design management list item component with notes renders item with sing ...@@ -409,9 +397,7 @@ exports[`Design management list item component with notes renders item with sing
> >
<!----> <!---->
<gl-intersection-observer-stub <gl-intersection-observer-stub>
options="[object Object]"
>
<!----> <!---->
<img <img
......
spec/frontend/design_management_new/components/list/__snapshots__/item_spec.js.snap
View file @ 03b4f77a
...@@ -31,9 +31,7 @@ exports[`Design management list item component with no notes renders item with c ...@@ -31,9 +31,7 @@ exports[`Design management list item component with no notes renders item with c
</span> </span>
</div> </div>
<gl-intersection-observer-stub <gl-intersection-observer-stub>
options="[object Object]"
>
<!----> <!---->
<img <img
...@@ -99,9 +97,7 @@ exports[`Design management list item component with no notes renders item with c ...@@ -99,9 +97,7 @@ exports[`Design management list item component with no notes renders item with c
</span> </span>
</div> </div>
<gl-intersection-observer-stub <gl-intersection-observer-stub>
options="[object Object]"
>
<!----> <!---->
<img <img
...@@ -167,9 +163,7 @@ exports[`Design management list item component with no notes renders item with c ...@@ -167,9 +163,7 @@ exports[`Design management list item component with no notes renders item with c
</span> </span>
</div> </div>
<gl-intersection-observer-stub <gl-intersection-observer-stub>
options="[object Object]"
>
<!----> <!---->
<img <img
...@@ -222,9 +216,7 @@ exports[`Design management list item component with no notes renders item with n ...@@ -222,9 +216,7 @@ exports[`Design management list item component with no notes renders item with n
> >
<!----> <!---->
<gl-intersection-observer-stub <gl-intersection-observer-stub>
options="[object Object]"
>
<!----> <!---->
<img <img
...@@ -277,9 +269,7 @@ exports[`Design management list item component with no notes renders loading spi ...@@ -277,9 +269,7 @@ exports[`Design management list item component with no notes renders loading spi
> >
<!----> <!---->
<gl-intersection-observer-stub <gl-intersection-observer-stub>
options="[object Object]"
>
<gl-loading-icon-stub <gl-loading-icon-stub
color="orange" color="orange"
label="Loading" label="Loading"
...@@ -337,9 +327,7 @@ exports[`Design management list item component with notes renders item with mult ...@@ -337,9 +327,7 @@ exports[`Design management list item component with notes renders item with mult
> >
<!----> <!---->
<gl-intersection-observer-stub <gl-intersection-observer-stub>
options="[object Object]"
>
<!----> <!---->
<img <img
...@@ -409,9 +397,7 @@ exports[`Design management list item component with notes renders item with sing ...@@ -409,9 +397,7 @@ exports[`Design management list item component with notes renders item with sing
> >
<!----> <!---->
<gl-intersection-observer-stub <gl-intersection-observer-stub>
options="[object Object]"
>
<!----> <!---->
<img <img
......
spec/frontend/issue_show/components/app_spec.js
View file @ 03b4f77a
...@@ -8,6 +8,7 @@ import '~/behaviors/markdown/render_gfm'; ...@@ -8,6 +8,7 @@ import '~/behaviors/markdown/render_gfm';
import IssuableApp from '~/issue_show/components/app.vue'; import IssuableApp from '~/issue_show/components/app.vue';
import eventHub from '~/issue_show/event_hub'; import eventHub from '~/issue_show/event_hub';
import { initialRequest, secondRequest } from '../mock_data'; import { initialRequest, secondRequest } from '../mock_data';
import { useMockIntersectionObserver } from 'helpers/mock_dom_observer';
function formatText(text) { function formatText(text) {
return text.trim().replace(/\s\s+/g, ' '); return text.trim().replace(/\s\s+/g, ' ');
...@@ -22,6 +23,8 @@ const zoomMeetingUrl = 'https://gitlab.zoom.us/j/95919234811'; ...@@ -22,6 +23,8 @@ const zoomMeetingUrl = 'https://gitlab.zoom.us/j/95919234811';
const publishedIncidentUrl = 'https://status.com/'; const publishedIncidentUrl = 'https://status.com/';
describe('Issuable output', () => { describe('Issuable output', () => {
useMockIntersectionObserver();
let mock; let mock;
let realtimeRequestCount = 0; let realtimeRequestCount = 0;
let wrapper; let wrapper;
...@@ -45,11 +48,6 @@ describe('Issuable output', () => { ...@@ -45,11 +48,6 @@ describe('Issuable output', () => {
</div> </div>
`); `);
window.IntersectionObserver = class {
disconnect = jest.fn();
observe = jest.fn();
};
mock = new MockAdapter(axios); mock = new MockAdapter(axios);
mock mock
.onGet('/gitlab-org/gitlab-shell/-/issues/9/realtime_changes/realtime_changes') .onGet('/gitlab-org/gitlab-shell/-/issues/9/realtime_changes/realtime_changes')
...@@ -84,7 +82,6 @@ describe('Issuable output', () => { ...@@ -84,7 +82,6 @@ describe('Issuable output', () => {
}); });
afterEach(() => { afterEach(() => {
delete window.IntersectionObserver;
mock.restore(); mock.restore();
realtimeRequestCount = 0; realtimeRequestCount = 0;
......
spec/frontend/vue_shared/directives/autofocusonshow_spec.js
View file @ 03b4f77a
import autofocusonshow from '~/vue_shared/directives/autofocusonshow'; import autofocusonshow from '~/vue_shared/directives/autofocusonshow';
import { useMockIntersectionObserver } from 'helpers/mock_dom_observer';
/** /**
* We're testing this directive's hooks as pure functions * We're testing this directive's hooks as pure functions
...@@ -6,20 +7,14 @@ import autofocusonshow from '~/vue_shared/directives/autofocusonshow'; ...@@ -6,20 +7,14 @@ import autofocusonshow from '~/vue_shared/directives/autofocusonshow';
* on underlying DOM methods. * on underlying DOM methods.
*/ */
describe('AutofocusOnShow directive', () => { describe('AutofocusOnShow directive', () => {
useMockIntersectionObserver();
describe('with input invisible on component render', () => { describe('with input invisible on component render', () => {
let el; let el;
beforeEach(() => { beforeEach(() => {
setFixtures('<div id="container" style="display: none;"><input id="inputel"/></div>'); setFixtures('<div id="container" style="display: none;"><input id="inputel"/></div>');
el = document.querySelector('#inputel'); el = document.querySelector('#inputel');
window.IntersectionObserver = class {
observe = jest.fn();
};
});
afterEach(() => {
delete window.IntersectionObserver;
}); });
it('should bind IntersectionObserver on input element', () => { it('should bind IntersectionObserver on input element', () => {
......
yarn.lock
View file @ 03b4f77a
...@@ -843,15 +843,15 @@ ...@@ -843,15 +843,15 @@
eslint-plugin-vue "^6.2.1" eslint-plugin-vue "^6.2.1"
vue-eslint-parser "^7.0.0" vue-eslint-parser "^7.0.0"
"@gitlab/svgs@1.152.0": "@gitlab/svgs@1.153.0":
version "1.152.0" version "1.153.0"
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.152.0.tgz#663c9a5f073f59b66f4241ef2d3fea2205846905" resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.153.0.tgz#79db0598382e6990d242f2e8dc0911903b1f558c"
integrity sha512-daZHOBVAwjsU6n60IycanoO/JymfQ36vrr46OUdWjHdp0ATYrgh+01LcxiSNLdlyndIRqHWGtwmuilokM9q6Vg== integrity sha512-9letemutba300jT8BgxmYjUjMGDJifFFulPBNT4bxT+U2Ki+X+xs57Il3o/FNv5feJOPAlYS8Z/aEII8145g1g==
"@gitlab/ui@17.34.0": "@gitlab/ui@17.35.0":
version "17.34.0" version "17.35.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-17.34.0.tgz#4f3708579d6822280c26e27b6055e29336be4871" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-17.35.0.tgz#dfbdae98dbc0e184c5d1bf0d1cd991f7aa915dcd"
integrity sha512-g8mhdB8lOn7lFeWvWkEu5xqV/A0RZDfAMEU2aylLeInTCIrn2V638y80U4Kb2Suu78ji/rYgtjZRSmy8ZDvAQA== integrity sha512-KvGOh5dPE+sCQKbvj4KlKtnmVOxP97K54Ibh9R6n4N37jAc71mlDInMXpNow1nf+7mAL6ca1cPknIkmuf2+B3g==
dependencies: dependencies:
"@babel/standalone" "^7.0.0" "@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.3.0" "@gitlab/vue-toasted" "^1.3.0"
...@@ -863,6 +863,7 @@ ...@@ -863,6 +863,7 @@
lodash "^4.17.14" lodash "^4.17.14"
portal-vue "^2.1.6" portal-vue "^2.1.6"
resize-observer-polyfill "^1.5.1" resize-observer-polyfill "^1.5.1"
sanitize-html "^1.22.0"
url-search-params-polyfill "^5.0.0" url-search-params-polyfill "^5.0.0"
vue-runtime-helpers "^1.1.2" vue-runtime-helpers "^1.1.2"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7