Skip to content

Commit 33a964f

Browse files
authored
Merge branch '9.0.x' into SKrastev/refactor-mrl-nav-test-9.0.x
2 parents 1b2ce7f + 791252e commit 33a964f

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

projects/igniteui-angular/src/lib/grids/grid/column-hiding.spec.ts

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ describe('Column Hiding UI #grid', () => {
756756
columnChooser.columnsAreaMaxHeight = '150px';
757757
fix.detectChanges();
758758
const columnsAreaDiv = columnChooserElement.query(By.css('div.igx-column-hiding__columns'));
759-
expect(JSON.stringify(columnsAreaDiv.styles)).toBe('{"max-height":"150px"}');
759+
expect(getComputedStyle(columnsAreaDiv.nativeElement).maxHeight).toBe('150px');
760760
expect(columnChooserElement.nativeElement.offsetHeight <= 255).toBe(true);
761761
});
762762

@@ -800,23 +800,21 @@ describe('Column Hiding UI #grid', () => {
800800

801801
it('indents columns according to their level.', () => {
802802
const items = columnChooser.columnItems;
803-
804803
expect(items.filter((col) => col.calcIndent === 0).length).toBe(3);
805804
expect(items.filter((col) => col.calcIndent === 30).length).toBe(2);
806805
expect(items.filter((col) => col.calcIndent === 60).length).toBe(2);
807806

808807
const columnItems = getColumnHidingItems();
809-
810-
const margin0 = '{"margin-left":"0px"}';
811-
const margin1 = '{"margin-left":"30px"}';
812-
const margin2 = '{"margin-left":"60px"}';
813-
expect(JSON.stringify(columnItems[0].styles)).toBe(margin0);
814-
expect(JSON.stringify(columnItems[1].styles)).toBe(margin0);
815-
expect(JSON.stringify(columnItems[2].styles)).toBe(margin1);
816-
expect(JSON.stringify(columnItems[3].styles)).toBe(margin1);
817-
expect(JSON.stringify(columnItems[4].styles)).toBe(margin2);
818-
expect(JSON.stringify(columnItems[5].styles)).toBe(margin2);
819-
expect(JSON.stringify(columnItems[6].styles)).toBe(margin0);
808+
const margin0 = '0px';
809+
const margin30 = '30px';
810+
const margin60 = '60px';
811+
expect(getComputedStyle(columnItems[0].nativeElement).marginLeft).toBe(margin0);
812+
expect(getComputedStyle(columnItems[1].nativeElement).marginLeft).toBe(margin0);
813+
expect(getComputedStyle(columnItems[2].nativeElement).marginLeft).toBe(margin30);
814+
expect(getComputedStyle(columnItems[3].nativeElement).marginLeft).toBe(margin30);
815+
expect(getComputedStyle(columnItems[4].nativeElement).marginLeft).toBe(margin60);
816+
expect(getComputedStyle(columnItems[5].nativeElement).marginLeft).toBe(margin60);
817+
expect(getComputedStyle(columnItems[6].nativeElement).marginLeft).toBe(margin0);
820818
});
821819

822820
it('checks & hides all children when hiding their parent.', fakeAsync(() => {

projects/igniteui-angular/src/lib/progressbar/circularbar.component.spec.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ describe('IgCircularBar', () => {
146146
}));
147147

148148
it('Should update value when we try to decrease it (without animation)', () => {
149+
pending('Related to the bug #6740');
149150
const fixture = TestBed.createComponent(CircularBarComponent);
150151
fixture.detectChanges();
151152

@@ -221,6 +222,7 @@ describe('IgCircularBar', () => {
221222
}));
222223

223224
it('Value should not exceed the max limit when operating with floating numbers', fakeAsync(() => {
225+
pending('Related to the bug #6740');
224226
const fix = TestBed.createComponent(CircularBarComponent);
225227
const compInstance = fix.componentInstance;
226228
let value = 2.67;
@@ -305,6 +307,7 @@ describe('IgCircularBar', () => {
305307
}));
306308

307309
it('should apply its template correctly', () => {
310+
pending('Related to the bug #6740');
308311
const fixture = TestBed.createComponent(CircularBarTemplateComponent);
309312
fixture.detectChanges();
310313

projects/igniteui-angular/src/lib/progressbar/linearbar.component.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ describe('IgLinearBar', () => {
172172
}));
173173

174174
it('Should update value when we try to decrease it (without animation)', () => {
175+
pending('Related to the bug #6740');
175176
const fixture = TestBed.createComponent(LinearBarComponent);
176177
const progressBar = fixture.componentInstance.progressbar;
177178
let expectedValue = 50;
@@ -246,6 +247,7 @@ describe('IgLinearBar', () => {
246247
}));
247248

248249
it('Value should not exceed the max limit when operating with floating numbers', fakeAsync(() => {
250+
pending('Related to the bug #6740');
249251
const fix = TestBed.createComponent(LinearBarComponent);
250252
const compInstance = fix.componentInstance;
251253
let value = 2.67;

0 commit comments

Comments
 (0)