Merge branch 'master' into dpetev/pickers-toggle

Author: Lipata

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

@@ -856,4 +856,51 @@ export class AppModule { }`);
             }
         });
     });
+
+    describe('Language Service migrations', () => {
+
+        it('Should be able to replace property of an event', () => {
+            pending('set up tests for migrations through lang service');
+            const membersConfig = {
+                member: 'onGridKeydown',
+                replaceWith: 'gridKeydown',
+                definedIn: [
+                    'IgxGridComponent',
+                    'IgxTreeGridComponent',
+                    'IgxHierarchicalGridComponent',
+                    'IgxRowIslandComponent'
+                ]
+            };
+            const fileContent =
+`import { Component } from '@angular/core';
+import { IGridCreatedEventArgs } from 'igniteui-angular';
+@Component({
+  selector: 'app-custom-grid',
+  template: ''
+})
+export class CustomGridComponent {
+  public childGridCreated(event: IGridCreatedEventArgs) {
+      event.grid.onGridKeydown.subscribe(() => {});
+  }
+}
+`;
+            appTree.create('test.component.ts', fileContent);
+            const expectedFileContent =
+`import { Component } from '@angular/core';
+import { IGridCreatedEventArgs } from 'igniteui-angular';
+@Component({
+  selector: 'app-custom-grid',
+  template: ''
+})
+export class CustomGridComponent {
+  public childGridCreated(event: IGridCreatedEventArgs) {
+      event.grid.gridKeydown.subscribe(() => {});
+  }
+}
+`;
+            const update = new UnitUpdateChanges(__dirname, appTree);
+            update.applyChanges();
+            expect(appTree.readContent('test.component.ts')).toEqual(expectedFileContent);
+        });
+    });
 });

projects/igniteui-angular/migrations/common/tsUtils.ts

@@ -267,7 +267,7 @@ export const getTypeDefinitionAtPosition =
             definition.name = maybeReturnType.kind === 'className' ? maybeReturnType.text : '';
             return definition;
         }
-        let typeDefs = getTypeDefinitions(langServ, entryPath, definition.textSpan.start);
+        let typeDefs = getTypeDefinitions(langServ, definition.fileName || entryPath, definition.textSpan.start);
         // if there are no type definitions found, the identifier is a ts property, referred in an internal/external template
         // or is a reference in a decorator
         if (!typeDefs) {

projects/igniteui-angular/src/lib/date-range-picker/date-range-picker.component.spec.ts

@@ -761,6 +761,7 @@ describe('IgxDateRangePicker', () => {
                 fixture = TestBed.createComponent(DateRangeTwoInputsTestComponent);
                 fixture.detectChanges();
                 dateRange = fixture.componentInstance.dateRange;
+                dateRange.value = { start: new Date('2/2/2020'), end: new Date('3/3/2020')};
                 startInput = fixture.debugElement.query(By.css('input'));
                 endInput = fixture.debugElement.queryAll(By.css('input'))[1];
                 calendar = fixture.debugElement.query(By.css(CSS_CLASS_CALENDAR));
@@ -1139,7 +1140,8 @@ describe('IgxDateRangePicker', () => {
                         DateRangeTestComponent,
                         DateRangeDefaultComponent,
                         DateRangeCustomComponent,
-                        DateRangeTemplatesComponent
+                        DateRangeTemplatesComponent,
+                        DateRangeTwoInputsTestComponent
                     ],
                     imports: [
                         IgxDateRangePickerModule,
@@ -1154,6 +1156,15 @@ describe('IgxDateRangePicker', () => {
                 })
                     .compileComponents();
             }));
+
+            it('should render range separator', () => {
+                fixture = TestBed.createComponent(DateRangeTwoInputsTestComponent);
+                fixture.detectChanges();
+
+                const range = fixture.debugElement.query(By.css(CSS_CLASS_DATE_RANGE));
+                expect(range.children[1].nativeElement.innerText).toBe('-');
+            });
+
             it('should render default toggle icon', () => {
                 fixture = TestBed.createComponent(DateRangeDefaultComponent);
                 fixture.detectChanges();
@@ -1314,6 +1325,7 @@ export class DateRangeDefaultComponent extends DateRangeTestComponent {
             </igx-picker-toggle>
             <input igxInput igxDateTimeEditor type="text">
         </igx-date-range-start>
+        <ng-template igxDateRangeSeparator>-</ng-template>
         <igx-date-range-end>
             <input igxInput igxDateTimeEditor type="text">
         </igx-date-range-end>