tests refactoring

rstgroup · Jul 11, 2017 · 9dc1349 · 9dc1349
1 parent 3b9553a
commit 9dc1349
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 74 deletions.
diff --git a/Bootstrap.js b/Bootstrap.js
diff --git a/main.js b/main.js
diff --git a/src/components/ListField.jsx b/src/components/ListField.jsx
@@ -57,7 +57,7 @@ export class ListField extends React.Component {
                 value: item
             }));
         }
-        return [{ id: ListField.generateItemId() }];
+        return [];
     }
 
     setModel(name, value, callback) {

diff --git a/tests/ListField.test.jsx b/tests/ListField.test.jsx
@@ -1,39 +1,25 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import Schema from 'form-schema-validation';
 import {
     Form,
     TextField,
     SubmitField,
     ObjectField,
     ListField
 } from '../src/components';
+import { addressFormSchema, languagesFormSchema } from './data/schemas';
 
 
 describe('ListField', () => {
     it('should add and remove field',() => {
-        const submitMethod = (data) => {
-            expect(data.languages.length).toBe(3);
-        };
-
-        const formSchema = new Schema({
-            languages: {
-                type: [String]
-            }
-        });
-
-        const addButton = {
-            className: 'addButtonClass'
-        };
-
-        const removeButton = {
-            className: 'removeButtonClass'
-        };
+        const submitMethod = (data) => { expect(data.languages.length).toBe(3); };
+        const addButton = { className: 'addButtonClass' };
+        const removeButton = { className: 'removeButtonClass'};
 
         const wrapper = mount(
             <Form
                 onSubmit={submitMethod}
-                schema={formSchema}
+                schema={languagesFormSchema}
             >
                 <ListField name="languages" label="Languages" addButton={addButton} removeButton={removeButton}>
                     <TextField />
@@ -61,38 +47,14 @@ describe('ListField', () => {
             expect(data.address[1].postCode).toBe('testPostCode3');
         };
 
-        const addressSchema = new Schema({
-            city: {
-                type: String
-            },
-            street: {
-                type: String
-            },
-            postCode: {
-                type: String
-            }
-        });
-
-        const formSchema = new Schema({
-            address: {
-                type: [addressSchema]
-            }
-        });
-
         const model={};
-
-        const addButton = {
-            className: 'addButtonClass'
-        };
-
-        const removeButton = {
-            className: 'removeButtonClass'
-        };
+        const addButton = { className: 'addButtonClass' };
+        const removeButton = { className: 'removeButtonClass' };
 
         const wrapper = mount(
             <Form
                 onSubmit={submitMethod}
-                schema={formSchema}
+                schema={addressFormSchema}
                 model={model}
             >
                 <ListField name="address" label="Address" addButton={addButton} removeButton={removeButton}>
@@ -106,26 +68,31 @@ describe('ListField', () => {
             </Form>
         );
         const list = wrapper.find(ListField);
-        const object = list.find(ObjectField).first();
-        const fields = object.find(TextField);
+
+
         const submit = wrapper.find(SubmitField);
 
         const setDataToObjectField = (fields, number = '') => {
             fields.find('[name="city"]').simulate('change', {target: {value: `testCity${number}`}});
             fields.find('[name="street"]').simulate('change', {target: {value: `testStreet${number}`}});
             fields.find('[name="postCode"]').simulate('change', {target: {value: `testPostCode${number}`}});
         };
-        setDataToObjectField(fields);
+
+        list.find('.addButtonClass').first().simulate('click');
         list.find('.addButtonClass').first().simulate('click');
         list.find('.addButtonClass').first().simulate('click');
         expect(list.find(ObjectField).length).toBe(3);
 
+        const object = list.find(ObjectField).first();
+        const fields = object.find(TextField);
+        setDataToObjectField(fields);
         const object2 = list.find(ObjectField).at(1);
         const fields2 = object2.find(TextField);
         setDataToObjectField(fields2, 2);
         const object3 = list.find(ObjectField).at(2);
         const fields3 = object3.find(TextField);
         setDataToObjectField(fields3, 3);
+
         list.find('.removeButtonClass').at(1).simulate('click');
         expect(list.find(ObjectField).length).toBe(2);
         submit.find('button').simulate('click');

diff --git a/tests/ObjectField.test.jsx b/tests/ObjectField.test.jsx
@@ -8,6 +8,7 @@ import {
     ObjectField,
     ListField
 } from '../src/components';
+import { addressFormSchema } from './data/schemas';
 
 
 describe('ObjectField', () => {
@@ -89,31 +90,13 @@ describe('ObjectField', () => {
             expect(data.address[0].street).toBe('testStreet');
             expect(data.address[0].postCode).toBe('testPostCode');
         };
-
-        const addressSchema = new Schema({
-            city: {
-               type: String
-            },
-            street: {
-                type: String
-            },
-            postCode: {
-                type: String
-            }
-        });
-
-        const formSchema = new Schema({
-            address: {
-                type: [addressSchema]
-            }
-        });
-
         const model={};
+        const addButton = { className: 'addButtonClass' };
 
         const wrapper = mount(
             <Form
                 onSubmit={submitMethod}
-                schema={formSchema}
+                schema={addressFormSchema}
                 model={model}
             >
                 <ListField name="address" label="Address">
@@ -127,9 +110,12 @@ describe('ObjectField', () => {
             </Form>
         );
         const list = wrapper.find(ListField);
+        list.find('span').last().simulate('click');
+
         const object = list.find(ObjectField);
         const fields = object.find(TextField);
         const submit = wrapper.find(SubmitField);
+
         fields.find('[name="city"]').simulate('change', {target: {value: 'testCity'}});
         fields.find('[name="street"]').simulate('change', {target: {value: 'testStreet'}});
         fields.find('[name="postCode"]').simulate('change', {target: {value: 'testPostCode'}});

diff --git a/tests/data/schemas.js b/tests/data/schemas.js
@@ -0,0 +1,25 @@
+import Schema from 'form-schema-validation';
+
+export const addressSchema = new Schema({
+    city: {
+        type: String
+    },
+    street: {
+        type: String
+    },
+    postCode: {
+        type: String
+    }
+});
+
+export const addressFormSchema = new Schema({
+    address: {
+        type: [addressSchema]
+    }
+});
+
+export const languagesFormSchema = new Schema({
+    languages: {
+        type: [String]
+    }
+});
diff --git a/webpack.config.js b/webpack.config.js
@@ -26,6 +26,7 @@ module.exports = {
         ]
     },
     devServer: {
-        historyApiFallback: true
+        historyApiFallback: true,
+        port: 9002
     }
 };