Commit 0f2872f3 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch 'mw-remove-fa-instances-from-js-specs' into 'master'

Remove fa- instances from js specs

See merge request gitlab-org/gitlab!49114
parents 4f37e9d5 78bd5b14
...@@ -33,7 +33,7 @@ describe('Filtered Search Manager (EE)', () => { ...@@ -33,7 +33,7 @@ describe('Filtered Search Manager (EE)', () => {
${FilteredSearchSpecHelper.createInputHTML()} ${FilteredSearchSpecHelper.createInputHTML()}
</ul> </ul>
<button class="clear-search" type="button"> <button class="clear-search" type="button">
<i class="fa fa-times"></i> <svg class="s16 clear-search-icon" data-testid="close-icon"><use xlink:href="icons.svg#close" /></svg>
</button> </button>
</form> </form>
</div> </div>
......
...@@ -42,8 +42,8 @@ describe('AlertsServiceForm', () => { ...@@ -42,8 +42,8 @@ describe('AlertsServiceForm', () => {
mockAxios = new MockAdapter(axios); mockAxios = new MockAdapter(axios);
setFixtures(` setFixtures(`
<div> <div>
<span class="js-service-active-status fa fa-circle" data-value="true"></span> <span class="js-service-active-status" data-value="true"><svg class="s16 cgreen" data-testid="check-icon"><use xlink:href="icons.svg#check" /></svg></span>
<span class="js-service-active-status fa fa-power-off" data-value="false"></span> <span class="js-service-active-status" data-value="false"><svg class="s16 clgray" data-testid="power-icon"><use xlink:href="icons.svg#power" /></svg></span>
</div>`); </div>`);
}); });
......
...@@ -9,7 +9,7 @@ describe('Ajax Loading Spinner', () => { ...@@ -9,7 +9,7 @@ describe('Ajax Loading Spinner', () => {
<a class="js-ajax-loading-spinner" <a class="js-ajax-loading-spinner"
data-remote data-remote
href="http://goesnowhere.nothing/whereami"> href="http://goesnowhere.nothing/whereami">
<i class="fa fa-trash-o"></i> Remove me
</a></div>`; </a></div>`;
AjaxLoadingSpinner.init(); AjaxLoadingSpinner.init();
ajaxLoadingSpinnerElement = document.querySelector('.js-ajax-loading-spinner'); ajaxLoadingSpinnerElement = document.querySelector('.js-ajax-loading-spinner');
......
...@@ -69,7 +69,7 @@ describe('Filtered Search Manager', () => { ...@@ -69,7 +69,7 @@ describe('Filtered Search Manager', () => {
${FilteredSearchSpecHelper.createInputHTML(placeholder)} ${FilteredSearchSpecHelper.createInputHTML(placeholder)}
</ul> </ul>
<button class="clear-search" type="button"> <button class="clear-search" type="button">
<i class="fa fa-times"></i> <svg class="s16 clear-search-icon" data-testid="close-icon"><use xlink:href="icons.svg#close" /></svg>
</button> </button>
</form> </form>
</div> </div>
......
...@@ -526,8 +526,8 @@ describe('common_utils', () => { ...@@ -526,8 +526,8 @@ describe('common_utils', () => {
}); });
it('should set svg className when passed', () => { it('should set svg className when passed', () => {
expect(commonUtils.spriteIcon('test', 'fa fa-test')).toEqual( expect(commonUtils.spriteIcon('test', 'first-icon-class second-icon-class')).toEqual(
'<svg class="fa fa-test"><use xlink:href="icons.svg#test" /></svg>', '<svg class="first-icon-class second-icon-class"><use xlink:href="icons.svg#test" /></svg>',
); );
}); });
}); });
......
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