Skip to content

Commit

Permalink
Updated tests and build.
Browse files Browse the repository at this point in the history
  • Loading branch information
travist committed Mar 9, 2021
1 parent 87c8464 commit 6bdd4ae
Show file tree
Hide file tree
Showing 33 changed files with 598 additions and 525 deletions.
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ jobs:
command: npm test
- store_artifacts:
path: test-results.xml
prefix: tests
237 changes: 158 additions & 79 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"homepage": "https://github.com/formio/formio.js#readme",
"dependencies": {
"@formio/bootstrap3": "^2.9.0",
"@formio/bootstrap3": "^2.10.0",
"@formio/semantic": "^2.5.1",
"autocompleter": "^6.1.0",
"browser-cookies": "^1.2.0",
Expand Down Expand Up @@ -89,13 +89,13 @@
"vanilla-picker": "^2.11.2"
},
"devDependencies": {
"@babel/cli": "^7.12.17",
"@babel/core": "^7.12.17",
"@babel/cli": "^7.13.10",
"@babel/core": "^7.13.10",
"@babel/plugin-proposal-class-properties": "^7.12.13",
"@babel/plugin-proposal-export-default-from": "^7.12.13",
"@babel/plugin-proposal-optional-chaining": "^7.12.17",
"@babel/polyfill": "^7.12.1",
"@babel/preset-env": "^7.12.17",
"@babel/preset-env": "^7.13.10",
"@babel/register": "^7.12.13",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.2.2",
Expand Down Expand Up @@ -131,16 +131,16 @@
"gulp-watch": "^5.0.1",
"hoek": "^6.1.3",
"jquery": "^3.5.1",
"jsdom": "^16.4.0",
"jsdom": "^16.5.0",
"jsdom-global": "^3.0.2",
"karma": "^6.1.1",
"karma": "^6.1.2",
"karma-chrome-launcher": "^3.1.0",
"karma-mocha": "^2.0.1",
"karma-mocha-reporter": "^2.2.5",
"karma-phantomjs-launcher": "^1.0.4",
"karma-webpack": "^5.0.0",
"marked": "^2.0.0",
"mocha": "^8.3.0",
"mocha": "^8.3.1",
"natives": "^1.1.6",
"power-assert": "^1.6.1",
"pre-commit": "^1.2.2",
Expand All @@ -149,7 +149,7 @@
"raw-loader": "^4.0.2",
"shortcut-buttons-flatpickr": "^0.3.1",
"sinon": "^9.2.4",
"webpack": "^5.23.0",
"webpack": "^5.24.4",
"webpack-stream": "^6.1.2",
"written-number": "^0.9.1"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</label>
<div ref="element">
<div class="input-group">
<input ref="input" name="data[dateTime]" type="text" class="form-control" lang="en" disabled="disabled" value="2019-11-06 09:00 PM" id="dateTime-dateTime"></input>
<input ref="input" name="data[dateTime]" type="text" class="form-control" lang="en" disabled="disabled" value="2019-11-06 06:00 PM" id="dateTime-dateTime"></input>
<div class="input-group-append" ref="suffix">
<span class="input-group-text">
<i ref="icon" class="fa fa-calendar" style=""></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</label>
<div ref="element">
<div class="input-group">
<input ref="input" name="data[dateTime]" type="text" class="form-control" lang="en" disabled="disabled" value="2019-11-25 11:11 PM" id="dateTime-dateTime"></input>
<input ref="input" name="data[dateTime]" type="text" class="form-control" lang="en" disabled="disabled" value="2019-11-25 08:11 PM" id="dateTime-dateTime"></input>
<div class="input-group-append" ref="suffix">
<span class="input-group-text">
<i ref="icon" class="fa fa-calendar" style=""></i>
Expand Down
14 changes: 7 additions & 7 deletions test/renders/component-bootstrap3-datagrid-multiple.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
</label>
<table class="table datagrid-table table-bordered
">
<tbody ref="datagrid-dataGrid-tbody" data-key="datagrid-dataGrid>
<tr ref=" datagrid-dataGrid-row">
<td>
<button type="button" class="btn btn-default formio-button-remove-row" ref="datagrid-dataGrid-removeRow">
<i class="fa fa-times-circle-o"></i>
</button>
</td>
<tbody ref="datagrid-dataGrid-tbody" data-key="datagrid-dataGrid">
<tr ref="datagrid-dataGrid-row">
<td>
<button type="button" class="btn btn-default formio-button-remove-row" ref="datagrid-dataGrid-removeRow">
<i class="fa fa-times-circle-o"></i>
</button>
</td>
</tr>
</tbody>
<tfoot>
Expand Down
4 changes: 2 additions & 2 deletions test/renders/component-bootstrap3-datagrid-readOnly.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
</label>
<table class="table datagrid-table table-bordered
">
<tbody ref="datagrid-dataGrid-tbody" data-key="datagrid-dataGrid>
<tr ref=" datagrid-dataGrid-row">
<tbody ref="datagrid-dataGrid-tbody" data-key="datagrid-dataGrid">
<tr ref="datagrid-dataGrid-row">
</tr>
</tbody>
</table>
Expand Down
14 changes: 7 additions & 7 deletions test/renders/component-bootstrap3-datagrid-required.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
</label>
<table class="table datagrid-table table-bordered
">
<tbody ref="datagrid-dataGrid-tbody" data-key="datagrid-dataGrid>
<tr ref=" datagrid-dataGrid-row">
<td>
<button type="button" class="btn btn-default formio-button-remove-row" ref="datagrid-dataGrid-removeRow">
<i class="fa fa-times-circle-o"></i>
</button>
</td>
<tbody ref="datagrid-dataGrid-tbody" data-key="datagrid-dataGrid">
<tr ref="datagrid-dataGrid-row">
<td>
<button type="button" class="btn btn-default formio-button-remove-row" ref="datagrid-dataGrid-removeRow">
<i class="fa fa-times-circle-o"></i>
</button>
</td>
</tr>
</tbody>
<tfoot>
Expand Down
14 changes: 7 additions & 7 deletions test/renders/component-bootstrap3-datagrid.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
</label>
<table class="table datagrid-table table-bordered
">
<tbody ref="datagrid-dataGrid-tbody" data-key="datagrid-dataGrid>
<tr ref=" datagrid-dataGrid-row">
<td>
<button type="button" class="btn btn-default formio-button-remove-row" ref="datagrid-dataGrid-removeRow">
<i class="fa fa-times-circle-o"></i>
</button>
</td>
<tbody ref="datagrid-dataGrid-tbody" data-key="datagrid-dataGrid">
<tr ref="datagrid-dataGrid-row">
<td>
<button type="button" class="btn btn-default formio-button-remove-row" ref="datagrid-dataGrid-removeRow">
<i class="fa fa-times-circle-o"></i>
</button>
</td>
</tr>
</tbody>
<tfoot>
Expand Down
20 changes: 10 additions & 10 deletions test/renders/component-bootstrap3-datamap-multiple.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
</th>
</tr>
</thead>
<tbody ref="datagrid-dataMap-tbody" data-key="datagrid-dataMap>
</tbody>
<tfoot>
<tr>
<td colspan=" 4">
<button class="btn btn-primary formio-button-add-row" ref="datagrid-dataMap-addRow">
<i class="fa fa-plus"></i> Add Another
</button>
</td>
<tbody ref="datagrid-dataMap-tbody" data-key="datagrid-dataMap">
</tbody>
<tfoot>
<tr>
<td colspan="4">
<button class="btn btn-primary formio-button-add-row" ref="datagrid-dataMap-addRow">
<i class="fa fa-plus"></i> Add Another
</button>
</td>
</tr>
</tfoot>
</tfoot>
</table>
<div ref="messageContainer" class="formio-errors invalid-feedback"></div>
</div>
9 changes: 4 additions & 5 deletions test/renders/component-bootstrap3-datamap-readOnly.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
</th>
</tr>
</thead>
<tbody ref="datagrid-dataMap-tbody" data-key="datagrid-dataMap>
</tbody>
</table>
<div ref=" messageContainer" class="formio-errors invalid-feedback">
</div>
<tbody ref="datagrid-dataMap-tbody" data-key="datagrid-dataMap">
</tbody>
</table>
<div ref="messageContainer" class="formio-errors invalid-feedback"></div>
</div>
20 changes: 10 additions & 10 deletions test/renders/component-bootstrap3-datamap-required.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
</th>
</tr>
</thead>
<tbody ref="datagrid-dataMap-tbody" data-key="datagrid-dataMap>
</tbody>
<tfoot>
<tr>
<td colspan=" 4">
<button class="btn btn-primary formio-button-add-row" ref="datagrid-dataMap-addRow">
<i class="fa fa-plus"></i> Add Another
</button>
</td>
<tbody ref="datagrid-dataMap-tbody" data-key="datagrid-dataMap">
</tbody>
<tfoot>
<tr>
<td colspan="4">
<button class="btn btn-primary formio-button-add-row" ref="datagrid-dataMap-addRow">
<i class="fa fa-plus"></i> Add Another
</button>
</td>
</tr>
</tfoot>
</tfoot>
</table>
<div ref="messageContainer" class="formio-errors invalid-feedback"></div>
</div>
20 changes: 10 additions & 10 deletions test/renders/component-bootstrap3-datamap.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
</th>
</tr>
</thead>
<tbody ref="datagrid-dataMap-tbody" data-key="datagrid-dataMap>
</tbody>
<tfoot>
<tr>
<td colspan=" 4">
<button class="btn btn-primary formio-button-add-row" ref="datagrid-dataMap-addRow">
<i class="fa fa-plus"></i> Add Another
</button>
</td>
<tbody ref="datagrid-dataMap-tbody" data-key="datagrid-dataMap">
</tbody>
<tfoot>
<tr>
<td colspan="4">
<button class="btn btn-primary formio-button-add-row" ref="datagrid-dataMap-addRow">
<i class="fa fa-plus"></i> Add Another
</button>
</td>
</tr>
</tfoot>
</tfoot>
</table>
<div ref="messageContainer" class="formio-errors invalid-feedback"></div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</label>
<div ref="element">
<div class="input-group">
<input ref="input" name="data[dateTime]" type="text" class="form-control" lang="en" disabled="disabled" value="2019-11-06 09:00 PM" id="dateTime-dateTime"></input>
<input ref="input" name="data[dateTime]" type="text" class="form-control" lang="en" disabled="disabled" value="2019-11-06 06:00 PM" id="dateTime-dateTime"></input>
<div class="input-group-addon" ref="suffix">
<i ref="icon" class="fa fa-calendar" style=""></i>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</label>
<div ref="element">
<div class="input-group">
<input ref="input" name="data[dateTime]" type="text" class="form-control" lang="en" disabled="disabled" value="2019-11-25 11:11 PM" id="dateTime-dateTime"></input>
<input ref="input" name="data[dateTime]" type="text" class="form-control" lang="en" disabled="disabled" value="2019-11-25 08:11 PM" id="dateTime-dateTime"></input>
<div class="input-group-addon" ref="suffix">
<i ref="icon" class="fa fa-calendar" style=""></i>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</label>
<div ref="element">
<div class="ui input fluid right labeled">
<input ref="input" name="data[dateTime]" type="text" class="form-control" lang="en" disabled="disabled" value="2019-11-06 09:00 PM" id="dateTime-dateTime"></input>
<input ref="input" name="data[dateTime]" type="text" class="form-control" lang="en" disabled="disabled" value="2019-11-06 06:00 PM" id="dateTime-dateTime"></input>
<div class="ui label" ref="suffix">
<i ref="icon" class="fa fa-calendar" style=""></i>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</label>
<div ref="element">
<div class="ui input fluid right labeled">
<input ref="input" name="data[dateTime]" type="text" class="form-control" lang="en" disabled="disabled" value="2019-11-25 11:11 PM" id="dateTime-dateTime"></input>
<input ref="input" name="data[dateTime]" type="text" class="form-control" lang="en" disabled="disabled" value="2019-11-25 08:11 PM" id="dateTime-dateTime"></input>
<div class="ui label" ref="suffix">
<i ref="icon" class="fa fa-calendar" style=""></i>
</div>
Expand Down
42 changes: 21 additions & 21 deletions test/renders/form-bootstrap3-calculateValueWithManualOverride.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,29 +39,29 @@
</th>
</tr>
</thead>
<tbody ref="datagrid-dataGrid-tbody" data-key="datagrid-dataGrid>
<tr ref=" datagrid-dataGrid-row">
<td ref="datagrid-dataGrid" class="col-md-">
<div id="label" class="form-group has-feedback formio-component formio-component-textfield formio-component-label formio-component-label-hidden" ref="component">
<div ref="element">
<input ref="input" name="data[dataGrid][0][label]" type="text" class="form-control" lang="en" spellcheck="true" value="" id="label-label"></input>
<tbody ref="datagrid-dataGrid-tbody" data-key="datagrid-dataGrid">
<tr ref="datagrid-dataGrid-row">
<td ref="datagrid-dataGrid" class="col-md-">
<div id="label" class="form-group has-feedback formio-component formio-component-textfield formio-component-label formio-component-label-hidden" ref="component">
<div ref="element">
<input ref="input" name="data[dataGrid][0][label]" type="text" class="form-control" lang="en" spellcheck="true" value="" id="label-label"></input>
</div>
<div ref="messageContainer" class="formio-errors invalid-feedback"></div>
</div>
<div ref="messageContainer" class="formio-errors invalid-feedback"></div>
</div>
</td>
<td ref="datagrid-dataGrid" class="col-md-">
<div id="value" class="form-group has-feedback formio-component formio-component-textfield formio-component-value formio-component-label-hidden" ref="component">
<div ref="element">
<input ref="input" name="data[dataGrid][0][value]" type="text" class="form-control" lang="en" spellcheck="true" value="" id="value-value"></input>
</td>
<td ref="datagrid-dataGrid" class="col-md-">
<div id="value" class="form-group has-feedback formio-component formio-component-textfield formio-component-value formio-component-label-hidden" ref="component">
<div ref="element">
<input ref="input" name="data[dataGrid][0][value]" type="text" class="form-control" lang="en" spellcheck="true" value="" id="value-value"></input>
</div>
<div ref="messageContainer" class="formio-errors invalid-feedback"></div>
</div>
<div ref="messageContainer" class="formio-errors invalid-feedback"></div>
</div>
</td>
<td>
<button type="button" class="btn btn-default formio-button-remove-row" ref="datagrid-dataGrid-removeRow">
<i class="fa fa-times-circle-o"></i>
</button>
</td>
</td>
<td>
<button type="button" class="btn btn-default formio-button-remove-row" ref="datagrid-dataGrid-removeRow">
<i class="fa fa-times-circle-o"></i>
</button>
</td>
</tr>
</tbody>
<tfoot>
Expand Down
Loading

0 comments on commit 6bdd4ae

Please sign in to comment.