Refactor tests

formsy · Jan 7, 2017 · da8133c · da8133c
1 parent df7b90e
commit da8133c
Showing 1 changed file with 30 additions and 13 deletions.
diff --git a/test/test.FormsyText.js b/test/test.FormsyText.js
@@ -54,13 +54,15 @@ class TestForm extends Component {
   }
 
   render() {
-    const { value, defaultValue, ...extraProps } = { ...this.props, ...this.state };
+    const { value, defaultValue, children, ...extraProps } = { ...this.props, ...this.state };
     return (
       <Form { ...extraProps }>
-        <FormsyText ref="text" name="text"
-          value={value}
-          defaultValue={defaultValue}
-        />
+        {this.props.children ? this.props.children : (
+          <FormsyText ref="text" name="text"
+            value={value}
+            defaultValue={defaultValue}
+          />
+        )}
       </Form>
     );
   }
@@ -148,17 +150,32 @@ describe('FormsyText', () => {
         expect(formValues.text).to.eq('some text');
       });
 
-      it('disabled', () => {
-        const { formsyTextWrapper, formWrapper } = makeTestParent({
-          disabled: true,
-        });
-
-        const formsyForm = formWrapper.find(Form).node;
-        expect(formsyForm.isFormDisabled()).to.eq(true);
+      it('propagates disabled status', () => {
+        const wrapper = mount(
+          <TestForm disabled={true} >
+            <FormsyText
+              name="text"
+            />
+          </TestForm>
+        );
 
-        const inputDOM = formsyTextWrapper.find('input').node;
+        const inputDOM = wrapper.find('input').node;
         expect(inputDOM.disabled).to.eq(true);
       });
+
+      it('allows overriding disabled status locally', () => {
+        const wrapper = mount(
+          <TestForm disabled={true}>
+            <FormsyText
+              name="text"
+              disabled={false}
+            />
+          </TestForm>
+        );
+
+        const inputDOM = wrapper.find('input').node;
+        expect(inputDOM.disabled).to.eq(false);
+      });
     });
 
     describe('updating', () => {