-
Notifications
You must be signed in to change notification settings - Fork 161
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into mtihova/fix-15136-master
- Loading branch information
Showing
76 changed files
with
1,133 additions
and
562 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
projects/igniteui-angular/migrations/update-19_1_1/changes/theme-changes.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "$schema": "../../common/schema/theme-changes.schema.json", | ||
| "changes": [ | ||
| { | ||
| "name": "$progress-circle-color", | ||
| "replaceWith": "$fill-color-default", | ||
| "owner": "circular-theme", | ||
| "type": "property" | ||
| } | ||
| ] | ||
| } |
36 changes: 36 additions & 0 deletions
36
projects/igniteui-angular/migrations/update-19_1_1/index.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import * as path from 'path'; | ||
|
|
||
| import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing'; | ||
| import { setupTestTree } from '../common/setup.spec'; | ||
|
|
||
| const version = '19.1.1'; | ||
| const themes = [ | ||
| 'circular-theme' | ||
| ]; | ||
| const testFilePath = '/testSrc/appPrefix/component/${theme}.component.scss'; | ||
|
|
||
| describe(`Update to ${version}`, () => { | ||
| let appTree: UnitTestTree; | ||
| const schematicRunner = new SchematicTestRunner('ig-migrate', path.join(__dirname, '../migration-collection.json')); | ||
|
|
||
| beforeEach(() => { | ||
| appTree = setupTestTree(); | ||
| }); | ||
|
|
||
| const migrationName = 'migration-43'; | ||
|
|
||
| themes.forEach(theme => { | ||
| it('should rename the progress circle color property of the circular progress', async () => { | ||
| appTree.create( | ||
| testFilePath, | ||
| `$custom-${theme}: ${theme}($progress-circle-color: red);` | ||
| ); | ||
|
|
||
| const tree = await schematicRunner.runSchematic(migrationName, {}, appTree); | ||
|
|
||
| expect(tree.readContent(testFilePath)).toEqual( | ||
| `$custom-${theme}: ${theme}($fill-color-default: red);` | ||
| ); | ||
| }); | ||
| }); | ||
| }); |
14 changes: 14 additions & 0 deletions
14
projects/igniteui-angular/migrations/update-19_1_1/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import type { | ||
| Rule, | ||
| SchematicContext, | ||
| Tree | ||
| } from '@angular-devkit/schematics'; | ||
| import { UpdateChanges } from '../common/UpdateChanges'; | ||
|
|
||
| const version = '19.1.1'; | ||
|
|
||
| export default (): Rule => async (host: Tree, context: SchematicContext) => { | ||
| context.logger.info(`Applying migration for Ignite UI for Angular to version ${version}`); | ||
| const update = new UpdateChanges(__dirname, host, context); | ||
| update.applyChanges(); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.