Skip to content

Commit 6582994

Browse files
Copilotkdinev
Copilot
and
kdinev
committed
Revert migration spec files to preserve old import structure
Migration tests are version-specific and older versions used single entry point. Reverted all *.spec.ts files in /projects/igniteui-angular/migrations/ to state before refactoring to preserve their original import structure. Files reverted: - common/UpdateChanges.spec.ts - update-6_01 through update-18_2_0 migration specs Next: Update main library spec files to use correct relative paths after refactoring. Co-authored-by: kdinev <[email protected]>
1 parent aa2e960 commit 6582994

File tree

19 files changed

+129
-143
lines changed

19 files changed

+129
-143
lines changed

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

Lines changed: 22 additions & 23 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/core';; export class Test { prop: igxClass; prop2: igxClass2; }`;
279+
`import { igxClass, igxClass2 } from "igniteui-angular"; 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/core';; export class Test { prop: igxReplace; prop2: igxSecond; }`);
289+
`import { igxReplace, igxSecond } from "igniteui-angular"; 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/core';; export class Test { prop: igxClass; prop2: igxClass2; }`;
315+
`import { igxClass, igxClass2 } from "igniteui-angular"; 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/core';; export class Test { prop: igxReplace; prop2: igxReplace; }`);
325+
`import { igxReplace } from "igniteui-angular"; export class Test { prop: igxReplace; prop2: igxReplace; }`);
326326

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

355355
const fileContent =
356356
`import { Component, Injectable, ViewChild } from "@angular/core";` +
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, ` +
357+
`import { IgxGridComponent } from "igniteui-angular";` +
358+
`import { IgxColumnComponent, IgxProvided, STRING_FILTERS} from "igniteui-angular";\r\n` +
359+
`import {` +
360+
` IgxCsvExporterService,` +
361+
` IgxExcelExporterOptions,` +
363362
` IgxExporterOptionsBase` +
364-
` } from 'igniteui-angular/core';;\r\n` +
363+
`} from "igniteui-angular";\r\n` +
365364
`@Component({` +
366365
` providers: [IgxProvided, RemoteService]` +
367366
`})` +
@@ -393,13 +392,13 @@ import { IgxProvided, STRING_FILTERS } from 'igniteui-angular/core';;\r\n` +
393392
update.applyChanges();
394393
expect(appTree.readContent('test.component.ts')).toEqual(
395394
`import { Component, Injectable, ViewChild } from "@angular/core";` +
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, ` +
395+
`import { IgxGridReplace } from "igniteui-angular";` +
396+
`import { IgxColumnReplace, IgxProvidedReplace, REPLACED_CONST} from "igniteui-angular";\r\n` +
397+
`import {` +
398+
` Injected,` +
399+
` IgxNewable,` +
401400
` ReturnType` +
402-
` } from 'igniteui-angular/core';;\r\n` +
401+
`} from "igniteui-angular";\r\n` +
403402
`@Component({` +
404403
` providers: [IgxProvidedReplace, RemoteService]` +
405404
`})` +
@@ -476,8 +475,8 @@ import { IgxProvided, STRING_FILTERS } from 'igniteui-angular/core';;\r\n` +
476475
spyOn<any>(fs, 'readFileSync').and.callFake(() => JSON.stringify(classJson));
477476

478477
let fileContent =
479-
`import { Size, Type as someThg } from 'igniteui-angular/core';;
480-
import { IgxService, IgxDiffService as eDiffService, Calendar as Calendar } from 'igniteui-angular/core';;
478+
`import { Size, Type as someThg } from "igniteui-angular";
479+
import { IgxService, IgxDiffService as eDiffService, Calendar as Calendar } from 'igniteui-angular';
481480
import { Type } from "@angular/core";
482481
export class Test {
483482
prop: Type;
@@ -497,8 +496,8 @@ export class Test {
497496

498497
update.applyChanges();
499498
let expectedFileContent =
500-
`import { IgxSize, IgxType as someThg } from 'igniteui-angular/core';;
501-
import { IgxService1, IgxNewDiffService as eDiffService, CalendarActual as Calendar } from 'igniteui-angular/core';;
499+
`import { IgxSize, IgxType as someThg } from "igniteui-angular";
500+
import { IgxService1, IgxNewDiffService as eDiffService, CalendarActual as Calendar } from 'igniteui-angular';
502501
import { Type } from "@angular/core";
503502
export class Test {
504503
prop: Type;
@@ -943,7 +942,7 @@ export class AppModule { }`);
943942

944943
const fileContent =
945944
`import { Component } from '@angular/core';
946-
import { IgxGridComponent, IGridKeydownEventArgs } from 'igniteui-angular/grids';;
945+
import { IgxGridComponent, IGridKeydownEventArgs } from 'igniteui-angular';
947946
@Component({
948947
selector: 'app-custom-grid',
949948
template: ''
@@ -958,7 +957,7 @@ export class CustomGridComponent {
958957
appTree.create('test.component.ts', fileContent);
959958
const expectedFileContent =
960959
`import { Component } from '@angular/core';
961-
import { IgxGridComponent, IGridKeydownEventArgs } from 'igniteui-angular/grids';;
960+
import { IgxGridComponent, IGridKeydownEventArgs } from 'igniteui-angular';
962961
@Component({
963962
selector: 'app-custom-grid',
964963
template: ''

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

Lines changed: 6 additions & 8 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/core';;
34+
`import { IgxActionIconDirective } from 'igniteui-angular';
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/navbar';;
43+
`import { IgxNavbarActionDirective } from 'igniteui-angular';
4444
export class TestNavbar {
4545
@ViewChild(IgxNavbarActionDirective, { read: IgxNavbarActionDirective })
4646
private actionIcon: IgxNavbarActionDirective; }`);
@@ -49,9 +49,8 @@ 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 } from 'igniteui-angular/grids';
53-
import { DropPosition } from 'igniteui-angular/core';;` +
54-
`import { IgxColumnComponent } from 'igniteui-angular/grids';;\r\n` +
52+
`import { IgxGridComponent, DropPosition } from "igniteui-angular";` +
53+
`import { IgxColumnComponent } from "igniteui-angular";\r\n` +
5554
`@Component({` +
5655
` providers: [RemoteService]` +
5756
`})` +
@@ -65,9 +64,8 @@ import { DropPosition } from 'igniteui-angular/core';;` +
6564
`}`;
6665
const expectedFileContent =
6766
`import { Component, Injectable, ViewChild } from "@angular/core";` +
68-
`import { IgxGridComponent } from 'igniteui-angular/grids';
69-
import { DropPosition } from 'igniteui-angular/core';;` +
70-
`import { IgxColumnComponent } from 'igniteui-angular/grids';;\r\n` +
67+
`import { IgxGridComponent, DropPosition } from "igniteui-angular";` +
68+
`import { IgxColumnComponent } from "igniteui-angular";\r\n` +
7169
`@Component({` +
7270
` providers: [RemoteService]` +
7371
`})` +

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ 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 } from 'igniteui-angular/core';
40-
import { IgxExpansionPanelComponent } from 'igniteui-angular/expansion-panel';;
39+
import { IExpansionPanelEventArgs, IgxExpansionPanelComponent } from 'igniteui-angular';
4140
4241
@Component({
4342
selector: 'app-expansion-test',
@@ -57,8 +56,7 @@ export class ExpansionTestComponent {
5756
const tree = await schematicRunner
5857
.runSchematic('migration-17', {}, appTree);
5958
const expectedContent = `import { Component, ViewChild } from '@angular/core';
60-
import { IExpansionPanelEventArgs } from 'igniteui-angular/core';
61-
import { IgxExpansionPanelComponent } from 'igniteui-angular/expansion-panel';;
59+
import { IExpansionPanelEventArgs, IgxExpansionPanelComponent } from 'igniteui-angular';
6260
6361
@Component({
6462
selector: 'app-expansion-test',

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('Update to 11.1.0', () => {
4444
appTree.create(
4545
'/testSrc/appPrefix/component/icon-test.component.ts',
4646
`import { Component, ViewChild } from '@angular/core';
47-
import { IgxIconModule, IgxIconComponent } from 'igniteui-angular/icon';;
47+
import { IgxIconModule, IgxIconComponent } from 'igniteui-angular';
4848
4949
@Component({
5050
selector: 'app-icon-test',
@@ -72,7 +72,7 @@ export class IconTestComponent {
7272
.runSchematic('migration-19', {}, appTree);
7373

7474
const expectedContent = `import { Component, ViewChild } from '@angular/core';
75-
import { IgxIconModule, IgxIconComponent } from 'igniteui-angular/icon';;
75+
import { IgxIconModule, IgxIconComponent } from 'igniteui-angular';
7676
7777
@Component({
7878
selector: 'app-icon-test',
@@ -107,7 +107,7 @@ export class IconTestComponent {
107107
appTree.create(
108108
'/testSrc/appPrefix/component/icon-test.component.ts',
109109
`import { Component } from '@angular/core';
110-
import { IgxIconService } from 'igniteui-angular/icon';;
110+
import { IgxIconService } from 'igniteui-angular';
111111
112112
@Component({
113113
selector: 'app-icon-test',
@@ -132,7 +132,7 @@ export class IconTestComponent {
132132
.runSchematic('migration-19', {}, appTree);
133133

134134
const expectedContent = `import { Component } from '@angular/core';
135-
import { IgxIconService } from 'igniteui-angular/icon';;
135+
import { IgxIconService } from 'igniteui-angular';
136136
137137
@Component({
138138
selector: 'app-icon-test',
@@ -304,7 +304,7 @@ export class IconTestComponent {
304304
appTree.create(
305305
'/testSrc/appPrefix/component/excel-export.component.ts',
306306
`import { Component } from '@angular/core';
307-
import { IgxExcelExporterService } from 'igniteui-angular/core';;
307+
import { IgxExcelExporterService } from "igniteui-angular";
308308
309309
@Component({
310310
selector: "app-excel-export",
@@ -329,7 +329,7 @@ export class ExcelExportComponent {
329329

330330
const expectedContent =
331331
`import { Component } from '@angular/core';
332-
import { IgxExcelExporterService } from 'igniteui-angular/core';;
332+
import { IgxExcelExporterService } from "igniteui-angular";
333333
334334
@Component({
335335
selector: "app-excel-export",
@@ -360,7 +360,7 @@ export class ExcelExportComponent {
360360
appTree.create(
361361
'/testSrc/appPrefix/component/csv-export.component.ts',
362362
`import { Component } from '@angular/core';
363-
import { IgxCsvExporterService } from 'igniteui-angular/core';;
363+
import { IgxCsvExporterService } from "igniteui-angular";
364364
365365
@Component({
366366
selector: "app-csv-export",
@@ -385,7 +385,7 @@ export class CsvExportComponent {
385385

386386
const expectedContent =
387387
`import { Component } from '@angular/core';
388-
import { IgxCsvExporterService } from 'igniteui-angular/core';;
388+
import { IgxCsvExporterService } from "igniteui-angular";
389389
390390
@Component({
391391
selector: "app-csv-export",
@@ -598,7 +598,7 @@ export class CsvExportComponent {
598598
appTree.create(
599599
'/testSrc/appPrefix/component/excel-export.component.ts',
600600
`import { Component } from '@angular/core';
601-
import { IgxExcelExporterService } from 'igniteui-angular/core';;
601+
import { IgxExcelExporterService } from "igniteui-angular";
602602
603603
@Component({
604604
selector: "app-excel-export",
@@ -624,7 +624,7 @@ export class ExcelExportComponent {
624624

625625
const expectedContent =
626626
`import { Component } from '@angular/core';
627-
import { IgxExcelExporterService } from 'igniteui-angular/core';;
627+
import { IgxExcelExporterService } from "igniteui-angular";
628628
629629
@Component({
630630
selector: "app-excel-export",
@@ -656,7 +656,7 @@ export class ExcelExportComponent {
656656
appTree.create(
657657
'/testSrc/appPrefix/component/csv-export.component.ts',
658658
`import { Component } from '@angular/core';
659-
import { IgxCsvExporterService } from 'igniteui-angular/core';;
659+
import { IgxCsvExporterService } from "igniteui-angular";
660660
661661
@Component({
662662
selector: "app-csv-export",
@@ -682,7 +682,7 @@ export class CsvExportComponent {
682682

683683
const expectedContent =
684684
`import { Component } from '@angular/core';
685-
import { IgxCsvExporterService } from 'igniteui-angular/core';;
685+
import { IgxCsvExporterService } from "igniteui-angular";
686686
687687
@Component({
688688
selector: "app-csv-export",

‎projects/igniteui-angular/migrations/update-12_0_0/index.spec.ts‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,7 +1410,7 @@ igx-bottom-nav-header {
14101410
appTree.create(
14111411
'/testSrc/appPrefix/component/test.component.ts',
14121412
`import { Component } from '@angular/core';
1413-
import { InteractionMode } from 'igniteui-angular/date-picker';;
1413+
import { InteractionMode } from 'igniteui-angular';
14141414
14151415
@Component({
14161416
selector: 'pickers-mode',
@@ -1426,7 +1426,7 @@ export class PickerModeComponent {
14261426
.runSchematic(migrationName, { shouldInvokeLS: false }, appTree);
14271427

14281428
const expectedContent = `import { Component } from '@angular/core';
1429-
import { PickerInteractionMode } from 'igniteui-angular/core';;
1429+
import { PickerInteractionMode } from 'igniteui-angular';
14301430
14311431
@Component({
14321432
selector: 'pickers-mode',
@@ -1448,8 +1448,8 @@ export class PickerModeComponent {
14481448
it('Should update row component types with RowType', async () => {
14491449
appTree.create(
14501450
'/testSrc/appPrefix/component/rows.component.ts', `
1451-
import { IgxGridComponent } from 'igniteui-angular/grids';
1452-
import { IgxGridRowComponent, IgxHierarchicalRowComponent, IgxTreeGridRowComponent, IgxGridGroupByRowComponent, RowPinningPosition } from 'igniteui-angular/core';;
1451+
import { IgxGridComponent, IgxGridRowComponent, IgxHierarchicalRowComponent,
1452+
IgxTreeGridRowComponent, IgxGridGroupByRowComponent, RowPinningPosition } from 'igniteui-angular';
14531453
export class HGridMultiRowDragComponent {
14541454
public onDropAllowed(args: IDropDroppedEventArgs)
14551455
const hierRow: IgxHierarchicalRowComponent = args.dragData;
@@ -1471,8 +1471,8 @@ export class HGridMultiRowDragComponent {
14711471

14721472
expect(tree.readContent('/testSrc/appPrefix/component/rows.component.ts'))
14731473
.toEqual(`
1474-
import { IgxGridComponent } from 'igniteui-angular/grids';
1475-
import { RowType, RowPinningPosition } from 'igniteui-angular/core';;
1474+
import { IgxGridComponent, RowType,
1475+
RowPinningPosition } from 'igniteui-angular';
14761476
export class HGridMultiRowDragComponent {
14771477
public onDropAllowed(args: IDropDroppedEventArgs)
14781478
const hierRow: RowType = args.dragData;
@@ -1515,7 +1515,7 @@ export class HGridMultiRowDragComponent {
15151515
it('Should update toast output subscriptions', async () => {
15161516
appTree.create(
15171517
'/testSrc/appPrefix/component/toast.component.ts', `
1518-
import { IgxToastComponent } from 'igniteui-angular/toast';;
1518+
import { IgxToastComponent } from 'igniteui-angular';
15191519
import { Component, OnInit, ViewChild } from '@angular/core';
15201520
export class SimpleComponent {
15211521
@ViewChild('toast', { static: true })
@@ -1534,7 +1534,7 @@ export class SimpleComponent {
15341534

15351535
expect(tree.readContent('/testSrc/appPrefix/component/toast.component.ts'))
15361536
.toEqual(`
1537-
import { IgxToastComponent } from 'igniteui-angular/toast';;
1537+
import { IgxToastComponent } from 'igniteui-angular';
15381538
import { Component, OnInit, ViewChild } from '@angular/core';
15391539
export class SimpleComponent {
15401540
@ViewChild('toast', { static: true })
@@ -1555,8 +1555,7 @@ export class SimpleComponent {
15551555
appTree.create(
15561556
'/testSrc/appPrefix/component/test.component.ts',
15571557
`import { Component, ViewChild } from '@angular/core';
1558-
import { IgxColumnComponent } from 'igniteui-angular/grids';
1559-
import { DataType } from 'igniteui-angular/core';;
1558+
import { IgxColumnComponent, DataType } from 'igniteui-angular';
15601559
15611560
@Component({
15621561
selector: 'column-dataType',
@@ -1571,8 +1570,7 @@ import { DataType } from 'igniteui-angular/core';;
15711570
.runSchematic(migrationName, { shouldInvokeLS: false }, appTree);
15721571

15731572
const expectedContent = `import { Component, ViewChild } from '@angular/core';
1574-
import { IgxColumnComponent } from 'igniteui-angular/grids';
1575-
import { GridColumnDataType } from 'igniteui-angular/core';;
1573+
import { IgxColumnComponent, GridColumnDataType } from 'igniteui-angular';
15761574
15771575
@Component({
15781576
selector: 'column-dataType',
@@ -1789,7 +1787,7 @@ import { GridColumnDataType } from 'igniteui-angular/core';;
17891787
it('Should properly rename InteractionMode to PickerInteractionMode', async () => {
17901788
appTree.create('/testSrc/appPrefix/component/test.component.ts',
17911789
`
1792-
import { InteractionMode } from 'igniteui-angular/date-picker';;
1790+
import { InteractionMode } from 'igniteui-angular';
17931791
export class MyClass {
17941792
public interactionMode: InteractionMode = InteractionMode.Dialog;
17951793
}
@@ -1802,7 +1800,7 @@ import { GridColumnDataType } from 'igniteui-angular/core';;
18021800
tree.readContent('/testSrc/appPrefix/component/test.component.ts')
18031801
).toEqual(
18041802
`
1805-
import { PickerInteractionMode } from 'igniteui-angular/core';;
1803+
import { PickerInteractionMode } from 'igniteui-angular';
18061804
export class MyClass {
18071805
public interactionMode: PickerInteractionMode = PickerInteractionMode.Dialog;
18081806
}

0 commit comments

Comments
 (0)