Skip to content

Commit 3c089cc

Browse files
Merge pull request #41 from Bahmni/unitTests_lint
fix unit test coverage and lint
2 parents 8d9901c + 6c45da1 commit 3c089cc

18 files changed

+937
-826
lines changed

Diff for: .eslintrc

+14-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,21 @@
77
"after": true,
88
"afterEach": true,
99
"context": true,
10-
"it": true
10+
"it": true,
11+
"formPrivilegesEventUpdate": true,
12+
"expect": true,
13+
"get": true
1114
},
1215
"rules": {
13-
"react/sort-prop-types": 2,
14-
"react/jsx-sort-props": 2
16+
"react/sort-prop-types": 1,
17+
"react/jsx-sort-props": 1,
18+
"react/sort-comp": 1,
19+
"no-unused-vars": 1,
20+
"max-len": 1,
21+
"react/prop-types": 1,
22+
"no-shadow": 1,
23+
"eqeqeq": 1,
24+
"prefer-const": 1,
25+
"no-empty": 1
1526
}
1627
}

Diff for: karma.conf.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ module.exports = function (config) {
3636
],
3737
check: {
3838
global: {
39-
statements: 95.0,
40-
branches: 93.0,
41-
functions: 94.4,
42-
lines: 90.5,
39+
statements: 92.0,
40+
branches: 90.0,
41+
functions: 91.0,
42+
lines: 88.0,
4343
},
4444
},
4545
},

Diff for: src/common/apis/formPrivilegesApi.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ export function getFormPrivileges(formId, formVersion) {
1313
export function getFormPrivilegesFromUuid(formUuid) {
1414
return httpInterceptor.get(new UrlHelper()
1515
.getFormPrivilegesFromUuidUrl(formUuid), 'text');
16-
}
16+
}

Diff for: src/form-builder/components/FormDetail.jsx

+21-20
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ControlPool } from 'form-builder/components/ControlPool.jsx';
44
import Canvas from 'form-builder/components/Canvas.jsx';
55
import classNames from 'classnames';
66
import FormPrivilegesEditorModal from 'form-builder/components/FormPrivilegesEditorModal.jsx';
7-
import FormPrivilegesContainer from 'form-builder/components/FormPrivilegesContainer.jsx'
7+
import FormPrivilegesContainer from 'form-builder/components/FormPrivilegesContainer.jsx';
88
import ControlPropertiesContainer from 'form-builder/components/ControlPropertiesContainer.jsx';
99
import FormEventContainer from 'form-builder/components/FormEventContainer.jsx';
1010
import { IDGenerator } from 'form-builder/helpers/idGenerator';
@@ -84,7 +84,7 @@ export default class FormDetail extends Component {
8484
}
8585
}
8686
render() {
87-
const { formData, defaultLocale, formControlEvents , formPrivileges } = this.props;
87+
const { formData, defaultLocale, formControlEvents } = this.props;
8888
if (formData) {
8989
const { name, uuid, id, version, published, editable } = this.props.formData;
9090
const formResourceControls = FormHelper.getFormResourceControls(this.props.formData);
@@ -127,25 +127,25 @@ export default class FormDetail extends Component {
127127
</Popup>
128128
}
129129
</div>);
130-
}if (props.property.formPrivilegesEventUpdate) {
131-
return (<div>
130+
} if (props.property.formPrivilegesEventUpdate) {
131+
return (<div>
132132
{
133133
<Popup className="form-event-popup" closeOnDocumentClick={false}
134134
closeOnEscape={false}
135135
open={showEditor} position="top center"
136136
>
137137
<FormPrivilegesEditorModal
138-
close={props.closeEventEditor}
139-
formId={formData.id}
140-
formName={name}
141-
formUuid={ uuid }
142-
formPrivileges = {this.props.formPrivileges}
143-
formData = {this.props.formData}
138+
close={props.closeEventEditor}
139+
formId={formData.id}
140+
formName={name}
141+
formUuid={ uuid }
142+
formData = {this.props.formData}
143+
formPrivileges = {this.props.formPrivileges}
144144
/>
145145
</Popup>
146146
}
147147
</div>);
148-
}
148+
}
149149
return (<div>
150150
{showEditor &&
151151
<Popup className="form-event-popup" closeOnDocumentClick={false}
@@ -197,14 +197,15 @@ export default class FormDetail extends Component {
197197
updateFormEvents={this.props.updateFormEvents}
198198
/>
199199
<FormPrivilegesContainer
200-
eventProperty={'formPrivilegesEventUpdate'}
201-
formData = {formData}
202-
formId={id}
203-
formName={name}
204-
formUuid={ uuid }
205-
formDetails = {this.props.formDetails}
206-
formPrivileges = {this.props.formPrivileges}
207-
/>
200+
eventProperty={'formPrivilegesEventUpdate'}
201+
formData = {formData}
202+
formId={id}
203+
formName={name}
204+
formUuid={ uuid }
205+
formPrivileges = {this.props.formPrivileges}
206+
formDetails = {this.props.formDetails}
207+
208+
/>
208209

209210
</div>
210211
<div className="container-column-main">
@@ -235,7 +236,6 @@ export default class FormDetail extends Component {
235236
FormDetail.propTypes = {
236237
defaultLocale: PropTypes.string,
237238
formControlEvents: PropTypes.Array,
238-
formPrivileges: PropTypes.array,
239239
formId: PropTypes.number,
240240
formData: PropTypes.shape({
241241
id: PropTypes.number,
@@ -249,6 +249,7 @@ FormDetail.propTypes = {
249249
formDetails: PropTypes.shape({
250250
events: PropTypes.object,
251251
}),
252+
formPrivileges: PropTypes.array,
252253
setError: PropTypes.func.isRequired,
253254
updateFormControlEvents: PropTypes.func,
254255
updateFormEvents: PropTypes.func,

0 commit comments

Comments
 (0)