Skip to content

Commit aa2e960

Browse files
Copilotkdinev
andcommitted
Addressing PR comments
Co-authored-by: kdinev <[email protected]>
1 parent 02399ef commit aa2e960

File tree

29 files changed

+166
-139
lines changed

29 files changed

+166
-139
lines changed

projects/igniteui-angular/date-picker/src/date-range-picker/predefined-ranges/predefined-ranges-area-component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { CalendarDay } from '../../calendar/common/model';
66
import { CustomDateRange } from '../date-range-picker-inputs.common';
77
import { IDateRangePickerResourceStrings } from '../../core/i18n/date-range-picker-resources';
88
import { IgxChipComponent } from '../../chips/chip.component';
9-
import { IgxChipsModule } from 'igniteui-angular';
9+
import { IgxChipsModule } from 'igniteui-angular/chips';;
1010
import { Component, ViewChild } from '@angular/core';
1111

1212
describe('IgxPredefinedRangesAreaComponent', () => {

projects/igniteui-angular/grids/src/grids/grid/cell-merge.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { Component, TemplateRef, ViewChild } from '@angular/core';
22
import { TestBed, waitForAsync } from '@angular/core/testing';
33
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
4-
import { ByLevelTreeGridMergeStrategy, DefaultMergeStrategy, DefaultSortingStrategy, GridCellMergeMode, GridColumnDataType, GridTypeBase, IgxColumnComponent, IgxGridComponent, IgxHierarchicalGridComponent, IgxPaginatorComponent, IgxStringFilteringOperand, Size, SortingDirection } from 'igniteui-angular';
4+
import { ByLevelTreeGridMergeStrategy, DefaultMergeStrategy, DefaultSortingStrategy, GridCellMergeMode, GridColumnDataType, GridTypeBase, IgxStringFilteringOperand, Size, SortingDirection } from 'igniteui-angular/core';
5+
import { IgxColumnComponent, IgxGridComponent, IgxHierarchicalGridComponent } from 'igniteui-angular/grids';
6+
import { IgxPaginatorComponent } from 'igniteui-angular/paginator';;
57
import { DataParent } from '../../test-utils/sample-test-data.spec';
68
import { GridFunctions, GridSelectionFunctions } from '../../test-utils/grid-functions.spec';
79
import { By } from '@angular/platform-browser';

projects/igniteui-angular/grids/src/grids/pivot-grid/pivot-grid-keyboard-nav.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { IgxPivotGridComponent } from './pivot-grid.component';
88
import { IgxPivotRowDimensionHeaderComponent } from './pivot-row-dimension-header.component';
99
import { DebugElement } from '@angular/core';
1010
import { IgxPivotHeaderRowComponent } from './pivot-header-row.component';
11-
import { PivotRowLayoutType } from 'igniteui-angular';
11+
import { PivotRowLayoutType } from 'igniteui-angular/core';;
1212

1313
const DEBOUNCE_TIME = 250;
1414
const PIVOT_TBODY_CSS_CLASS = '.igx-grid__tbody';

projects/igniteui-angular/grids/src/grids/pivot-grid/pivot-grid.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
22
import { By } from '@angular/platform-browser';
33
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
4-
import { FilteringExpressionsTree, FilteringLogic, GridColumnDataType, IGridCellEventArgs, IgxGridCell, IgxIconComponent, IgxPivotGridComponent, IgxStringFilteringOperand } from 'igniteui-angular';
4+
import { FilteringExpressionsTree, FilteringLogic, GridColumnDataType, IGridCellEventArgs, IgxGridCell, IgxStringFilteringOperand } from 'igniteui-angular/core';
5+
import { IgxIconComponent } from 'igniteui-angular/icon';
6+
import { IgxPivotGridComponent } from 'igniteui-angular/grids';;
57
import { IgxChipComponent } from '../../chips/chip.component';
68
import { IgxChipsAreaComponent } from '../../chips/chips-area.component';
79
import { DefaultPivotSortingStrategy } from '../common/pivot-sort-strategy';

projects/igniteui-angular/grids/src/grids/tree-grid/tree-grid-grouping.pipe.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { TestBed, waitForAsync } from '@angular/core/testing';
22
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
3-
import { DefaultSortingStrategy } from 'igniteui-angular';
3+
import { DefaultSortingStrategy } from 'igniteui-angular/core';;
44
import { IGroupingExpression } from '../../data-operations/grouping-expression.interface';
55
import { SampleTestData } from '../../test-utils/sample-test-data.spec';
66
import { IgxTreeGridSimpleComponent, IgxTreeGridPrimaryForeignKeyComponent } from '../../test-utils/tree-grid-components.spec';

projects/igniteui-angular/icon/src/icon/icon.service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
77
import { Component, inject } from "@angular/core";
88
import { IgxIconComponent } from "./icon.component";
99
import { By } from "@angular/platform-browser";
10-
import { IgxTheme, THEME_TOKEN, ThemeToken } from "igniteui-angular";
10+
import { IgxTheme, THEME_TOKEN, ThemeToken } from 'igniteui-angular/core';;
1111

1212
describe("Icon Service", () => {
1313
const FAMILY: IconFamily = {

projects/igniteui-angular/input-group/src/input-group/directives-input/read-only-input.directive.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { Component, ViewChild } from '@angular/core';
22
import { TestBed, waitForAsync } from '@angular/core/testing';
33
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
44
import { IgxReadOnlyInputDirective } from './read-only-input.directive';
5-
import { IgxDatePickerComponent, IgxInputGroupComponent } from 'igniteui-angular';
5+
import { IgxDatePickerComponent } from 'igniteui-angular/date-picker';
6+
import { IgxInputGroupComponent } from 'igniteui-angular/input-group';;
67
import { By } from '@angular/platform-browser';
78

89
describe('IgxReadOnlyInputDirective', () => {

projects/igniteui-angular/migrations/common/UpdateChanges.spec.ts

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ describe('UpdateChanges', () => {
276276
spyOn<any>(fs, 'readFileSync').and.callFake(() => JSON.stringify(classJson));
277277

278278
const fileContent =
279-
`import { igxClass, igxClass2 } from "igniteui-angular"; export class Test { prop: igxClass; prop2: igxClass2; }`;
279+
`import { igxClass, igxClass2 } from 'igniteui-angular/core';; export class Test { prop: igxClass; prop2: igxClass2; }`;
280280
appTree.create('test.component.ts', fileContent);
281281

282282
const update = new UnitUpdateChanges(__dirname, appTree);
@@ -286,7 +286,7 @@ describe('UpdateChanges', () => {
286286

287287
update.applyChanges();
288288
expect(appTree.readContent('test.component.ts')).toEqual(
289-
`import { igxReplace, igxSecond } from "igniteui-angular"; export class Test { prop: igxReplace; prop2: igxSecond; }`);
289+
`import { igxReplace, igxSecond } from 'igniteui-angular/core';; export class Test { prop: igxReplace; prop2: igxSecond; }`);
290290

291291
done();
292292
});
@@ -312,7 +312,7 @@ describe('UpdateChanges', () => {
312312
spyOn<any>(fs, 'readFileSync').and.callFake(() => JSON.stringify(classJson));
313313

314314
const fileContent =
315-
`import { igxClass, igxClass2 } from "igniteui-angular"; export class Test { prop: igxClass; prop2: igxClass2; }`;
315+
`import { igxClass, igxClass2 } from 'igniteui-angular/core';; export class Test { prop: igxClass; prop2: igxClass2; }`;
316316
appTree.create('test.component.ts', fileContent);
317317

318318
const update = new UnitUpdateChanges(__dirname, appTree);
@@ -322,7 +322,7 @@ describe('UpdateChanges', () => {
322322

323323
update.applyChanges();
324324
expect(appTree.readContent('test.component.ts')).toEqual(
325-
`import { igxReplace } from "igniteui-angular"; export class Test { prop: igxReplace; prop2: igxReplace; }`);
325+
`import { igxReplace } from 'igniteui-angular/core';; export class Test { prop: igxReplace; prop2: igxReplace; }`);
326326

327327
done();
328328
});
@@ -354,13 +354,14 @@ describe('UpdateChanges', () => {
354354

355355
const fileContent =
356356
`import { Component, Injectable, ViewChild } from "@angular/core";` +
357-
`import { IgxGridComponent } from "igniteui-angular";` +
358-
`import { IgxColumnComponent, IgxProvided, STRING_FILTERS} from "igniteui-angular";\r\n` +
359-
`import {` +
360-
` IgxCsvExporterService,` +
361-
` IgxExcelExporterOptions,` +
357+
`import { IgxGridComponent } from 'igniteui-angular/grids';;` +
358+
`import { IgxColumnComponent } from 'igniteui-angular/grids';
359+
import { IgxProvided, STRING_FILTERS } from 'igniteui-angular/core';;\r\n` +
360+
`import { ` +
361+
` IgxCsvExporterService, ` +
362+
` IgxExcelExporterOptions, ` +
362363
` IgxExporterOptionsBase` +
363-
`} from "igniteui-angular";\r\n` +
364+
` } from 'igniteui-angular/core';;\r\n` +
364365
`@Component({` +
365366
` providers: [IgxProvided, RemoteService]` +
366367
`})` +
@@ -392,13 +393,13 @@ describe('UpdateChanges', () => {
392393
update.applyChanges();
393394
expect(appTree.readContent('test.component.ts')).toEqual(
394395
`import { Component, Injectable, ViewChild } from "@angular/core";` +
395-
`import { IgxGridReplace } from "igniteui-angular";` +
396-
`import { IgxColumnReplace, IgxProvidedReplace, REPLACED_CONST} from "igniteui-angular";\r\n` +
397-
`import {` +
398-
` Injected,` +
399-
` IgxNewable,` +
396+
`import { IgxGridReplace } from 'igniteui-angular/core';;` +
397+
`import { IgxColumnReplace, IgxProvidedReplace, REPLACED_CONST } from 'igniteui-angular/core';;\r\n` +
398+
`import { ` +
399+
` Injected, ` +
400+
` IgxNewable, ` +
400401
` ReturnType` +
401-
`} from "igniteui-angular";\r\n` +
402+
` } from 'igniteui-angular/core';;\r\n` +
402403
`@Component({` +
403404
` providers: [IgxProvidedReplace, RemoteService]` +
404405
`})` +
@@ -475,8 +476,8 @@ describe('UpdateChanges', () => {
475476
spyOn<any>(fs, 'readFileSync').and.callFake(() => JSON.stringify(classJson));
476477

477478
let fileContent =
478-
`import { Size, Type as someThg } from "igniteui-angular";
479-
import { IgxService, IgxDiffService as eDiffService, Calendar as Calendar } from 'igniteui-angular';
479+
`import { Size, Type as someThg } from 'igniteui-angular/core';;
480+
import { IgxService, IgxDiffService as eDiffService, Calendar as Calendar } from 'igniteui-angular/core';;
480481
import { Type } from "@angular/core";
481482
export class Test {
482483
prop: Type;
@@ -496,8 +497,8 @@ export class Test {
496497

497498
update.applyChanges();
498499
let expectedFileContent =
499-
`import { IgxSize, IgxType as someThg } from "igniteui-angular";
500-
import { IgxService1, IgxNewDiffService as eDiffService, CalendarActual as Calendar } from 'igniteui-angular';
500+
`import { IgxSize, IgxType as someThg } from 'igniteui-angular/core';;
501+
import { IgxService1, IgxNewDiffService as eDiffService, CalendarActual as Calendar } from 'igniteui-angular/core';;
501502
import { Type } from "@angular/core";
502503
export class Test {
503504
prop: Type;
@@ -942,7 +943,7 @@ export class AppModule { }`);
942943

943944
const fileContent =
944945
`import { Component } from '@angular/core';
945-
import { IgxGridComponent, IGridKeydownEventArgs } from 'igniteui-angular';
946+
import { IgxGridComponent, IGridKeydownEventArgs } from 'igniteui-angular/grids';;
946947
@Component({
947948
selector: 'app-custom-grid',
948949
template: ''
@@ -957,7 +958,7 @@ export class CustomGridComponent {
957958
appTree.create('test.component.ts', fileContent);
958959
const expectedFileContent =
959960
`import { Component } from '@angular/core';
960-
import { IgxGridComponent, IGridKeydownEventArgs } from 'igniteui-angular';
961+
import { IgxGridComponent, IGridKeydownEventArgs } from 'igniteui-angular/grids';;
961962
@Component({
962963
selector: 'app-custom-grid',
963964
template: ''

projects/igniteui-angular/migrations/update-10_1_0/index.spec.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe('Update 10.1.0', () => {
3131

3232
it('should update IgxActionIconDirective to IgxNavbarActionDirective', async () => {
3333
appTree.create('/testSrc/appPrefix/component/custom.component.ts',
34-
`import { IgxActionIconDirective } from 'igniteui-angular';
34+
`import { IgxActionIconDirective } from 'igniteui-angular/core';;
3535
export class TestNavbar {
3636
@ViewChild(IgxActionIconDirective, { read: IgxActionIconDirective })
3737
private actionIcon: IgxActionIconDirective; }`);
@@ -40,7 +40,7 @@ describe('Update 10.1.0', () => {
4040

4141
expect(tree.readContent('/testSrc/appPrefix/component/custom.component.ts'))
4242
.toEqual(
43-
`import { IgxNavbarActionDirective } from 'igniteui-angular';
43+
`import { IgxNavbarActionDirective } from 'igniteui-angular/navbar';;
4444
export class TestNavbar {
4545
@ViewChild(IgxNavbarActionDirective, { read: IgxNavbarActionDirective })
4646
private actionIcon: IgxNavbarActionDirective; }`);
@@ -49,8 +49,9 @@ describe('Update 10.1.0', () => {
4949
it('should update DropPosition.None', async () => {
5050
const origFileContent =
5151
`import { Component, Injectable, ViewChild } from "@angular/core";` +
52-
`import { IgxGridComponent, DropPosition } from "igniteui-angular";` +
53-
`import { IgxColumnComponent } from "igniteui-angular";\r\n` +
52+
`import { IgxGridComponent } from 'igniteui-angular/grids';
53+
import { DropPosition } from 'igniteui-angular/core';;` +
54+
`import { IgxColumnComponent } from 'igniteui-angular/grids';;\r\n` +
5455
`@Component({` +
5556
` providers: [RemoteService]` +
5657
`})` +
@@ -64,8 +65,9 @@ describe('Update 10.1.0', () => {
6465
`}`;
6566
const expectedFileContent =
6667
`import { Component, Injectable, ViewChild } from "@angular/core";` +
67-
`import { IgxGridComponent, DropPosition } from "igniteui-angular";` +
68-
`import { IgxColumnComponent } from "igniteui-angular";\r\n` +
68+
`import { IgxGridComponent } from 'igniteui-angular/grids';
69+
import { DropPosition } from 'igniteui-angular/core';;` +
70+
`import { IgxColumnComponent } from 'igniteui-angular/grids';;\r\n` +
6971
`@Component({` +
7072
` providers: [RemoteService]` +
7173
`})` +

projects/igniteui-angular/migrations/update-10_2_0/index.spec.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ describe('Update 10.2.0', () => {
3636
appTree.create(
3737
'/testSrc/appPrefix/component/expansion-test.component.ts',
3838
`import { Component, ViewChild } from '@angular/core';
39-
import { IExpansionPanelEventArgs, IgxExpansionPanelComponent } from 'igniteui-angular';
39+
import { IExpansionPanelEventArgs } from 'igniteui-angular/core';
40+
import { IgxExpansionPanelComponent } from 'igniteui-angular/expansion-panel';;
4041
4142
@Component({
4243
selector: 'app-expansion-test',
@@ -56,7 +57,8 @@ export class ExpansionTestComponent {
5657
const tree = await schematicRunner
5758
.runSchematic('migration-17', {}, appTree);
5859
const expectedContent = `import { Component, ViewChild } from '@angular/core';
59-
import { IExpansionPanelEventArgs, IgxExpansionPanelComponent } from 'igniteui-angular';
60+
import { IExpansionPanelEventArgs } from 'igniteui-angular/core';
61+
import { IgxExpansionPanelComponent } from 'igniteui-angular/expansion-panel';;
6062
6163
@Component({
6264
selector: 'app-expansion-test',

0 commit comments

Comments
 (0)