Skip to content

Commit 8ea9c10

Browse files
author
Oleksandr Telnov
committed
fix(tests): fix failing test for buttons and accordion
Conflicts: components/buttons/button.directive.spec.ts
1 parent 5c8fcf1 commit 8ea9c10

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

components/buttons/button.directive.spec.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import {Component} from '@angular/core';
22
import {it, beforeEach, beforeEachProviders, injectAsync, expect} from '@angular/core/testing';
33
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
4-
import {ButtonCheckboxDirective} from './button-checkbox.directive';
5-
import {ButtonRadioDirective} from './button-radio.directive';
4+
// import {ButtonCheckboxDirective} from './button-checkbox.directive';
5+
// import {ButtonRadioDirective} from './button-radio.directive';
6+
import {BUTTON_DIRECTIVES} from '../buttons';
7+
import {NgModel} from '@angular/common';
68

79
const html = `
810
<div>
@@ -150,14 +152,14 @@ describe('Directive: Buttons', () => {
150152
delete context.radioModel;
151153
expect(context.radioModel).toBeUndefined();
152154

153-
btn.children[2].click();
155+
(btn.children[2] as HTMLElement).click();
154156
fixture.detectChanges();
155157
expect(context.radioModel).toEqual('Right');
156158
expect(btn.children[0]).not.toHaveCssClass('active');
157159
expect(btn.children[1]).not.toHaveCssClass('active');
158160
expect(btn.children[2]).toHaveCssClass('active');
159161

160-
btn.children[1].click();
162+
(btn.children[1] as HTMLElement).click();
161163
fixture.detectChanges();
162164
expect(context.radioModel).toEqual('Middle');
163165
expect(btn.children[0]).not.toHaveCssClass('active');
@@ -172,7 +174,7 @@ describe('Directive: Buttons', () => {
172174
expect(btn.children[1]).toHaveCssClass('active');
173175
expect(btn.children[2]).not.toHaveCssClass('active');
174176

175-
btn.children[1].click();
177+
(btn.children[1] as HTMLElement).click();
176178
fixture.detectChanges();
177179
expect(context.radioModel).toEqual('Middle');
178180
expect(btn.children[0]).not.toHaveCssClass('active');
@@ -191,7 +193,7 @@ describe('Directive: Buttons', () => {
191193
expect(btn.children[1]).toHaveCssClass('active');
192194
expect(btn.children[3]).not.toHaveCssClass('active');
193195

194-
btn.children[3].click();
196+
(btn.children[3] as HTMLElement).click();
195197
fixture.detectChanges();
196198
expect(btn.children[1]).toHaveCssClass('active');
197199
expect(btn.children[3]).not.toHaveCssClass('active');
@@ -201,14 +203,14 @@ describe('Directive: Buttons', () => {
201203
let btn = element.querySelector('.btn-group.radioUncheckable');
202204
expect(context.radioUncheckableModel).toBeUndefined();
203205

204-
btn.children[0].click();
206+
(btn.children[0] as HTMLElement).click();
205207
fixture.detectChanges();
206208
expect(context.radioUncheckableModel).toEqual('Left');
207209
expect(btn.children[0]).toHaveCssClass('active');
208210
expect(btn.children[1]).not.toHaveCssClass('active');
209211
expect(btn.children[2]).not.toHaveCssClass('active');
210212

211-
btn.children[0].click();
213+
(btn.children[0] as HTMLElement).click();
212214
fixture.detectChanges();
213215
expect(context.radioUncheckableModel).toBeNull();
214216
expect(btn.children[0]).not.toHaveCssClass('active');
@@ -220,7 +222,7 @@ describe('Directive: Buttons', () => {
220222

221223
@Component({
222224
selector: 'buttons-test',
223-
directives: [ButtonCheckboxDirective, ButtonRadioDirective],
225+
directives: [BUTTON_DIRECTIVES, NgModel],
224226
template: ''
225227
})
226228

components/tabs/tabset.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ const html = `
2020
</tabset>
2121
`;
2222

23-
function getTabTitles(nativeEl:HTMLElement):NodeList {
23+
function getTabTitles(nativeEl:HTMLElement):NodeListOf<Element> {
2424
return nativeEl.querySelectorAll('.nav-link');
2525
}
2626

27-
function getTabContent(nativeEl:HTMLElement):NodeList {
27+
function getTabContent(nativeEl:HTMLElement):NodeListOf<Element> {
2828
return nativeEl.querySelectorAll('.tab-content .tab-pane');
2929
}
3030

0 commit comments

Comments
 (0)