Skip to content

Commit f2b572c

Browse files
timhwang21timhwang21
committed
Code style fixes
* Proptypes.number => nonNegativeInteger * Fix no linebreak after assignment * Fix training parentheses not having linebreak when leading parentheses does
1 parent d8aa65a commit f2b572c

File tree

2 files changed

+75
-49
lines changed

2 files changed

+75
-49
lines changed

‎src/components/DateRangePickerInputController.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
33
import moment from 'moment';
44

55
import momentPropTypes from 'react-moment-proptypes';
6-
import { forbidExtraProps } from 'airbnb-prop-types';
6+
import { forbidExtraProps, nonNegativeInteger } from 'airbnb-prop-types';
77

88
import { DateRangePickerInputPhrases } from '../defaultPhrases';
99
import getPhrasePropTypes from '../utils/getPhrasePropTypes';
@@ -42,7 +42,7 @@ const propTypes = forbidExtraProps({
4242
keepOpenOnDateSelect: PropTypes.bool,
4343
reopenPickerOnClearDates: PropTypes.bool,
4444
withFullScreenPortal: PropTypes.bool,
45-
minimumNights: PropTypes.number,
45+
minimumNights: nonNegativeInteger,
4646
isOutsideRange: PropTypes.func,
4747
displayFormat: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
4848

‎test/components/DateRangePickerInputController_spec.jsx‎

Lines changed: 73 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ describe('DateRangePickerInputController', () => {
3636
<DateRangePickerInputController
3737
onFocusChange={onFocusChangeStub}
3838
reopenPickerOnClearDates
39-
/>);
39+
/>,
40+
);
4041
wrapper.instance().clearDates();
4142
expect(onFocusChangeStub.callCount).to.equal(1);
4243
});
@@ -47,7 +48,8 @@ describe('DateRangePickerInputController', () => {
4748
<DateRangePickerInputController
4849
onFocusChange={onFocusChangeStub}
4950
reopenPickerOnClearDates
50-
/>);
51+
/>,
52+
);
5153
wrapper.instance().clearDates();
5254
expect(onFocusChangeStub.getCall(0).args[0]).to.equal(START_DATE);
5355
});
@@ -58,8 +60,9 @@ describe('DateRangePickerInputController', () => {
5860
describe('props.onFocusChange', () => {
5961
it('is not called', () => {
6062
const onFocusChangeStub = sinon.stub();
61-
const wrapper =
62-
shallow(<DateRangePickerInputController onFocusChange={onFocusChangeStub} />);
63+
const wrapper = shallow(
64+
<DateRangePickerInputController onFocusChange={onFocusChangeStub} />,
65+
);
6366
wrapper.instance().clearDates();
6467
expect(onFocusChangeStub.callCount).to.equal(0);
6568
});
@@ -68,8 +71,9 @@ describe('DateRangePickerInputController', () => {
6871

6972
it('calls props.onDatesChange with arg { startDate: null, endDate: null }', () => {
7073
const onDatesChangeStub = sinon.stub();
71-
const wrapper =
72-
shallow(<DateRangePickerInputController onDatesChange={onDatesChangeStub} />);
74+
const wrapper = shallow(
75+
<DateRangePickerInputController onDatesChange={onDatesChangeStub} />,
76+
);
7377
wrapper.instance().clearDates();
7478
expect(onDatesChangeStub.callCount).to.equal(1);
7579
});
@@ -116,30 +120,33 @@ describe('DateRangePickerInputController', () => {
116120
describe('when props.startDate is not provided', () => {
117121
it('calls props.onDatesChange with provided end date', () => {
118122
const onDatesChangeStub = sinon.stub();
119-
const wrapper =
120-
shallow(<DateRangePickerInputController onDatesChange={onDatesChangeStub} />);
123+
const wrapper = shallow(
124+
<DateRangePickerInputController onDatesChange={onDatesChangeStub} />,
125+
);
121126
wrapper.instance().onEndDateChange(validFutureDateString);
122127
expect(onDatesChangeStub.callCount).to.equal(1);
123128

124-
const onDatesChangeArgs = onDatesChangeStub.getCall(0).args[0];
125-
expect(onDatesChangeArgs.startDate).to.equal(wrapper.props().startDate);
129+
const [{ startDate, endDate }] = onDatesChangeStub.getCall(0).args;
130+
expect(startDate).to.equal(wrapper.props().startDate);
126131
expect(
127-
isSameDay(onDatesChangeArgs.endDate, moment(validFutureDateString))).to.equal(true);
132+
isSameDay(endDate, moment(validFutureDateString))).to.equal(true);
128133
});
129134

130135
describe('props.onFocusChange', () => {
131136
it('is called once', () => {
132137
const onFocusChangeStub = sinon.stub();
133-
const wrapper =
134-
shallow(<DateRangePickerInputController onFocusChange={onFocusChangeStub} />);
138+
const wrapper = shallow(
139+
<DateRangePickerInputController onFocusChange={onFocusChangeStub} />,
140+
);
135141
wrapper.instance().onEndDateChange(validFutureDateString);
136142
expect(onFocusChangeStub.callCount).to.equal(1);
137143
});
138144

139145
it('is called with null arg', () => {
140146
const onFocusChangeStub = sinon.stub();
141-
const wrapper =
142-
shallow(<DateRangePickerInputController onFocusChange={onFocusChangeStub} />);
147+
const wrapper = shallow(
148+
<DateRangePickerInputController onFocusChange={onFocusChangeStub} />,
149+
);
143150
wrapper.instance().onEndDateChange(validFutureDateString);
144151
expect(onFocusChangeStub.calledWith(null)).to.equal(true);
145152
});
@@ -154,7 +161,8 @@ describe('DateRangePickerInputController', () => {
154161
<DateRangePickerInputController
155162
onDatesChange={onDatesChangeStub}
156163
startDate={startDate}
157-
/>);
164+
/>,
165+
);
158166
wrapper.instance().onEndDateChange(validFutureDateString);
159167
expect(onDatesChangeStub.callCount).to.equal(1);
160168

@@ -166,16 +174,18 @@ describe('DateRangePickerInputController', () => {
166174
describe('props.onFocusChange', () => {
167175
it('is called once', () => {
168176
const onFocusChangeStub = sinon.stub();
169-
const wrapper =
170-
shallow(<DateRangePickerInputController onFocusChange={onFocusChangeStub} />);
177+
const wrapper = shallow(
178+
<DateRangePickerInputController onFocusChange={onFocusChangeStub} />,
179+
);
171180
wrapper.instance().onEndDateChange(validFutureDateString);
172181
expect(onFocusChangeStub.callCount).to.equal(1);
173182
});
174183

175184
it('is called with null arg', () => {
176185
const onFocusChangeStub = sinon.stub();
177-
const wrapper =
178-
shallow(<DateRangePickerInputController onFocusChange={onFocusChangeStub} />);
186+
const wrapper = shallow(
187+
<DateRangePickerInputController onFocusChange={onFocusChangeStub} />,
188+
);
179189
wrapper.instance().onEndDateChange(validFutureDateString);
180190
expect(onFocusChangeStub.calledWith(null)).to.equal(true);
181191
});
@@ -190,7 +200,8 @@ describe('DateRangePickerInputController', () => {
190200
<DateRangePickerInputController
191201
onDatesChange={onDatesChangeStub}
192202
startDate={startDate}
193-
/>);
203+
/>,
204+
);
194205
wrapper.instance().onEndDateChange(validFutureDateString);
195206
expect(onDatesChangeStub.callCount).to.equal(1);
196207

@@ -203,16 +214,18 @@ describe('DateRangePickerInputController', () => {
203214
describe('props.onFocusChange', () => {
204215
it('is called once', () => {
205216
const onFocusChangeStub = sinon.stub();
206-
const wrapper =
207-
shallow(<DateRangePickerInputController onFocusChange={onFocusChangeStub} />);
217+
const wrapper = shallow(
218+
<DateRangePickerInputController onFocusChange={onFocusChangeStub} />,
219+
);
208220
wrapper.instance().onEndDateChange(validFutureDateString);
209221
expect(onFocusChangeStub.callCount).to.equal(1);
210222
});
211223

212224
it('is called with null arg', () => {
213225
const onFocusChangeStub = sinon.stub();
214-
const wrapper =
215-
shallow(<DateRangePickerInputController onFocusChange={onFocusChangeStub} />);
226+
const wrapper = shallow(
227+
<DateRangePickerInputController onFocusChange={onFocusChangeStub} />,
228+
);
216229
wrapper.instance().onEndDateChange(validFutureDateString);
217230
expect(onFocusChangeStub.calledWith(null)).to.equal(true);
218231
});
@@ -230,7 +243,8 @@ describe('DateRangePickerInputController', () => {
230243
onDatesChange={onDatesChangeStub}
231244
startDate={startDate}
232245
minimumNights={0}
233-
/>);
246+
/>,
247+
);
234248
wrapper.instance().onEndDateChange(validFutureDateString);
235249
expect(onDatesChangeStub.callCount).to.equal(1);
236250

@@ -249,7 +263,8 @@ describe('DateRangePickerInputController', () => {
249263
onDatesChange={onDatesChangeStub}
250264
startDate={startDate}
251265
minimumNights={1}
252-
/>);
266+
/>,
267+
);
253268
wrapper.instance().onEndDateChange(validFutureDateString);
254269
expect(onDatesChangeStub.callCount).to.equal(1);
255270

@@ -262,16 +277,18 @@ describe('DateRangePickerInputController', () => {
262277
describe('props.onFocusChange', () => {
263278
it('is called once', () => {
264279
const onFocusChangeStub = sinon.stub();
265-
const wrapper =
266-
shallow(<DateRangePickerInputController onFocusChange={onFocusChangeStub} />);
280+
const wrapper = shallow(
281+
<DateRangePickerInputController onFocusChange={onFocusChangeStub} />,
282+
);
267283
wrapper.instance().onEndDateChange(validFutureDateString);
268284
expect(onFocusChangeStub.callCount).to.equal(1);
269285
});
270286

271287
it('is called with null arg', () => {
272288
const onFocusChangeStub = sinon.stub();
273-
const wrapper =
274-
shallow(<DateRangePickerInputController onFocusChange={onFocusChangeStub} />);
289+
const wrapper = shallow(
290+
<DateRangePickerInputController onFocusChange={onFocusChangeStub} />,
291+
);
275292
wrapper.instance().onEndDateChange(validFutureDateString);
276293
expect(onFocusChangeStub.calledWith(null)).to.equal(true);
277294
});
@@ -329,8 +346,9 @@ describe('DateRangePickerInputController', () => {
329346
const invalidDateString = 'foo';
330347
it('calls props.onDatesChange', () => {
331348
const onDatesChangeStub = sinon.stub();
332-
const wrapper =
333-
shallow(<DateRangePickerInputController onDatesChange={onDatesChangeStub} />);
349+
const wrapper = shallow(
350+
<DateRangePickerInputController onDatesChange={onDatesChangeStub} />,
351+
);
334352
wrapper.instance().onEndDateChange(invalidDateString);
335353
expect(onDatesChangeStub.callCount).to.equal(1);
336354
});
@@ -350,8 +368,9 @@ describe('DateRangePickerInputController', () => {
350368

351369
it('calls props.onDatesChange with endDate === null', () => {
352370
const onDatesChangeStub = sinon.stub();
353-
const wrapper =
354-
shallow(<DateRangePickerInputController onDatesChange={onDatesChangeStub} />);
371+
const wrapper = shallow(
372+
<DateRangePickerInputController onDatesChange={onDatesChangeStub} />,
373+
);
355374
wrapper.instance().onEndDateChange(invalidDateString);
356375
const args = onDatesChangeStub.getCall(0).args[0];
357376
expect(args.endDate).to.equal(null);
@@ -548,7 +567,8 @@ describe('DateRangePickerInputController', () => {
548567
onDatesChange={onDatesChangeStub}
549568
endDate={endDate}
550569
minimumNights={0}
551-
/>);
570+
/>,
571+
);
552572
wrapper.instance().onStartDateChange(validFutureDateString);
553573
expect(onDatesChangeStub.callCount).to.equal(1);
554574

@@ -567,7 +587,8 @@ describe('DateRangePickerInputController', () => {
567587
onDatesChange={onDatesChangeStub}
568588
endDate={endDate}
569589
minimumNights={1}
570-
/>);
590+
/>,
591+
);
571592
wrapper.instance().onStartDateChange(validFutureDateString);
572593
expect(onDatesChangeStub.callCount).to.equal(1);
573594

@@ -656,8 +677,9 @@ describe('DateRangePickerInputController', () => {
656677
const invalidDateString = 'foo';
657678
it('calls props.onDatesChange', () => {
658679
const onDatesChangeStub = sinon.stub();
659-
const wrapper =
660-
shallow(<DateRangePickerInputController onDatesChange={onDatesChangeStub} />);
680+
const wrapper = shallow(
681+
<DateRangePickerInputController onDatesChange={onDatesChangeStub} />,
682+
);
661683
wrapper.instance().onStartDateChange(invalidDateString);
662684
expect(onDatesChangeStub.callCount).to.equal(1);
663685
});
@@ -735,25 +757,28 @@ describe('DateRangePickerInputController', () => {
735757
describe('#onStartDateFocus', () => {
736758
it('calls props.onFocusChange once', () => {
737759
const onFocusChangeStub = sinon.stub();
738-
const wrapper =
739-
shallow(<DateRangePickerInputController onFocusChange={onFocusChangeStub} />);
760+
const wrapper = shallow(
761+
<DateRangePickerInputController onFocusChange={onFocusChangeStub} />,
762+
);
740763
wrapper.instance().onStartDateFocus();
741764
expect(onFocusChangeStub).to.have.property('callCount', 1);
742765
});
743766

744767
it('calls props.onFocusChange with START_DATE as arg', () => {
745768
const onFocusChangeStub = sinon.stub();
746-
const wrapper =
747-
shallow(<DateRangePickerInputController onFocusChange={onFocusChangeStub} />);
769+
const wrapper = shallow(
770+
<DateRangePickerInputController onFocusChange={onFocusChangeStub} />,
771+
);
748772
wrapper.instance().onStartDateFocus();
749773
expect(onFocusChangeStub.getCall(0).args[0]).to.equal(START_DATE);
750774
});
751775

752776
describe('props.disabled = true', () => {
753777
it('does not call props.onFocusChange', () => {
754778
const onFocusChangeStub = sinon.stub();
755-
const wrapper =
756-
shallow(<DateRangePickerInputController disabled onFocusChange={onFocusChangeStub} />);
779+
const wrapper = shallow(
780+
<DateRangePickerInputController disabled onFocusChange={onFocusChangeStub} />,
781+
);
757782
wrapper.instance().onStartDateFocus();
758783
expect(onFocusChangeStub).to.have.property('callCount', 0);
759784
});
@@ -763,8 +788,9 @@ describe('DateRangePickerInputController', () => {
763788
describe('#onEndDateFocus', () => {
764789
it('calls props.onFocusChange once with arg END_DATE', () => {
765790
const onFocusChangeStub = sinon.stub();
766-
const wrapper =
767-
shallow(<DateRangePickerInputController onFocusChange={onFocusChangeStub} />);
791+
const wrapper = shallow(
792+
<DateRangePickerInputController onFocusChange={onFocusChangeStub} />,
793+
);
768794
wrapper.instance().onEndDateFocus();
769795
expect(onFocusChangeStub).to.have.property('callCount', 1);
770796
expect(onFocusChangeStub.getCall(0).args[0]).to.equal(END_DATE);

0 commit comments

Comments
 (0)