Skip to content

Commit 1333af6

Browse files
committed
Merge branch 'master' into vslavov/transaction-refactor-migrations
2 parents 0dcbed5 + 3d9502f commit 1333af6

File tree

3 files changed

+66
-9
lines changed

3 files changed

+66
-9
lines changed

projects/igniteui-angular/migrations/update-12_1_0/changes/classes.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
{
1616
"name": "IgxGridExpandableCellComponent",
1717
"replaceWith": "CellType"
18+
},
19+
{
20+
"name": "IComboSelectionChangeEventArgs",
21+
"replaceWith": "IComboSelectionChangingEventArgs"
22+
},
23+
{
24+
"name": "AutocompleteItemSelectionEventArgs",
25+
"replaceWith": "AutocompleteSelectionChangingEventArgs"
1826
}
1927
]
20-
}
28+
}

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

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,55 @@ public onBannerOpened(event: BannerEventArgs) {
766766
public IgxGridTransaction!: IgxGridComponent;
767767
}`);
768768
});
769-
});
770769

770+
it('Should properly rename IComboSelectionChangeEventArgs to IComboSelectionChangingEventArgs', async () => {
771+
appTree.create('/testSrc/appPrefix/component/test.component.ts',
772+
`
773+
import { IComboSelectionChangeEventArgs } from 'igniteui-angular';
774+
export class MyClass {
775+
public eventArgs: IComboSelectionChangeEventArgs;
776+
}
777+
`);
778+
779+
const tree = await schematicRunner
780+
.runSchematicAsync(migrationName, {}, appTree)
781+
.toPromise();
782+
783+
expect(
784+
tree.readContent('/testSrc/appPrefix/component/test.component.ts')
785+
).toEqual(
786+
`
787+
import { IComboSelectionChangingEventArgs } from 'igniteui-angular';
788+
export class MyClass {
789+
public eventArgs: IComboSelectionChangingEventArgs;
790+
}
791+
`
792+
);
793+
});
794+
795+
it('Should properly rename AutocompleteItemSelectionEventArgs to AutocompleteSelectionChangingEventArgs', async () => {
796+
appTree.create('/testSrc/appPrefix/component/test.component.ts',
797+
`
798+
import { AutocompleteItemSelectionEventArgs } from 'igniteui-angular';
799+
export class MyClass {
800+
public eventArgs: AutocompleteItemSelectionEventArgs;
801+
}
802+
`);
803+
804+
const tree = await schematicRunner
805+
.runSchematicAsync(migrationName, {}, appTree)
806+
.toPromise();
807+
808+
expect(
809+
tree.readContent('/testSrc/appPrefix/component/test.component.ts')
810+
).toEqual(
811+
`
812+
import { AutocompleteSelectionChangingEventArgs } from 'igniteui-angular';
813+
export class MyClass {
814+
public eventArgs: AutocompleteSelectionChangingEventArgs;
815+
}
816+
`
817+
);
818+
});
819+
});
771820

projects/igniteui-angular/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,25 +66,25 @@
6666
"csv export"
6767
],
6868
"dependencies": {
69-
"@types/hammerjs": "^2.0.36",
69+
"@types/hammerjs": "^2.0.40",
7070
"hammerjs": "^2.0.8",
7171
"jszip": "^3.6.0",
7272
"tslib": "^2.0.0",
7373
"@juggle/resize-observer": "^3.3.0",
7474
"igniteui-trial-watermark": "^1.0.3",
7575
"lodash.mergewith": "^4.6.2",
7676
"uuid": "^8.3.0",
77-
"@igniteui/material-icons-extended": "^2.7.0"
77+
"@igniteui/material-icons-extended": "^2.8.0"
7878
},
7979
"peerDependencies": {
80-
"@angular/common": "^12.0.0",
81-
"@angular/core": "^12.0.0",
82-
"@angular/animations": "^12.0.0",
83-
"@angular/forms": "^12.0.0",
80+
"@angular/common": "^12.1.1",
81+
"@angular/core": "^12.1.1",
82+
"@angular/animations": "^12.1.1",
83+
"@angular/forms": "^12.1.1",
8484
"web-animations-js": "^2.3.2"
8585
},
8686
"igxDevDependencies": {
87-
"@igniteui/angular-schematics": "~12.0.800"
87+
"@igniteui/angular-schematics": "~12.1.810-beta.0"
8888
},
8989
"ng-update": {
9090
"migrations": "./migrations/migration-collection.json"

0 commit comments

Comments
 (0)