Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change expected data to match change in table UI #11495

Merged
merged 8 commits into from
Apr 28, 2017
Merged

Change expected data to match change in table UI #11495

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a048572
Change expected data to match change in table UI
Apr 28, 2017
57b157a
fix more expected results for data UI change
Apr 28, 2017
daeae12
Revert one previous change and fix one other test
Apr 28, 2017
f67fde4
fix last issues
spalger Apr 28, 2017
73a7ea9
missed splitting the last array element
Apr 28, 2017
3935a6a
missed splitting the last array element
Apr 28, 2017
4cbb710
Merge branch 'master' of github.com:elastic/kibana into fixVerticalBa…
Apr 28, 2017
d551937
Merge branch 'fixVerticalBarTest' of github.com:LeeDr/kibana into fix…
Apr 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions test/functional/apps/management/_scripted_fields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ export default function ({ getService, getPageObjects }) {
});

it('should visualize scripted field in vertical bar chart', async function () {
const expectedChartValues = [ '14 31', '10 29', '7 24', '11 24', '12 23',
'20 23', '19 21', '6 20', '17 20', '30 20', '13 19', '18 18', '16 17', '5 16',
'8 16', '15 14', '3 13', '2 12', '9 10', '4 9'
const expectedChartValues = [ '14', '31', '10', '29', '7', '24', '11', '24', '12', '23',
'20', '23', '19', '21', '6', '20', '17', '20', '30', '20', '13', '19', '18', '18', '16', '17', '5', '16',
'8', '16', '15', '14', '3', '13', '2', '12', '9', '10', '4', '9'
];
await PageObjects.discover.removeAllFilters();
await PageObjects.discover.clickFieldListItemVisualize(scriptedExpressionFieldName);
Expand Down Expand Up @@ -155,9 +155,9 @@ export default function ({ getService, getPageObjects }) {
});

it('should visualize scripted field in vertical bar chart', async function () {
const expectedChartValues = [ '14 31', '10 29', '7 24', '11 24', '12 23',
'20 23', '19 21', '6 20', '17 20', '30 20', '13 19', '18 18', '16 17', '5 16',
'8 16', '15 14', '3 13', '2 12', '9 10', '4 9'
const expectedChartValues = [ '14', '31', '10', '29', '7', '24', '11', '24', '12', '23',
'20', '23', '19', '21', '6', '20', '17', '20', '30', '20', '13', '19', '18', '18', '16', '17', '5', '16',
'8', '16', '15', '14', '3', '13', '2', '12', '9', '10', '4', '9'
];
await PageObjects.discover.removeAllFilters();
await PageObjects.discover.clickFieldListItemVisualize(scriptedPainlessFieldName);
Expand Down Expand Up @@ -234,7 +234,7 @@ export default function ({ getService, getPageObjects }) {
await log.debug('getDataTableData = ' + data.split('\n'));
await log.debug('data=' + data);
await log.debug('data.length=' + data.length);
expect(data.trim().split('\n')).to.eql([ 'good 359', 'bad 27' ]);
expect(data.trim().split('\n')).to.eql([ 'good', '359', 'bad', '27' ]);
});
});

Expand Down Expand Up @@ -298,7 +298,7 @@ export default function ({ getService, getPageObjects }) {
await log.debug('getDataTableData = ' + data.split('\n'));
await log.debug('data=' + data);
await log.debug('data.length=' + data.length);
expect(data.trim().split('\n')).to.eql([ 'true 359', 'false 27' ]);
expect(data.trim().split('\n')).to.eql([ 'true', '359', 'false', '27' ]);
});
});

Expand Down Expand Up @@ -363,26 +363,26 @@ export default function ({ getService, getPageObjects }) {
await log.debug('data=' + data);
await log.debug('data.length=' + data.length);
expect(data.trim().split('\n')).to.eql([
'2015-09-17 20:00 1',
'2015-09-17 21:00 1',
'2015-09-17 23:00 1',
'2015-09-18 00:00 1',
'2015-09-18 03:00 1',
'2015-09-18 04:00 1',
'2015-09-18 04:00 1',
'2015-09-18 04:00 1',
'2015-09-18 04:00 1',
'2015-09-18 05:00 1',
'2015-09-18 05:00 1',
'2015-09-18 05:00 1',
'2015-09-18 05:00 1',
'2015-09-18 06:00 1',
'2015-09-18 06:00 1',
'2015-09-18 06:00 1',
'2015-09-18 06:00 1',
'2015-09-18 07:00 1',
'2015-09-18 07:00 1',
'2015-09-18 07:00 1',
'2015-09-17 20:00', '1',
'2015-09-17 21:00', '1',
'2015-09-17 23:00', '1',
'2015-09-18 00:00', '1',
'2015-09-18 03:00', '1',
'2015-09-18 04:00', '1',
'2015-09-18 04:00', '1',
'2015-09-18 04:00', '1',
'2015-09-18 04:00', '1',
'2015-09-18 05:00', '1',
'2015-09-18 05:00', '1',
'2015-09-18 05:00', '1',
'2015-09-18 05:00', '1',
'2015-09-18 06:00', '1',
'2015-09-18 06:00', '1',
'2015-09-18 06:00', '1',
'2015-09-18 06:00', '1',
'2015-09-18 07:00', '1',
'2015-09-18 07:00', '1',
'2015-09-18 07:00', '1',
]);
});
});
Expand Down
48 changes: 24 additions & 24 deletions test/functional/apps/visualize/_area_chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,30 +140,30 @@ export default function ({ getService, getPageObjects }) {
});

it('should show correct data', function () {
const expectedTableData = [ 'September 20th 2015, 00:00:00.000 37',
'September 20th 2015, 03:00:00.000 202',
'September 20th 2015, 06:00:00.000 740',
'September 20th 2015, 09:00:00.000 1,437',
'September 20th 2015, 12:00:00.000 1,371',
'September 20th 2015, 15:00:00.000 751',
'September 20th 2015, 18:00:00.000 188',
'September 20th 2015, 21:00:00.000 31',
'September 21st 2015, 00:00:00.000 42',
'September 21st 2015, 03:00:00.000 202',
'September 21st 2015, 06:00:00.000 683',
'September 21st 2015, 09:00:00.000 1,361',
'September 21st 2015, 12:00:00.000 1,415',
'September 21st 2015, 15:00:00.000 707',
'September 21st 2015, 18:00:00.000 177',
'September 21st 2015, 21:00:00.000 27',
'September 22nd 2015, 00:00:00.000 32',
'September 22nd 2015, 03:00:00.000 175',
'September 22nd 2015, 06:00:00.000 707',
'September 22nd 2015, 09:00:00.000 1,408',
'September 22nd 2015, 12:00:00.000 1,355',
'September 22nd 2015, 15:00:00.000 726',
'September 22nd 2015, 18:00:00.000 201',
'September 22nd 2015, 21:00:00.000 29'
const expectedTableData = [ 'September 20th 2015, 00:00:00.000', '37',
'September 20th 2015, 03:00:00.000', '202',
'September 20th 2015, 06:00:00.000', '740',
'September 20th 2015, 09:00:00.000', '1,437',
'September 20th 2015, 12:00:00.000', '1,371',
'September 20th 2015, 15:00:00.000', '751',
'September 20th 2015, 18:00:00.000', '188',
'September 20th 2015, 21:00:00.000', '31',
'September 21st 2015, 00:00:00.000', '42',
'September 21st 2015, 03:00:00.000', '202',
'September 21st 2015, 06:00:00.000', '683',
'September 21st 2015, 09:00:00.000', '1,361',
'September 21st 2015, 12:00:00.000', '1,415',
'September 21st 2015, 15:00:00.000', '707',
'September 21st 2015, 18:00:00.000', '177',
'September 21st 2015, 21:00:00.000', '27',
'September 22nd 2015, 00:00:00.000', '32',
'September 22nd 2015, 03:00:00.000', '175',
'September 22nd 2015, 06:00:00.000', '707',
'September 22nd 2015, 09:00:00.000', '1,408',
'September 22nd 2015, 12:00:00.000', '1,355',
'September 22nd 2015, 15:00:00.000', '726',
'September 22nd 2015, 18:00:00.000', '201',
'September 22nd 2015, 21:00:00.000', '29'
];

return PageObjects.visualize.collapseChart()
Expand Down
4 changes: 2 additions & 2 deletions test/functional/apps/visualize/_data_table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ export default function ({ getService, getPageObjects }) {

it('should show correct data, take screenshot', function () {
const expectedChartData = [
'0 2,088', '2,000 2,748', '4,000 2,707', '6,000 2,876',
'8,000 2,863', '10,000 147', '12,000 148', '14,000 129', '16,000 161', '18,000 137'
'0', '2,088', '2,000', '2,748', '4,000', '2,707', '6,000', '2,876',
'8,000', '2,863', '10,000', '147', '12,000', '148', '14,000', '129', '16,000', '161', '18,000', '137'
];

return retry.try(function () {
Expand Down
20 changes: 10 additions & 10 deletions test/functional/apps/visualize/_heatmap_chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,16 @@ export default function ({ getService, getPageObjects }) {

it('should show correct data', function () {
// this is only the first page of the tabular data.
const expectedChartData = [ 'September 20th 2015, 00:00:00.000 37',
'September 20th 2015, 03:00:00.000 202',
'September 20th 2015, 06:00:00.000 740',
'September 20th 2015, 09:00:00.000 1,437',
'September 20th 2015, 12:00:00.000 1,371',
'September 20th 2015, 15:00:00.000 751',
'September 20th 2015, 18:00:00.000 188',
'September 20th 2015, 21:00:00.000 31',
'September 21st 2015, 00:00:00.000 42',
'September 21st 2015, 03:00:00.000 202'
const expectedChartData = [ 'September 20th 2015, 00:00:00.000', '37',
'September 20th 2015, 03:00:00.000', '202',
'September 20th 2015, 06:00:00.000', '740',
'September 20th 2015, 09:00:00.000', '1,437',
'September 20th 2015, 12:00:00.000', '1,371',
'September 20th 2015, 15:00:00.000', '751',
'September 20th 2015, 18:00:00.000', '188',
'September 20th 2015, 21:00:00.000', '31',
'September 21st 2015, 00:00:00.000', '42',
'September 21st 2015, 03:00:00.000', '202'
];

return PageObjects.visualize.collapseChart()
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/visualize/_line_chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default function ({ getService, getPageObjects }) {

it('should show correct data, ordered by Term', function () {

const expectedChartData = ['png 1,373', 'php 445', 'jpg 9,109', 'gif 918', 'css 2,159'];
const expectedChartData = ['png', '1,373', 'php', '445', 'jpg', '9,109', 'gif', '918', 'css 2,159'];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missed one

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, I see that in the failed test. Checked in now


return PageObjects.visualize.collapseChart()
.then(function getDataTableData() {
Expand Down
4 changes: 2 additions & 2 deletions test/functional/apps/visualize/_pie_chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ export default function ({ getService, getPageObjects }) {
});

it('should show correct data', function () {
const expectedTableData = [ '0 55', '40,000 50', '80,000 41', '120,000 43',
'160,000 44', '200,000 40', '240,000 46', '280,000 39', '320,000 40', '360,000 47'
const expectedTableData = [ '0', '55', '40,000', '50', '80,000', '41', '120,000', '43',
'160,000', '44', '200,000', '40', '240,000', '46', '280,000', '39', '320,000', '40', '360,000', '47'
];

return PageObjects.visualize.collapseChart()
Expand Down
20 changes: 10 additions & 10 deletions test/functional/apps/visualize/_vertical_bar_chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,16 @@ export default function ({ getService, getPageObjects }) {

it('should show correct data', function () {
// this is only the first page of the tabular data.
const expectedChartData = [ 'September 20th 2015, 00:00:00.000 37',
'September 20th 2015, 03:00:00.000 202',
'September 20th 2015, 06:00:00.000 740',
'September 20th 2015, 09:00:00.000 1,437',
'September 20th 2015, 12:00:00.000 1,371',
'September 20th 2015, 15:00:00.000 751',
'September 20th 2015, 18:00:00.000 188',
'September 20th 2015, 21:00:00.000 31',
'September 21st 2015, 00:00:00.000 42',
'September 21st 2015, 03:00:00.000 202'
const expectedChartData = [ 'September 20th 2015, 00:00:00.000', '37',
'September 20th 2015, 03:00:00.000', '202',
'September 20th 2015, 06:00:00.000', '740',
'September 20th 2015, 09:00:00.000', '1,437',
'September 20th 2015, 12:00:00.000', '1,371',
'September 20th 2015, 15:00:00.000', '751',
'September 20th 2015, 18:00:00.000', '188',
'September 20th 2015, 21:00:00.000', '31',
'September 21st 2015, 00:00:00.000', '42',
'September 21st 2015, 03:00:00.000', '202'
];

return PageObjects.visualize.collapseChart()
Expand Down