File tree Expand file tree Collapse file tree 3 files changed +14
-12
lines changed
src/lib/schematics/update Expand file tree Collapse file tree 3 files changed +14
-12
lines changed Original file line number Diff line number Diff line change @@ -8,16 +8,12 @@ describe('material-nav-schematic', () => {
8
8
runner = new SchematicTestRunner ( 'schematics' , migrationCollection ) ;
9
9
} ) ;
10
10
11
- describe ( 'migration v5 to v6' , ( ) => {
12
-
13
- it ( 'should remove the temp directory' , ( ) => {
14
- const tree = runner . runSchematic ( 'migration-01' , { } , createTestApp ( ) ) ;
15
- const files = tree . files ;
16
-
17
- expect ( files . find ( file => file . includes ( 'angular_material_temp_schematics' ) ) )
18
- . toBeFalsy ( 'Expected the temporary directory for the schematics to be deleted' ) ;
19
- } ) ;
11
+ it ( 'should remove the temp directory' , ( ) => {
12
+ const tree = runner . runSchematic ( 'migration-01' , { } , createTestApp ( ) ) ;
13
+ const files = tree . files ;
20
14
15
+ expect ( files . find ( file => file . includes ( 'angular_material_temp_schematics' ) ) )
16
+ . toBeFalsy ( 'Expected the temporary directory for the schematics to be deleted' ) ;
21
17
} ) ;
22
18
23
19
} ) ;
Original file line number Diff line number Diff line change @@ -41,6 +41,7 @@ export default function(): Rule {
41
41
42
42
const allTsConfigPaths = getTsConfigPaths ( tree ) ;
43
43
const allUpdateTasks = [ ] ;
44
+
44
45
for ( const tsconfig of allTsConfigPaths ) {
45
46
// Run the update tslint rules.
46
47
allUpdateTasks . push ( context . addTask ( new TslintFixTask ( {
@@ -119,12 +120,13 @@ function getTsConfigPaths(tree: Tree): string[] {
119
120
120
121
// Add any tsconfig directly referenced in a build or test task of the angular.json workspace.
121
122
const workspace = getWorkspace ( tree ) ;
123
+
122
124
for ( const project of Object . values ( workspace . projects ) ) {
123
125
if ( project && project . architect ) {
124
126
for ( const taskName of [ 'build' , 'test' ] ) {
125
127
const task = project . architect [ taskName ] ;
126
128
if ( task && task . options && task . options . tsConfig ) {
127
- const tsConfigOption = project . architect . tsConfig ;
129
+ const tsConfigOption = task . options . tsConfig ;
128
130
if ( typeof tsConfigOption === 'string' ) {
129
131
tsconfigPaths . push ( tsConfigOption ) ;
130
132
} else if ( Array . isArray ( tsConfigOption ) ) {
Original file line number Diff line number Diff line change 131
131
},
132
132
"linterOptions" : {
133
133
// Exclude schematic template files that can't be linted.
134
- // TODO(paul) re-renable specs once the devkit schematics properly work with Bazel.
135
- "exclude" : [" src/lib/schematics/**/files/**/*" , " src/lib/schematics/**/*.spec.ts" ]
134
+ "exclude" : [
135
+ " src/lib/schematics/**/files/**/*" ,
136
+ // TODO(paul) re-renable specs once the devkit schematics properly work with Bazel and we
137
+ // can remove the `xit` calls.
138
+ " src/lib/schematics/**/*.spec.ts"
139
+ ]
136
140
}
137
141
}
You can’t perform that action at this time.
0 commit comments