Skip to content

Commit b90f785

Browse files
authored
Merge branch 'master' into mkirova/fix-6731
2 parents 6d410ca + 8876925 commit b90f785

File tree

13 files changed

+3596
-5738
lines changed

13 files changed

+3596
-5738
lines changed

projects/igniteui-angular/src/lib/combo/combo.component.spec.ts

+1,904-2,994
Large diffs are not rendered by default.

projects/igniteui-angular/src/lib/core/styles/components/carousel/_carousel-theme.scss

+2
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,8 @@
303303
overflow: hidden;
304304
outline-style: none;
305305
border-radius: --var($theme, 'border-radius');
306+
min-height: 300px;
307+
min-width: 300px;
306308
}
307309

308310
%igx-carousel-slide {

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_toast.scss

+4
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ $_bootstrap-toast: extend(
5656
(
5757
variant: 'bootstrap',
5858
background: #fff,
59+
60+
text-color: (
61+
igx-color: ('grays', 600)
62+
)
5963
)
6064
);
6165

projects/igniteui-angular/src/lib/drop-down/drop-down.component.spec.ts

+1,073-1,907
Large diffs are not rendered by default.

projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts

+356-556
Large diffs are not rendered by default.

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

+15-5
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,15 @@ describe('IgCircularBar', () => {
146146
}));
147147

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

153152
const progressBar = fixture.componentInstance.progressbar;
154153
let expectedValue = 50;
155154

156155
fixture.componentInstance.animate = false;
156+
fixture.detectChanges();
157+
157158
fixture.componentInstance.value = expectedValue;
158159
fixture.detectChanges();
159160

@@ -202,7 +203,12 @@ describe('IgCircularBar', () => {
202203
it('Value should not exceed the lower limit (0) when operating with floating numbers', fakeAsync(() => {
203204
const fix = TestBed.createComponent(CircularBarComponent);
204205
const compInstance = fix.componentInstance;
206+
fix.detectChanges();
207+
tick(tickTime);
208+
205209
compInstance.max = 2.5;
210+
fix.detectChanges();
211+
206212
compInstance.value = -0.3;
207213
fix.detectChanges();
208214

@@ -213,21 +219,24 @@ describe('IgCircularBar', () => {
213219
expect(bar.valueInPercent).toBe(expectedRes);
214220

215221
compInstance.animate = false;
216-
compInstance.value = -2;
222+
fix.detectChanges();
217223

224+
compInstance.value = -2;
218225
fix.detectChanges();
219226

220227
expect(bar.value).toBe(expectedRes);
221228
expect(bar.valueInPercent).toBe(expectedRes);
222229
}));
223230

224231
it('Value should not exceed the max limit when operating with floating numbers', fakeAsync(() => {
225-
pending('Related to the bug #6740');
226232
const fix = TestBed.createComponent(CircularBarComponent);
227233
const compInstance = fix.componentInstance;
228234
let value = 2.67;
229235
const max = 2.5;
236+
230237
compInstance.max = max;
238+
fix.detectChanges();
239+
231240
compInstance.value = value;
232241
fix.detectChanges();
233242

@@ -238,9 +247,11 @@ describe('IgCircularBar', () => {
238247

239248
value = 3.01;
240249
compInstance.animate = false;
241-
compInstance.value = value;
250+
fix.detectChanges();
242251

252+
compInstance.value = value;
243253
fix.detectChanges();
254+
244255
expect(bar.value).toBe(max);
245256
expect(bar.valueInPercent).toBe(100);
246257
}));
@@ -307,7 +318,6 @@ describe('IgCircularBar', () => {
307318
}));
308319

309320
it('should apply its template correctly', () => {
310-
pending('Related to the bug #6740');
311321
const fixture = TestBed.createComponent(CircularBarTemplateComponent);
312322
fixture.detectChanges();
313323

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

+14-5
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ describe('IgLinearBar', () => {
172172
}));
173173

174174
it('Should update value when we try to decrease it (without animation)', () => {
175-
pending('Related to the bug #6740');
176175
const fixture = TestBed.createComponent(LinearBarComponent);
177176
const progressBar = fixture.componentInstance.progressbar;
178177
let expectedValue = 50;
@@ -227,32 +226,40 @@ describe('IgLinearBar', () => {
227226
it('Value should not exceed the lower limit (0) when operating with floating numbers', fakeAsync(() => {
228227
const fix = TestBed.createComponent(LinearBarComponent);
229228
const compInstance = fix.componentInstance;
229+
fix.detectChanges();
230+
tick(tickTime);
231+
230232
compInstance.max = 2.5;
231-
compInstance.value = -0.3;
232233
fix.detectChanges();
233234

235+
compInstance.value = -0.3;
236+
fix.detectChanges();
234237
tick(tickTime);
238+
235239
const bar = compInstance.progressbar;
236240
const expectedRes = 0;
237241
expect(bar.value).toBe(expectedRes);
238242
expect(bar.valueInPercent).toBe(expectedRes);
239243

240244
compInstance.animate = false;
241-
compInstance.value = -2;
245+
fix.detectChanges();
242246

247+
compInstance.value = -2;
243248
fix.detectChanges();
244249

245250
expect(bar.value).toBe(expectedRes);
246251
expect(bar.valueInPercent).toBe(expectedRes);
247252
}));
248253

249254
it('Value should not exceed the max limit when operating with floating numbers', fakeAsync(() => {
250-
pending('Related to the bug #6740');
251255
const fix = TestBed.createComponent(LinearBarComponent);
252256
const compInstance = fix.componentInstance;
253257
let value = 2.67;
254258
const max = 2.5;
259+
255260
compInstance.max = max;
261+
fix.detectChanges();
262+
256263
compInstance.value = value;
257264
fix.detectChanges();
258265

@@ -263,9 +270,11 @@ describe('IgLinearBar', () => {
263270

264271
value = 3.01;
265272
compInstance.animate = false;
266-
compInstance.value = value;
273+
fix.detectChanges();
267274

275+
compInstance.value = value;
268276
fix.detectChanges();
277+
269278
expect(bar.value).toBe(max);
270279
expect(bar.valueInPercent).toBe(100);
271280
}));

0 commit comments

Comments
 (0)