kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'renovate/gitlab-ui-5.x' into 'master' 

Update dependency @gitlab/ui to ^5.9.0

See merge request gitlab-org/gitlab-ce!31153
This commit is contained in:
Fatih Acet 2019-07-26 09:40:18 +00:00
parent f2b6c6ca0d 6df22f17d2
commit 59a5a89c61
12 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -38,7 +38,7 @@
"@babel/preset-env": "^7.4.4", "@babel/preset-env": "^7.4.4",
"@gitlab/csslab": "^1.9.0", "@gitlab/csslab": "^1.9.0",
"@gitlab/svgs": "^1.67.0", "@gitlab/svgs": "^1.67.0",
"@gitlab/ui": "^5.7.1", "@gitlab/ui": "^5.9.0",
"apollo-cache-inmemory": "^1.5.1", "apollo-cache-inmemory": "^1.5.1",
"apollo-client": "^2.5.1", "apollo-client": "^2.5.1",
"apollo-link": "^1.2.11", "apollo-link": "^1.2.11",

2
spec/javascripts/badges/components/badge_list_spec.js
View File

@ -60,7 +60,7 @@ describe('BadgeList component', () => {
Vue.nextTick() Vue.nextTick()
.then(() => { .then(() => {
const loadingIcon = vm.$el.querySelector('.spinner'); const loadingIcon = vm.$el.querySelector('.gl-spinner');
expect(loadingIcon).toBeVisible(); expect(loadingIcon).toBeVisible();
}) })

2
spec/javascripts/badges/components/badge_spec.js
View File

@ -15,7 +15,7 @@ describe('Badge component', () => {
const buttons = vm.$el.querySelectorAll('button'); const buttons = vm.$el.querySelectorAll('button');
return { return {
badgeImage: vm.$el.querySelector('img.project-badge'), badgeImage: vm.$el.querySelector('img.project-badge'),
loadingIcon: vm.$el.querySelector('.spinner'), loadingIcon: vm.$el.querySelector('.gl-spinner'),
reloadButton: buttons[buttons.length - 1], reloadButton: buttons[buttons.length - 1],
}; };
}; };

2
spec/javascripts/boards/board_list_spec.js
View File

@ -148,7 +148,7 @@ describe('Board list component', () => {
component.list.loadingMore = true; component.list.loadingMore = true;
Vue.nextTick(() => { Vue.nextTick(() => {
expect(component.$el.querySelector('.board-list-count .spinner')).not.toBeNull(); expect(component.$el.querySelector('.board-list-count .gl-spinner')).not.toBeNull();
done(); done();
}); });

2
spec/javascripts/registry/components/app_spec.js
View File

@ -106,7 +106,7 @@ describe('Registry List', () => {
it('should render a loading spinner', done => { it('should render a loading spinner', done => {
Vue.nextTick(() => { Vue.nextTick(() => {
expect(vm.$el.querySelector('.spinner')).not.toBe(null); expect(vm.$el.querySelector('.gl-spinner')).not.toBe(null);
done(); done();
}); });
}); });

12
spec/javascripts/reports/components/grouped_test_reports_app_spec.js
View File

@ -34,7 +34,7 @@ describe('Grouped Test Reports App', () => {
it('renders success summary text', done => { it('renders success summary text', done => {
setTimeout(() => { setTimeout(() => {
expect(vm.$el.querySelector('.fa-spinner')).toBeNull(); expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual( expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
'Test summary contained no changed test results out of 11 total tests', 'Test summary contained no changed test results out of 11 total tests',
); );
@ -61,7 +61,7 @@ describe('Grouped Test Reports App', () => {
it('renders success summary text', done => { it('renders success summary text', done => {
setTimeout(() => { setTimeout(() => {
expect(vm.$el.querySelector('.spinner')).not.toBeNull(); expect(vm.$el.querySelector('.gl-spinner')).not.toBeNull();
expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual( expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
'Test summary results are being parsed', 'Test summary results are being parsed',
); );
@ -81,7 +81,7 @@ describe('Grouped Test Reports App', () => {
it('renders failed summary text + new badge', done => { it('renders failed summary text + new badge', done => {
setTimeout(() => { setTimeout(() => {
expect(vm.$el.querySelector('.spinner')).toBeNull(); expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual( expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
'Test summary contained 2 failed test results out of 11 total tests', 'Test summary contained 2 failed test results out of 11 total tests',
); );
@ -109,7 +109,7 @@ describe('Grouped Test Reports App', () => {
it('renders summary text', done => { it('renders summary text', done => {
setTimeout(() => { setTimeout(() => {
expect(vm.$el.querySelector('.spinner')).toBeNull(); expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual( expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
'Test summary contained 2 failed test results and 2 fixed test results out of 11 total tests', 'Test summary contained 2 failed test results and 2 fixed test results out of 11 total tests',
); );
@ -137,7 +137,7 @@ describe('Grouped Test Reports App', () => {
it('renders summary text', done => { it('renders summary text', done => {
setTimeout(() => { setTimeout(() => {
expect(vm.$el.querySelector('.spinner')).toBeNull(); expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual( expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
'Test summary contained 2 fixed test results out of 11 total tests', 'Test summary contained 2 fixed test results out of 11 total tests',
); );
@ -190,7 +190,7 @@ describe('Grouped Test Reports App', () => {
}); });
it('renders loading summary text with loading icon', done => { it('renders loading summary text with loading icon', done => {
expect(vm.$el.querySelector('.spinner')).not.toBeNull(); expect(vm.$el.querySelector('.gl-spinner')).not.toBeNull();
expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual( expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
'Test summary results are being parsed', 'Test summary results are being parsed',
); );

2
spec/javascripts/vue_mr_widget/components/mr_widget_status_icon_spec.js
View File

@ -18,7 +18,7 @@ describe('MR widget status icon component', () => {
it('renders loading icon', () => { it('renders loading icon', () => {
vm = mountComponent(Component, { status: 'loading' }); vm = mountComponent(Component, { status: 'loading' });
expect(vm.$el.querySelector('.mr-widget-icon span').classList).toContain('spinner'); expect(vm.$el.querySelector('.mr-widget-icon span').classList).toContain('gl-spinner');
}); });
}); });

4
spec/javascripts/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js
View File

@ -38,7 +38,9 @@ describe('MRWidgetAutoMergeFailed', () => {
Vue.nextTick(() => { Vue.nextTick(() => {
expect(vm.$el.querySelector('button').getAttribute('disabled')).toEqual('disabled'); expect(vm.$el.querySelector('button').getAttribute('disabled')).toEqual('disabled');
expect(vm.$el.querySelector('button .loading-container span').classList).toContain('spinner'); expect(vm.$el.querySelector('button .loading-container span').classList).toContain(
'gl-spinner',
);
done(); done();
}); });
}); });

2
spec/javascripts/vue_mr_widget/components/states/mr_widget_checking_spec.js
View File

@ -20,7 +20,7 @@ describe('MRWidgetChecking', () => {
}); });
it('renders loading icon', () => { it('renders loading icon', () => {
expect(vm.$el.querySelector('.mr-widget-icon span').classList).toContain('spinner'); expect(vm.$el.querySelector('.mr-widget-icon span').classList).toContain('gl-spinner');
}); });
it('renders information about merging', () => { it('renders information about merging', () => {

2
spec/javascripts/vue_shared/components/file_icon_spec.js
View File

@ -72,7 +72,7 @@ describe('File Icon component', () => {
const { classList } = vm.$el.querySelector('.loading-container span'); const { classList } = vm.$el.querySelector('.loading-container span');
expect(classList.contains('spinner')).toEqual(true); expect(classList.contains('gl-spinner')).toEqual(true);
}); });
it('should add a special class and a size class', () => { it('should add a special class and a size class', () => {

2
spec/javascripts/vue_shared/components/header_ci_component_spec.js
View File

@ -88,7 +88,7 @@ describe('Header CI Component', () => {
vm.actions[0].isLoading = true; vm.actions[0].isLoading = true;
Vue.nextTick(() => { Vue.nextTick(() => {
expect(vm.$el.querySelector('.btn .spinner').getAttribute('style')).toBeFalsy(); expect(vm.$el.querySelector('.btn .gl-spinner').getAttribute('style')).toBeFalsy();
done(); done();
}); });
}); });

8
yarn.lock
View File

@ -996,10 +996,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.67.0.tgz#c7b94eca13b99fd3aaa737fb6dcc0abc41d3c579" resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.67.0.tgz#c7b94eca13b99fd3aaa737fb6dcc0abc41d3c579"
integrity sha512-hJOmWEs6RkjzyKkb1vc9wwKGZIBIP0coHkxu/KgOoxhBVudpGk4CH7xJ6UuB2TKpb0SEh5CC1CzRZfBYaFhsaA== integrity sha512-hJOmWEs6RkjzyKkb1vc9wwKGZIBIP0coHkxu/KgOoxhBVudpGk4CH7xJ6UuB2TKpb0SEh5CC1CzRZfBYaFhsaA==
"@gitlab/ui@^5.7.1": "@gitlab/ui@^5.9.0":
version "5.7.1" version "5.9.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.7.1.tgz#e55d04052dd6e50ed1e90676aacc64290d62c0b6" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.9.0.tgz#a38b1b57c365608b100b95969ae7a57ce1707542"
integrity sha512-F06/6z6/69LbKIK0PYRDTB/teSPUnF7LijHl4JiuYHXn7Y2/iVoLsAMikhT89RVR84orHPGnw16vtCPjSjBDrA== integrity sha512-cgvEPWVerYZNLqkHjg5dd0VhEDBWj8aNoISZCaGOWI9K4yVtpMPVRUv19o/xYm4vUexfFsG9vg9lBgd+4ZU6Yw==
dependencies: dependencies:
"@babel/standalone" "^7.0.0" "@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.2.1" "@gitlab/vue-toasted" "^1.2.1"