From 08da4a4d74ee1eac3fce7cb5c4b08760dd240da0 Mon Sep 17 00:00:00 2001 From: David Morse Date: Mon, 18 May 2015 21:17:13 -0600 Subject: [PATCH] fix unit tests --- src/jquery.gridster.js | 2 +- test/amd-main.js | 2 +- test/jquery.gridster.html | 2 +- test/jquery.gridster_test.js | 13 +++++++++++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/jquery.gridster.js b/src/jquery.gridster.js index 67836c7121..347faf2a4b 100755 --- a/src/jquery.gridster.js +++ b/src/jquery.gridster.js @@ -1203,7 +1203,7 @@ isDOM || ($el = wgd.el); var empty_upper_row = this.can_go_widget_up(wgd); - if (this.shift_widgets_up && empty_upper_row) { + if (this.options.shift_widgets_up && empty_upper_row) { wgd.row = empty_upper_row; $el.attr('data-row', empty_upper_row); this.$el.trigger('gridster:positionchanged', [wgd]); diff --git a/test/amd-main.js b/test/amd-main.js index 3ca59a1586..3fc75213f0 100644 --- a/test/amd-main.js +++ b/test/amd-main.js @@ -7,7 +7,7 @@ require.config({ baseUrl: '../src/', paths: { 'QUnit': '../libs/qunit/qunit/qunit', - 'jquery': '../libs/jquery/jquery', + 'jquery': '../libs/jquery/dist/jquery', 'gridster': 'jquery.gridster' }, map: { diff --git a/test/jquery.gridster.html b/test/jquery.gridster.html index 4d34d4abb6..0cf9d165f1 100644 --- a/test/jquery.gridster.html +++ b/test/jquery.gridster.html @@ -4,7 +4,7 @@ gridster.js Test Suite - + diff --git a/test/jquery.gridster_test.js b/test/jquery.gridster_test.js index 2878587a34..f5931d456e 100644 --- a/test/jquery.gridster_test.js +++ b/test/jquery.gridster_test.js @@ -233,6 +233,19 @@ deepEqual(serialized, output); }); + test('When Adding widgets rows static placement is supported', 2, function () { + var input = [{col: 6, row: 3, size_x: 1, size_y: 1}]; + var grid = this.el.gridster().data('gridster'); + grid.options.shift_widgets_up = false; + //remove any widgets from the html config + grid.remove_all_widgets(); + //make sure we are empty + equal(grid.get_num_widgets(), 0, 'Clearing the widgets to prepare for tests'); + grid.add_widget('
  • ', input[0].size_x, input[0].size_y, input[0].col, input[0].row); + var serialized = grid.serialize(); + deepEqual(serialized, input); + }); + test('When Adding widgets cols are respected', 2, function () { var input = [{col: 6, row: 1, size_x: 1, size_y: 1}]; var grid = this.el.gridster().data('gridster');