diff options
| author | Max Kramer <maximilian.kramer@fmr.com> | 2013-05-20 11:12:17 -0400 |
|---|---|---|
| committer | Michael Leibman <michael.leibman@gmail.com> | 2013-05-22 14:34:24 -0700 |
| commit | 17c8cc599b85aa8f97f76aeba47b3e9dc3011f02 (patch) | |
| tree | 58defd94e4602d51e6c53baea4eb234545e15587 | |
| parent | 1aa346db937e43da9ad2e5eda44c68093249a815 (diff) | |
| download | SlickGrid-17c8cc599b85aa8f97f76aeba47b3e9dc3011f02.zip SlickGrid-17c8cc599b85aa8f97f76aeba47b3e9dc3011f02.tar.gz SlickGrid-17c8cc599b85aa8f97f76aeba47b3e9dc3011f02.tar.bz2 | |
Fix test and clean up.
| -rwxr-xr-x | tests/grid/grid.js | 106 | ||||
| -rw-r--r-- | tests/grid/index.html | 62 |
2 files changed, 77 insertions, 91 deletions
diff --git a/tests/grid/grid.js b/tests/grid/grid.js index 5106a20..8441137 100755 --- a/tests/grid/grid.js +++ b/tests/grid/grid.js @@ -1,76 +1,68 @@ -(function($) { - -var grid; -var el, offsetBefore, offsetAfter, dragged; - -var drag = function(handle, dx, dy) { +(function ($) { + + var grid; + var el, offsetBefore, offsetAfter, dragged; + + var drag = function(handle, dx, dy) { offsetBefore = el.offset(); $(handle).simulate("drag", { - dx: dx || 0, - dy: dy || 0 + dx: dx || 0, + dy: dy || 0 }); dragged = { dx: dx, dy: dy }; offsetAfter = el.offset(); -} - -var moved = function (dx, dy, msg) { + } + + var moved = function (dx, dy, msg) { msg = msg ? msg + "." : ""; var actual = { left: offsetAfter.left, top: offsetAfter.top }; var expected = { left: offsetBefore.left + dx, top: offsetBefore.top + dy }; same(actual, expected, 'dragged[' + dragged.dx + ', ' + dragged.dy + '] ' + msg); -} - - -var ROWS = 500, COLS = 10; -var data = [], row; -for (var i=0; i<ROWS; i++) { - row = {}; - row["id"] = "id_" + i; - for (var j=0; j<COLS; j++) { - row["col_" + j] = i + "." + j; + } + + var ROWS = 500, COLS = 10; + var data = [], row; + for (var i = 0; i < ROWS; i++) { + row = { id: "id_" + i }; + for (var j = 0; j < COLS; j++) { + row["col_" + j] = i + "." + j; } data.push(row); -} - -var cols = [], col; -for (var i=0; i<COLS; i++) { - col = {}; - col["id"] = "col" + i; - col["field"] = "col_" + i; - col["name"] = "col_" + i; - cols.push(col); -} - -cols[0].minWidth = 70; - -grid = new Slick.Grid("#container", data, cols); -grid.render(); - - + } + + var cols = [], col; + for (var i = 0; i < COLS; i++) { + cols.push({ + id: "col" + i, + field: "col_" + i, + name: "col_" + i + }); + } + + cols[0].minWidth = 70; -module("grid - column resizing"); + grid = new Slick.Grid("#container", data, cols); + grid.render(); -test("minWidth is respected", function() { + module("grid - column resizing"); + + test("minWidth is respected", function () { var firstCol = $("#container .slick-header-column:first"); - firstCol.find(".slick-resizable-handle:first").simulate("drag", {dx:100,dy:0}); - firstCol.find(".slick-resizable-handle:first").simulate("drag", {dx:-200,dy:0}); + firstCol.find(".slick-resizable-handle:first").simulate("drag", { dx: 100, dy: 0 }); + firstCol.find(".slick-resizable-handle:first").simulate("drag", { dx: -200, dy: 0 }); equal(firstCol.outerWidth(), 70, "width set to minWidth"); -}); - - -test("onColumnsResized is fired on column resize", function() { + }); + + test("onColumnsResized is fired on column resize", function () { expect(2); - grid.onColumnsResized = function() { ok(true,"onColumnsResized called") }; + grid.onColumnsResized.subscribe(function() { ok(true,"onColumnsResized called") }); var oldWidth = cols[0].width; - $("#container .slick-resizable-handle:first").simulate("drag", {dx:100,dy:0}); + $("#container .slick-resizable-handle:first").simulate("drag", { dx: 100, dy: 0 }); equal(cols[0].width, oldWidth+100-1, "columns array is updated"); - -}); - - -test("getData should return data", function() { + }); + + test("getData should return data", function () { equal(grid.getData(), data); -}); - - -})(jQuery); + }); + +})(jQuery);
\ No newline at end of file diff --git a/tests/grid/index.html b/tests/grid/index.html index 7df889a..cc089a4 100644 --- a/tests/grid/index.html +++ b/tests/grid/index.html @@ -1,40 +1,34 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE html> <html> <head> - <title></title> - <link rel="stylesheet" href="../../lib/qunit.css" type="text/css"/> - <link rel="stylesheet" href="../../slick.grid.css" type="text/css"/> - <link rel="stylesheet" href="../../examples/slick-default-theme.css" type="text/css" /> - + <title>SlickGrid - Grid tests</title> + <link rel="stylesheet" href="../../lib/qunit.css" type="text/css"/> + <link rel="stylesheet" href="../../slick.grid.css" type="text/css"/> + <link rel="stylesheet" href="../../examples/slick-default-theme.css" type="text/css" /> </head> <body> -<h1 id="qunit-header">QUnit Test Suite</h1> -<h2 id="qunit-banner"></h2> -<div id="qunit-testrunner-toolbar"></div> -<h2 id="qunit-userAgent"></h2> -<ol id="qunit-tests"></ol> - - -<br/><br/><br/> -<div id="container" style="width:600px;height:400px;"></div> - - -<script type="text/javascript" src="../../lib/qunit.js"></script> -<script type="text/javascript" src="../../lib/jquery-1.7.min.js"></script> -<script type="text/javascript" src="../../lib/jquery-ui-1.8.16.custom.min.js"></script> -<script type="text/javascript" src="../../lib/jquery.event.drag-2.2.js"></script> -<script type="text/javascript" src="../../lib/jquery.simulate.js"></script> -<script type="text/javascript" src="../../lib/qunit.js"></script> -<script type="text/javascript"> - jQuery.noConflict(); -</script> -<script type="text/javascript" src="../../slick.dataview.js"></script> -<script type="text/javascript" src="../../slick.grid.js"></script> -<script type="text/javascript" src="grid.js"></script> - - - - + <h1 id="qunit-header">SlickGrid - Grid Test Suite</h1> + <h2 id="qunit-banner"></h2> + <div id="qunit-testrunner-toolbar"></div> + <h2 id="qunit-userAgent"></h2> + <ol id="qunit-tests"></ol> + + <br/><br/><br/> + <div id="container" style="width:600px;height:400px;"></div> + + <script type="text/javascript" src="../../lib/qunit.js"></script> + <script type="text/javascript" src="../../lib/jquery-1.7.min.js"></script> + <script type="text/javascript" src="../../lib/jquery-ui-1.8.16.custom.min.js"></script> + <script type="text/javascript" src="../../lib/jquery.event.drag-2.2.js"></script> + <script type="text/javascript" src="../../lib/jquery.simulate.js"></script> + <script type="text/javascript" src="../../lib/qunit.js"></script> + <script type="text/javascript"> + jQuery.noConflict(); + </script> + <script type="text/javascript" src="../../slick.core.js"></script> + <script type="text/javascript" src="../../slick.dataview.js"></script> + <script type="text/javascript" src="../../slick.grid.js"></script> + <script type="text/javascript" src="grid.js"></script> + </body> </html>
\ No newline at end of file |