From 0456189f44c87b51ee3a07a0e7af7507ee1eee6b Mon Sep 17 00:00:00 2001 From: thuva4 Date: Mon, 26 Feb 2018 09:20:56 +0530 Subject: Add sorting in pods page Show the results in sorted order Provide options to sort the results by name, role, mode Change-Id: I8b514769e9b878a0ff4bafcae8e909af3284f7ca Signed-off-by: thuva4 --- .../tests/UI/e2e/podsControllerSpec.js | 54 ++++++++++++++++------ 1 file changed, 39 insertions(+), 15 deletions(-) (limited to 'testapi/opnfv_testapi/tests/UI/e2e/podsControllerSpec.js') diff --git a/testapi/opnfv_testapi/tests/UI/e2e/podsControllerSpec.js b/testapi/opnfv_testapi/tests/UI/e2e/podsControllerSpec.js index 3505a84..0643097 100644 --- a/testapi/opnfv_testapi/tests/UI/e2e/podsControllerSpec.js +++ b/testapi/opnfv_testapi/tests/UI/e2e/podsControllerSpec.js @@ -5,19 +5,7 @@ var baseURL = "http://localhost:8000" describe('testing the Pods page for anonymous user', function () { beforeEach(function(){ - mock([{ - request: { - path: '/api/v1/pods', - method: 'GET' - }, - response: { - data: { - pods: [{role: "community-ci", name: "test", creator: "testUser", - details: "DemoDetails", mode: "metal", _id: "59f02f099a07c84bfc5c7aed", - creation_date: "2017-10-25 11:58:25.926168"}] - } - } - }, + mock([ { request: { path: '/api/v1/pods', @@ -33,7 +21,25 @@ describe('testing the Pods page for anonymous user', function () { creation_date: "2017-10-25 11:58:25.926168"}] } } - } + }, + { + request: { + path: '/api/v1/pods', + method: 'GET' + }, + response: { + data: { + pods: [ + {role: "community-ci", name: "test2", creator: "testUser", + details: "DemoDetails", mode: "metal", _id: "59f02f099a07c84bfc5c7ae5", + creation_date: "2017-10-25 11:58:25.926168"}, + {role: "production-ci", name: "test", creator: "testUser", + details: "DemoDetails", mode: "virtual", _id: "59f02f099a07c84bfc5c7aed", + creation_date: "2017-10-25 11:58:25.926168"} + ] + } + } + } ]); }); @@ -64,12 +70,30 @@ describe('testing the Pods page for anonymous user', function () { expect(buttonDelete.isDisplayed()).toBeFalsy(); }); - it('Show results', function () { + it('Show results in a sorted order', function () { var row = element.all(by.repeater('(index, pod) in ctrl.data.pods')).first(); var cells = row.all(by.tagName('td')); expect(cells.get(1).getText()).toContain("test"); }); + it('Sort the results by mode', function () { + browser.get(baseURL+'#/pods'); + var sortMode = element(by.xpath('//*[@id="ng-app"]/body/div/div[6]/div/table/thead/tr/th[4]/a[2]/span')) + sortMode.click(); + var row = element.all(by.repeater('(index, pod) in ctrl.data.pods')).first(); + var cells = row.all(by.tagName('td')); + expect(cells.get(1).getText()).toContain("test2"); + }); + + it('Sort the results by role', function () { + browser.get(baseURL+'#/pods'); + var sortRole = element(by.xpath('//*[@id="ng-app"]/body/div/div[6]/div/table/thead/tr/th[3]/a[2]/span')) + sortRole.click(); + var row = element.all(by.repeater('(index, pod) in ctrl.data.pods')).first(); + var cells = row.all(by.tagName('td')); + expect(cells.get(1).getText()).toContain("test2"); + }); + it('Show relevant results to the filter', function () { var filter = element(by.model('ctrl.filterText')); filter.sendKeys('test'); -- cgit 1.2.3-korg