feat(*): private property

alfa-laboratory · Mar 4, 2020 · 244cf91 · 244cf91
1 parent 599c01e
commit 244cf91
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/calendar-input/calendar-input.test.tsx b/src/calendar-input/calendar-input.test.tsx
@@ -78,7 +78,7 @@ describe('calendar-input', () => {
 
     it('should focus input on after `focus` call', () => {
         const calendarInput = mount<CalendarInput>(<CalendarInput />);
-        const focusTarget = calendarInput.instance().customCalendarTarget;
+        const focusTarget = calendarInput.instance().getCustomCalendarTarget();
 
         jest.spyOn(focusTarget, 'focus');
 
@@ -89,7 +89,7 @@ describe('calendar-input', () => {
 
     it('should blur input on after `blur` call', () => {
         const calendarInput = mount<CalendarInput>(<CalendarInput />);
-        const focusTarget = calendarInput.instance().customCalendarTarget;
+        const focusTarget = calendarInput.instance().getCustomCalendarTarget();
 
         jest.spyOn(focusTarget, 'blur');
 
@@ -282,7 +282,7 @@ describe('calendar-input', () => {
 
     it('should focus on input after escape key was pressed in calendar', () => {
         const wrapper = mount<CalendarInput>(<CalendarInput />);
-        const calendarTarget = wrapper.instance().customCalendarTarget;
+        const calendarTarget = wrapper.instance().getCustomCalendarTarget();
         const calendarNode = wrapper.find('.calendar');
 
         jest.spyOn(calendarTarget, 'focus');
@@ -294,7 +294,7 @@ describe('calendar-input', () => {
 
     it('should focus on input after calendar icon was clicked', () => {
         const wrapper = mount<CalendarInput>(<CalendarInput />);
-        const calendarTarget = wrapper.instance().customCalendarTarget;
+        const calendarTarget = wrapper.instance().getCustomCalendarTarget();
 
         jest.spyOn(calendarTarget, 'focus');
         const iconNode = wrapper.find('.icon');

diff --git a/src/calendar-input/calendar-input.tsx b/src/calendar-input/calendar-input.tsx
@@ -263,8 +263,7 @@ export class CalendarInput extends React.Component<CalendarInputProps> {
     /**
      * @type {Input}
      */
-    // TODO [issues/1018] переписать тесты нужно, что бы private был
-    customCalendarTarget;
+    private customCalendarTarget;
 
     private nativeCalendarTarget;
 
@@ -753,6 +752,10 @@ export class CalendarInput extends React.Component<CalendarInputProps> {
             this.timeoutId = null;
         }, 0);
     }
+
+    public getCustomCalendarTarget() {
+        return this.customCalendarTarget;
+    }
 }
 
 class ThemedCalendarInput extends CalendarInput {}

diff --git a/src/checkbox-group/checkbox-group.test.tsx b/src/checkbox-group/checkbox-group.test.tsx
@@ -58,7 +58,7 @@ describe('checkbox-group', () => {
                 <CheckBox />
             </CheckBoxGroup>
         );
-        const firstCheckboxInstance = checkboxGroup.instance().checkboxes[0];
+        const firstCheckboxInstance = checkboxGroup.instance().getCheckboxes()[0];
 
         jest.spyOn(firstCheckboxInstance, 'focus');
         checkboxGroup.instance().focus();

diff --git a/src/checkbox-group/checkbox-group.tsx b/src/checkbox-group/checkbox-group.tsx
@@ -103,8 +103,7 @@ export class CheckBoxGroup extends React.PureComponent<CheckBoxGroupProps> {
         value: []
     };
 
-    // TODO [issues/1018] переписать тесты нужно, что бы private был
-    checkboxes: any[];
+    private checkboxes: any[];
 
     render() {
         let children = null;
@@ -216,6 +215,10 @@ export class CheckBoxGroup extends React.PureComponent<CheckBoxGroupProps> {
         }
     }
 
+    public getCheckboxes() {
+        return this.checkboxes;
+    }
+
     /**
      * Убирает фокус с группы чекбокс-кнопок.
      */