Skip to content

Commit

Permalink
fixed tests from #140. Fixed #138.
Browse files Browse the repository at this point in the history
  • Loading branch information
@TonyGermaneri
TonyGermaneri committed Jul 16, 2018
1 parent 5f67b76 commit b4d0345
Show file tree
Hide file tree
Showing 10 changed files with 6,342 additions and 6,334 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "canvas-datagrid",
"main": "lib/main.js",
"version": "0.21.0",
"version": "0.21.1",
"ignore": [
"**/.*",
"node_modules",
Expand Down
2 changes: 1 addition & 1 deletion build.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2007
2010
12,600 changes: 6,312 additions & 6,288 deletions dist/canvas-datagrid.debug.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/canvas-datagrid.debug.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/canvas-datagrid.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/canvas-datagrid.map
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions lib/intf.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,8 @@ define([], function () {
self.intf.disposeContextMenu = self.disposeContextMenu;
self.intf.getCellAt = self.getCellAt;
self.intf.isCellVisible = self.isCellVisible;
self.intf.isRowVisible = self.isRowVisible;
self.intf.isColumnVisible = self.isColumnVisible;
self.intf.order = self.order;
self.intf.draw = self.draw;
self.intf.selectArea = self.selectArea;
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "canvas-datagrid",
"version": "0.21.0",
"version": "0.21.1",
"description": "Canvas based data grid web component. Capable of displaying millions of contiguous hierarchical rows and columns without paging or loading, on a single canvas element.",
"main": "./dist/canvas-datagrid.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions test/tests.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
mocha.setup('bdd');
</script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/async/2.5.0/async.js"></script>
<!-- <script src="../dist/canvas-datagrid.debug.js"></script> -->
<script src="../build/canvas-datagrid.instrument.js"></script>
<script src="../dist/canvas-datagrid.debug.js"></script>
<!-- <script src="../build/canvas-datagrid.instrument.js"></script> -->
<script src="./tests.js"></script>
<script>
mocha.run();
Expand Down
58 changes: 20 additions & 38 deletions test/tests.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1381,87 +1381,76 @@
it('Begin editing, end editing', function (done) {
var ev,
err,
editInput,
grid = g({
test: this.test,
data: [{d: ''}]
});
grid.beginEditAt(0, 0);
editInput = document.body.lastChild;
err = assertIf(editInput.tagName !== 'INPUT', 'Expected an input to have appeared');
err = assertIf(!grid.input.parentNode, 'Expected an input to have appeared');
if (err) { return done(err); }
ev = new Event('keydown');
ev.keyCode = kcs.esc;
grid.addEventListener('endedit', function () {
done();
});
editInput.dispatchEvent(ev);
grid.input.dispatchEvent(ev);
});
it('Begin editing, enter a value, end editing', function (done) {
var ev,
editInput,
grid = g({
test: this.test,
data: [{d: ''}]
});
grid.beginEditAt(0, 0);
editInput = document.body.lastChild;
ev = new Event('keydown');
ev.keyCode = kcs.enter;
editInput.value = 'blah';
grid.input.value = 'blah';
grid.addEventListener('endedit', function (e) {
done(assertIf(grid.data[0].d !== 'blah', 'Expected value to be in data'));
});
editInput.dispatchEvent(ev);
grid.input.dispatchEvent(ev);
});
it('Begin editing, enter a value, end editing, abort before ending.', function (done) {
var ev,
editInput,
grid = g({
test: this.test,
data: [{d: ''}]
});
grid.beginEditAt(0, 0);
editInput = document.body.lastChild;
ev = new Event('keydown');
ev.keyCode = kcs.enter;
editInput.value = 'blah';
grid.input.value = 'blah';
grid.addEventListener('beforeendedit', function (e) {
e.abort();
done(assertIf(grid.data[0].d === 'blah', 'Expected value to be in data'));
});
editInput.dispatchEvent(ev);
grid.input.dispatchEvent(ev);
});
it('Begin editing a select with short definition.', function (done) {
var editInput,
grid = g({
var grid = g({
test: this.test,
data: [{d: ''}],
schema: [{name: 'd', enum: ['a', 'b', 'c']}]
});
grid.beginEditAt(0, 0);
editInput = document.body.lastChild;
done(assertIf(editInput.childNodes.length === 3
&& editInput.tagName !== 'SELECT', 'Expected an input to have appeared'));
done(assertIf(grid.input.childNodes.length === 3
&& grid.input.tagName !== 'SELECT', 'Expected an input to have appeared'));
grid.endEdit();
});
it('Begin editing a select with standard definition.', function (done) {
var editInput,
grid = g({
var grid = g({
test: this.test,
data: [{d: ''}],
schema: [{name: 'd', enum: [['a', 'A'], ['b', 'B'], ['c', 'C']]}]
});
grid.beginEditAt(0, 0);
editInput = document.body.lastChild;
done(assertIf(editInput.childNodes[0].innerHTML === 'A'
&& editInput.childNodes.length === 3
&& editInput.tagName !== 'SELECT', 'Expected an input to have appeared'));
done(assertIf(grid.input.childNodes[0].innerHTML === 'A'
&& grid.input.childNodes.length === 3
&& grid.input.tagName !== 'SELECT', 'Expected an input to have appeared'));
grid.endEdit();
});
it('Begin editing by double clicking a cell.', function (done) {
var editInput,
grid = g({
var grid = g({
test: this.test,
data: [{d: ''}]
});
Expand All @@ -1471,8 +1460,7 @@
mousedown(grid.canvas, 65, 37);
mouseup(grid.canvas, 65, 37);
dblclick(grid.canvas, 65, 37);
editInput = document.body.lastChild;
done(assertIf(editInput.tagName !== 'INPUT', 'Expected an input to have appeared'));
done(assertIf(grid.input.tagName !== 'INPUT', 'Expected an input to have appeared'));
grid.endEdit();
});
it('Should copy a value onto the simulated clipboard.', function (done) {
Expand Down Expand Up @@ -1502,16 +1490,14 @@
it('Begin editing, tab to next cell', function (done) {
var ev,
err,
editInput,
grid = g({
test: this.test,
data: smallData()
});
grid.beginEditAt(0, 0);
editInput = document.body.lastChild;
ev = new Event('keydown');
ev.keyCode = kcs.tab;
editInput.dispatchEvent(ev);
grid.input.dispatchEvent(ev);
grid.addEventListener('endedit', function (e) {
if (e.cell.columnIndex === 1) {
done();
Expand All @@ -1522,13 +1508,11 @@
it('Begin editing, shift tab to very last cell', function (done) {
var ev,
err,
editInput,
grid = g({
test: this.test,
data: smallData()
});
grid.beginEditAt(0, 0);
editInput = document.body.lastChild;
ev = new Event('keydown');
ev.shiftKey = true;
ev.keyCode = kcs.tab;
Expand All @@ -1537,13 +1521,12 @@
done();
}
});
editInput.dispatchEvent(ev);
grid.input.dispatchEvent(ev);
grid.endEdit();
});
it('Begin editing, tab to next row by hitting tab three times', function (done) {
var ev,
err,
editInput,
grid = g({
test: this.test,
data: smallData()
Expand Down Expand Up @@ -2358,7 +2341,7 @@
assertPxColor(grid, 60, 60, c.y, done);
});
it('Should insert data into the new row', function (done) {
var ev, editInput, grid = g({
var ev, grid = g({
test: this.test,
showNewRow: true,
data: [{a: 'a'}]
Expand All @@ -2367,9 +2350,8 @@
ev.keyCode = kcs.enter;
grid.style.cellBackgroundColor = c.y;
grid.beginEditAt(0, 1);
editInput = document.body.lastChild;
editInput.value = 'abcd';
editInput.dispatchEvent(ev);
grid.input.value = 'abcd';
grid.input.dispatchEvent(ev);
assertPxColor(grid, 60, 90, c.y, function (err) {
if (err) { return done(err); }
done(assertIf(grid.data.length !== 2,
Expand Down

0 comments on commit b4d0345

Please sign in to comment.