Skip to content
Snippets Groups Projects
Commit 6df22f17 authored by Lukas Eipert's avatar Lukas Eipert Committed by Fatih Acet
Browse files

Karma: Fix css selector for loading icon

The GitLab UI update changed the spinner selector from `spinner` to
`gl-spinner`, so we need to update it, so that our tests won't fail.
parent f2b6c6ca
No related branches found
No related tags found
No related merge requests found
Showing
with 22 additions and 20 deletions
Loading
Loading
@@ -38,7 +38,7 @@
"@babel/preset-env": "^7.4.4",
"@gitlab/csslab": "^1.9.0",
"@gitlab/svgs": "^1.67.0",
"@gitlab/ui": "^5.7.1",
"@gitlab/ui": "^5.9.0",
"apollo-cache-inmemory": "^1.5.1",
"apollo-client": "^2.5.1",
"apollo-link": "^1.2.11",
Loading
Loading
Loading
Loading
@@ -60,7 +60,7 @@ describe('BadgeList component', () => {
 
Vue.nextTick()
.then(() => {
const loadingIcon = vm.$el.querySelector('.spinner');
const loadingIcon = vm.$el.querySelector('.gl-spinner');
 
expect(loadingIcon).toBeVisible();
})
Loading
Loading
Loading
Loading
@@ -15,7 +15,7 @@ describe('Badge component', () => {
const buttons = vm.$el.querySelectorAll('button');
return {
badgeImage: vm.$el.querySelector('img.project-badge'),
loadingIcon: vm.$el.querySelector('.spinner'),
loadingIcon: vm.$el.querySelector('.gl-spinner'),
reloadButton: buttons[buttons.length - 1],
};
};
Loading
Loading
Loading
Loading
@@ -148,7 +148,7 @@ describe('Board list component', () => {
component.list.loadingMore = true;
 
Vue.nextTick(() => {
expect(component.$el.querySelector('.board-list-count .spinner')).not.toBeNull();
expect(component.$el.querySelector('.board-list-count .gl-spinner')).not.toBeNull();
 
done();
});
Loading
Loading
Loading
Loading
@@ -106,7 +106,7 @@ describe('Registry List', () => {
 
it('should render a loading spinner', done => {
Vue.nextTick(() => {
expect(vm.$el.querySelector('.spinner')).not.toBe(null);
expect(vm.$el.querySelector('.gl-spinner')).not.toBe(null);
done();
});
});
Loading
Loading
Loading
Loading
@@ -34,7 +34,7 @@ describe('Grouped Test Reports App', () => {
 
it('renders success summary text', done => {
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(
'Test summary contained no changed test results out of 11 total tests',
);
Loading
Loading
@@ -61,7 +61,7 @@ describe('Grouped Test Reports App', () => {
 
it('renders success summary text', done => {
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(
'Test summary results are being parsed',
);
Loading
Loading
@@ -81,7 +81,7 @@ describe('Grouped Test Reports App', () => {
 
it('renders failed summary text + new badge', done => {
setTimeout(() => {
expect(vm.$el.querySelector('.spinner')).toBeNull();
expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
'Test summary contained 2 failed test results out of 11 total tests',
);
Loading
Loading
@@ -109,7 +109,7 @@ describe('Grouped Test Reports App', () => {
 
it('renders summary text', done => {
setTimeout(() => {
expect(vm.$el.querySelector('.spinner')).toBeNull();
expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
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',
);
Loading
Loading
@@ -137,7 +137,7 @@ describe('Grouped Test Reports App', () => {
 
it('renders summary text', done => {
setTimeout(() => {
expect(vm.$el.querySelector('.spinner')).toBeNull();
expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
'Test summary contained 2 fixed test results out of 11 total tests',
);
Loading
Loading
@@ -190,7 +190,7 @@ describe('Grouped Test Reports App', () => {
});
 
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(
'Test summary results are being parsed',
);
Loading
Loading
Loading
Loading
@@ -18,7 +18,7 @@ describe('MR widget status icon component', () => {
it('renders loading icon', () => {
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');
});
});
 
Loading
Loading
Loading
Loading
@@ -38,7 +38,9 @@ describe('MRWidgetAutoMergeFailed', () => {
 
Vue.nextTick(() => {
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();
});
});
Loading
Loading
Loading
Loading
@@ -20,7 +20,7 @@ describe('MRWidgetChecking', () => {
});
 
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', () => {
Loading
Loading
Loading
Loading
@@ -72,7 +72,7 @@ describe('File Icon component', () => {
 
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', () => {
Loading
Loading
Loading
Loading
@@ -88,7 +88,7 @@ describe('Header CI Component', () => {
vm.actions[0].isLoading = true;
 
Vue.nextTick(() => {
expect(vm.$el.querySelector('.btn .spinner').getAttribute('style')).toBeFalsy();
expect(vm.$el.querySelector('.btn .gl-spinner').getAttribute('style')).toBeFalsy();
done();
});
});
Loading
Loading
Loading
Loading
@@ -996,10 +996,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.67.0.tgz#c7b94eca13b99fd3aaa737fb6dcc0abc41d3c579"
integrity sha512-hJOmWEs6RkjzyKkb1vc9wwKGZIBIP0coHkxu/KgOoxhBVudpGk4CH7xJ6UuB2TKpb0SEh5CC1CzRZfBYaFhsaA==
 
"@gitlab/ui@^5.7.1":
version "5.7.1"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.7.1.tgz#e55d04052dd6e50ed1e90676aacc64290d62c0b6"
integrity sha512-F06/6z6/69LbKIK0PYRDTB/teSPUnF7LijHl4JiuYHXn7Y2/iVoLsAMikhT89RVR84orHPGnw16vtCPjSjBDrA==
"@gitlab/ui@^5.9.0":
version "5.9.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.9.0.tgz#a38b1b57c365608b100b95969ae7a57ce1707542"
integrity sha512-cgvEPWVerYZNLqkHjg5dd0VhEDBWj8aNoISZCaGOWI9K4yVtpMPVRUv19o/xYm4vUexfFsG9vg9lBgd+4ZU6Yw==
dependencies:
"@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.2.1"
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment