You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2014/01/29 00:48:50 UTC
[1/2] git commit: updated refs/heads/master to 3ac181e
Updated Branches:
refs/heads/master 16a9171f5 -> 3ac181e39
List view: tests for filter dropdown
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3ac181e3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3ac181e3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3ac181e3
Branch: refs/heads/master
Commit: 3ac181e396c2564df66947184048565d4b199716
Parents: ebcf6a1
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jan 28 15:48:33 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jan 28 15:48:44 2014 -0800
----------------------------------------------------------------------
ui/tests/test.widget.listView.js | 40 +++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ac181e3/ui/tests/test.widget.listView.js
----------------------------------------------------------------------
diff --git a/ui/tests/test.widget.listView.js b/ui/tests/test.widget.listView.js
index 84f914b..43c42f9 100644
--- a/ui/tests/test.widget.listView.js
+++ b/ui/tests/test.widget.listView.js
@@ -202,4 +202,44 @@
equal($listView.find('table.body tbody tr td').size(), 2, 'Correct number of data body columns present');
ok(!$listView.find('table.body tbody td.fieldHidden').size(), 'Hidden field not present');
});
+
+ test('Filter dropdown', function() {
+ var $listView = listView({
+ listView: {
+ fields: {
+ state: { label: 'State' }
+ },
+ filters: {
+ on: { label: 'FilterOnLabel' },
+ off: { label: 'FilterOffLabel' }
+ },
+ dataProvider: function(args) {
+ var filterBy = args.filterBy.kind;
+ var data = filterBy === 'on' ? [{ state: 'on' }] : [{ state: 'off' }];
+
+ args.response.success({
+ data: data
+ });
+
+ start();
+ }
+ }
+ });
+
+ var $filters = $listView.find('.filters select');
+
+ var testFilterDropdownContent = function() {
+ equal($filters.find('option').size(), 2, 'Correct # of filters present');
+ equal($filters.find('option:first').html(), 'FilterOnLabel', 'Filter on label present');
+ equal($filters.find('option:last').html(), 'FilterOffLabel', 'Filter off label present');
+ };
+
+ testFilterDropdownContent();
+ equal($filters.find('option').val(), 'on', 'Correct default filter active');
+ equal($listView.find('tbody td.state span').html(), 'on', '"on" data item visible');
+ ok($filters.val('off').trigger('change'), 'Change filter to "off"');
+ equal($listView.find('tbody td.state span').html(), 'off', '"off" data item visible');
+ equal($filters.val(), 'off', 'Correct filter active');
+ testFilterDropdownContent();
+ });
}());
[2/2] git commit: updated refs/heads/master to 3ac181e
Posted by bf...@apache.org.
List view: tests for field pre-filter
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ebcf6a1d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ebcf6a1d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ebcf6a1d
Branch: refs/heads/master
Commit: ebcf6a1da88c4d750f9342df45fc409be80c9759
Parents: 16a9171
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jan 28 14:54:30 2014 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jan 28 15:48:44 2014 -0800
----------------------------------------------------------------------
ui/tests/test.widget.listView.js | 38 ++++++++++++++++++++++++++++++-----
1 file changed, 33 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebcf6a1d/ui/tests/test.widget.listView.js
----------------------------------------------------------------------
diff --git a/ui/tests/test.widget.listView.js b/ui/tests/test.widget.listView.js
index 3640a5a..84f914b 100644
--- a/ui/tests/test.widget.listView.js
+++ b/ui/tests/test.widget.listView.js
@@ -104,7 +104,7 @@
},
dataProvider: function(args) {
args.response.success({ data: [] });
-
+
ok(true, 'Data provider called');
start();
}
@@ -128,7 +128,7 @@
{ fieldA: 'FieldDataA', fieldB: 'FieldDataB' }
]
});
-
+
start();
}
}
@@ -146,7 +146,7 @@
{ fieldA: 'FieldDataA2', fieldB: 'FieldDataB2' },
{ fieldA: 'FieldDataA3', fieldB: 'FieldDataB3' }
];
-
+
var $listView = listView({
listView: {
fields: {
@@ -157,7 +157,7 @@
args.response.success({
data: testData
});
-
+
start();
}
}
@@ -169,9 +169,37 @@
var $tr = $listView.find('table.body tbody tr').filter(function() {
return $(this).index() === index;
});
-
+
equal($tr.find('td.fieldA > span').html(), 'FieldDataA' + (index + 1), 'FieldDataA' + (index + 1) + ' present');
equal($tr.find('td.fieldB > span').html(), 'FieldDataB' + (index + 1), 'FieldDataB' + (index + 1) + ' present');
});
});
+
+ test('Field pre-filter', function() {
+ var $listView = listView({
+ listView: {
+ fields: {
+ fieldA: { label: 'TestFieldA' },
+ fieldB: { label: 'TestFieldB' },
+ fieldHidden: { label: 'TestFieldHidden' }
+ },
+ preFilter: function(args) {
+ return ['fieldHidden'];
+ },
+ dataProvider: function(args) {
+ args.response.success({
+ data: [
+ { fieldA: 'FieldDataA', fieldB: 'FieldDataB', fieldHidden: 'FieldDataHidden' }
+ ]
+ });
+
+ start();
+ }
+ }
+ });
+
+ equal($listView.find('table tr th').size(), 2, 'Correct number of header columns present');
+ equal($listView.find('table.body tbody tr td').size(), 2, 'Correct number of data body columns present');
+ ok(!$listView.find('table.body tbody td.fieldHidden').size(), 'Hidden field not present');
+ });
}());