Repository: aurora Updated Branches: refs/heads/master e161c97ba -> 48ebfef48
Fix instance range display Reviewed at https://reviews.apache.org/r/63087/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/48ebfef4 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/48ebfef4 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/48ebfef4 Branch: refs/heads/master Commit: 48ebfef48868e8dacd43a3d5eca2b5b33846fb03 Parents: e161c97 Author: David McLaughlin <[email protected]> Authored: Tue Oct 17 14:44:11 2017 -0700 Committer: David McLaughlin <[email protected]> Committed: Tue Oct 17 14:44:11 2017 -0700 ---------------------------------------------------------------------- ui/src/main/js/utils/Task.js | 2 +- ui/src/main/js/utils/__tests__/Task-test.js | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/48ebfef4/ui/src/main/js/utils/Task.js ---------------------------------------------------------------------- diff --git a/ui/src/main/js/utils/Task.js b/ui/src/main/js/utils/Task.js index 3259623..7da6d10 100644 --- a/ui/src/main/js/utils/Task.js +++ b/ui/src/main/js/utils/Task.js @@ -44,7 +44,7 @@ export function getDuration(task) { } export function instanceRangeToString(ranges) { - return ranges.map(({first, last}) => (first === last) ? first : `${first} - ${last}`); + return ranges.map(({first, last}) => (first === last) ? first : `${first} - ${last}`).join(', '); } export function getActiveResource(resource) { http://git-wip-us.apache.org/repos/asf/aurora/blob/48ebfef4/ui/src/main/js/utils/__tests__/Task-test.js ---------------------------------------------------------------------- diff --git a/ui/src/main/js/utils/__tests__/Task-test.js b/ui/src/main/js/utils/__tests__/Task-test.js new file mode 100644 index 0000000..784cafa --- /dev/null +++ b/ui/src/main/js/utils/__tests__/Task-test.js @@ -0,0 +1,19 @@ +import { instanceRangeToString } from '../Task'; + +function range(first, last) { + return {first, last}; +} + +describe('instanceRangeToString', () => { + it('Should handle single instance ranges', () => { + expect(instanceRangeToString([range(0, 0)])).toBe('0'); + }); + + it('Should handle multiple single instance ranges', () => { + expect(instanceRangeToString([range(0, 0), range(1, 1), range(2, 2)])).toBe('0, 1, 2'); + }); + + it('Should handle instance ranges', () => { + expect(instanceRangeToString([range(0, 5), range(6, 6), range(7, 7)])).toBe('0 - 5, 6, 7'); + }); +});
