{
return null;
};
- render() {
+ displayContent = () => {
const {
- type,
- dark,
- small,
- large,
- accordion,
- label,
- accordionOpen,
- id,
+ dark, small, accordion, large, type,
} = this.props;
- if (!TYPES.includes(type)) return null;
- const content = (
+ return (
{
{this.displaySubmit()}
);
+ };
+
+ render() {
+ const {
+ type,
+ dark,
+ large,
+ accordion,
+ label,
+ accordionOpen,
+ id,
+ } = this.props;
+ if (!TYPES.includes(type)) return null;
return accordion && label ? (
{
dark={dark}
large={large}
>
- {content}
+ {this.displayContent()}
) : (
- content
+ this.displayContent()
);
}
}
diff --git a/client/app/components/Input/utils.js b/client/app/components/Input/utils.js
new file mode 100644
index 0000000000..f3fb188057
--- /dev/null
+++ b/client/app/components/Input/utils.js
@@ -0,0 +1,89 @@
+// @flow
+import { REQUIRES_DEFAULT, DEFAULT_WITH_LABEL } from './InputDefault';
+
+export const TYPES = REQUIRES_DEFAULT.concat([
+ 'textarea',
+ 'submit',
+ 'checkbox',
+ 'select',
+ 'checkboxGroup',
+ 'tag',
+ 'switch',
+]);
+
+export const REQUIRES_LABEL = DEFAULT_WITH_LABEL.concat([
+ 'textarea',
+ 'select',
+ 'checkboxGroup',
+ 'tag',
+ 'switch',
+]);
+
+export const REQUIRED_POSSIBLE = DEFAULT_WITH_LABEL.concat([
+ 'textarea',
+ 'checkboxGroup',
+]);
+
+export type Option = {
+ id: string,
+ value: any,
+ label: string,
+};
+
+export type Checkbox = {
+ id: string,
+ name?: string,
+ value: any,
+ checked?: boolean,
+ uncheckedValue?: any,
+ label: string,
+ onChange?: Function,
+ info?: string,
+};
+
+export type Props = {
+ id: string,
+ type: | 'text'
+ | 'textarea'
+ | 'submit'
+ | 'checkbox'
+ | 'number'
+ | 'time'
+ | 'date'
+ | 'select'
+ | 'checkboxGroup'
+ | 'tag'
+ | 'hidden'
+ | 'switch',
+ name?: string,
+ label?: string,
+ placeholder?: string,
+ error?: boolean,
+ dark?: boolean,
+ small?: boolean,
+ large?: boolean,
+ value?: any,
+ readOnly?: boolean,
+ disabled?: boolean,
+ required?: boolean,
+ info?: string,
+ minLength?: number,
+ maxLength?: number,
+ onClick?: Function,
+ onChange?: Function,
+ checked?: boolean,
+ uncheckedValue?: any,
+ min?: number,
+ max?: number,
+ options?: Option[],
+ checkboxes?: Checkbox[],
+ onError?: Function,
+ accordion?: boolean,
+ myRef?: any,
+ accordionOpen?: boolean,
+ formNoValidate?: boolean,
+};
+
+export type State = {
+ error: boolean,
+};
diff --git a/client/app/components/Tag/__tests__/Tag.spec.jsx b/client/app/components/Tag/__tests__/Tag.spec.jsx
index 8fe1d8e06f..4e010e1fc8 100644
--- a/client/app/components/Tag/__tests__/Tag.spec.jsx
+++ b/client/app/components/Tag/__tests__/Tag.spec.jsx
@@ -13,12 +13,16 @@ describe('Tag', () => {
it('supports normal class', () => {
const tag = shallow();
- expect(tag.prop('className')).toEqual(expect.stringContaining(css.normal));
+ expect(tag.prop('className')).toEqual(
+ expect.stringContaining(css.normal),
+ );
});
it('supports secondary class', () => {
const tag = shallow();
- expect(tag.prop('className')).toEqual(expect.stringContaining(css.secondary));
+ expect(tag.prop('className')).toEqual(
+ expect.stringContaining(css.secondary),
+ );
});
});
});
diff --git a/client/app/mocks/InputMocks.jsx b/client/app/mocks/InputMocks.jsx
index 5726cff029..5f8eee2a5d 100644
--- a/client/app/mocks/InputMocks.jsx
+++ b/client/app/mocks/InputMocks.jsx
@@ -1,7 +1,7 @@
// @flow
import React from 'react';
import { Input } from '../components/Input';
-import type { Props } from '../components/Input';
+import type { Props } from '../components/Input/utils';
const options = [
{ id: 'some-option-one-id', value: 1, label: 'Some Option One' },
diff --git a/client/app/widgets/QuickCreate/index.jsx b/client/app/widgets/QuickCreate/index.jsx
index db5c4cd135..154f1eb2ec 100644
--- a/client/app/widgets/QuickCreate/index.jsx
+++ b/client/app/widgets/QuickCreate/index.jsx
@@ -2,7 +2,7 @@
import React from 'react';
import { Modal } from '../../components/Modal';
import { Input } from '../../components/Input';
-import type { Checkbox } from '../../components/Input';
+import type { Checkbox } from '../../components/Input/utils';
import { Utils } from '../../utils';
import css from './QuickCreate.scss';
import { DynamicForm } from '../../components/Form/DynamicForm';
diff --git a/client/app/widgets/Resources/__tests__/Resources.spec.jsx b/client/app/widgets/Resources/__tests__/Resources.spec.jsx
index d0f359448f..3fda4915d4 100644
--- a/client/app/widgets/Resources/__tests__/Resources.spec.jsx
+++ b/client/app/widgets/Resources/__tests__/Resources.spec.jsx
@@ -48,7 +48,9 @@ describe('Resources', () => {
.simulate('click');
expect(wrapper.find('.checkboxLabel').text()).toEqual(id);
expect(wrapper.find('.resource').length).toEqual(1);
- expect(wrapper.find('.tag').findWhere(t => t.text() === id).length).toEqual(1);
+ expect(wrapper.find('.tag').findWhere(t => t.text() === id).length).toEqual(
+ 1,
+ );
});
it('unfilters when tag unselected', () => {
diff --git a/spec/features/user_creates_a_medication_spec.rb b/spec/features/user_creates_a_medication_spec.rb
index 1a8e0ea2f4..bb5526cca9 100644
--- a/spec/features/user_creates_a_medication_spec.rb
+++ b/spec/features/user_creates_a_medication_spec.rb
@@ -30,8 +30,8 @@
end
it 'creates a new medication' do
- expect(CalendarUploader).to_not receive(:new)
find('#submit').click
+ expect(CalendarUploader).to_not receive(:new)
within '.pageTitle' do
expect(page).to have_content(name)
@@ -44,10 +44,10 @@
context 'with reminders checked' do
it 'activates reminders' do
- find('#medication_refill_reminder').click
- find('#medication_take_medication_reminder').click
- expect(CalendarUploader).to_not receive(:new)
+ find('#medication_refill_reminder_attributes').click
+ find('#medication_take_medication_reminder_attributes').click
find('#submit').click
+ expect(CalendarUploader).to_not receive(:new)
expect(find('.pageTitle')).to have_content(name)
expect(medication.take_medication_reminder.active?).to be true
expect(medication.refill_reminder.active?).to be true
@@ -60,8 +60,8 @@
end
it 'activates reminders' do
- find('#medication_refill_reminder').click
- find('#medication_take_medication_reminder').click
+ find('#medication_refill_reminder_attributes').click
+ find('#medication_take_medication_reminder_attributes').click
find('#medication_add_to_google_cal').click
expect(CalendarUploader).to receive_message_chain(:new, :upload_event)
find('#submit').click
@@ -78,7 +78,7 @@
end
it 'redirects to sign in' do
- find('#medication_refill_reminder').click
+ find('#medication_refill_reminder_attributes').click
find('#medication_add_to_google_cal').click
find('#submit').click
expect(find('#new_user')).to be_present
diff --git a/spec/helpers/medications_helper_spec.rb b/spec/helpers/medications_helper_spec.rb
index 2350defeff..cb4d8968c6 100644
--- a/spec/helpers/medications_helper_spec.rb
+++ b/spec/helpers/medications_helper_spec.rb
@@ -33,7 +33,7 @@ def get_field(field_name)
let(:medication) { create(:medication, :with_refill_reminder, user: current_user) }
it 'sets a medication refill reminder' do
@medication = medication
- expect(get_field('medication_refill_reminder')[:value]).to eq(true)
+ expect(get_field('medication_refill_reminder_attributes')[:value]).to eq(true)
expect(get_field('medication_refill_reminder_attributes_id')[:value]).to eq(medication.refill_reminder.id)
end
end
@@ -42,7 +42,7 @@ def get_field(field_name)
let(:medication) { create(:medication, :with_daily_reminder, user: current_user) }
it 'sets a medication take medication reminder' do
@medication = medication
- expect(get_field('medication_take_medication_reminder')[:value]).to eq(true)
+ expect(get_field('medication_take_medication_reminder_attributes')[:value]).to eq(true)
expect(get_field('medication_take_medication_reminder_attributes_id')[:value]).to eq(medication.take_medication_reminder.id)
end
end
diff --git a/spec/helpers/reminder_helper_spec.rb b/spec/helpers/reminder_helper_spec.rb
index a16f9e3052..d156427dfe 100644
--- a/spec/helpers/reminder_helper_spec.rb
+++ b/spec/helpers/reminder_helper_spec.rb
@@ -5,7 +5,7 @@
name1, name2
]
- let(:user) {FactoryBot.create(:user)}
+ let(:user) { create(:user_oauth) }
describe '#active_reminders?' do
it 'returns false when data has no active_reminder method' do
@@ -13,12 +13,12 @@
end
it 'returns false when data has no active reminder' do
- medication = FactoryBot.create(:medication, user_id: user.id)
+ medication = create(:medication, user_id: user.id)
expect(active_reminders?(medication)).to be false
end
it 'returns true when data is good' do
- medication = FactoryBot.create(:medication, :with_daily_reminder, user_id: user.id)
+ medication = create(:medication, :with_daily_reminder, user_id: user.id)
expect(active_reminders?(medication)).to be true
end
end
@@ -26,7 +26,7 @@
describe '#join_names' do
it 'correctly joins reminder names with proper connector' do
reminders = join_names(reminder_names)
- expected_string = 'name1' + I18n.translate('support.array.words_connector') + 'name2'
+ expected_string = "name1#{t('support.array.words_connector')}name2"
expect(reminders).to eq(expected_string)
end
end
@@ -45,12 +45,39 @@
expect(reminders).to eq('')
end
- it 'returns correct html when data has reminders' do
- medication = FactoryBot.create(:medication, :with_daily_reminder, user_id: user.id)
+ it 'returns correct html when data has a daily reminder' do
+ medication = create(:medication, :with_daily_reminder, user_id: user.id)
reminders = print_reminders(medication)
- expected_html = '' + I18n.t('common.daily_reminder') + '
'
+ expected_html = "#{t('common.daily_reminder')}
"
+ expect(reminders).to eq(expected_html)
+ end
+
+ it 'returns correct html when data has a refill reminder' do
+ medication = create(:medication, :with_refill_reminder, user_id: user.id)
+ reminders = print_reminders(medication)
+ expected_html = "#{t('medications.refill_reminder')}
"
+ expect(reminders).to eq(expected_html)
+ end
+
+ it 'returns correct html when data has a daily reminder and refill reminder' do
+ medication = create(:medication, :with_both_reminders, user_id: user.id)
+ reminders = print_reminders(medication)
+ expected_html = "#{t('medications.refill_reminder')}, #{t('common.daily_reminder')}
"
expect(reminders).to eq(expected_html)
end
- end
+ it 'returns correct html when data has a Google calendar reminder' do
+ medication = create(:medication, add_to_google_cal: true, user_id: user.id)
+ reminders = print_reminders(medication)
+ expected_html = "#{t('medications.form.add_to_google_cal')}
"
+ expect(reminders).to eq(expected_html)
+ end
+
+ it 'returns correct html when data has all reminders' do
+ medication = create(:medication, :with_both_reminders, add_to_google_cal: true, user_id: user.id)
+ reminders = print_reminders(medication)
+ expected_html = "#{t('medications.refill_reminder')}, #{t('common.daily_reminder')}, and #{t('medications.form.add_to_google_cal')}
"
+ expect(reminders).to eq(expected_html)
+ end
+ end
end