diff --git a/platform/features/scrolling/test/DomainColumnSpec.js b/platform/features/scrolling/test/DomainColumnSpec.js index a7ee1b6589..e12501792b 100644 --- a/platform/features/scrolling/test/DomainColumnSpec.js +++ b/platform/features/scrolling/test/DomainColumnSpec.js @@ -8,6 +8,8 @@ define( function (DomainColumn) { "use strict"; + var TEST_DOMAIN_VALUE = "some formatted domain value"; + describe("A domain column", function () { var mockDataSet, testMetadata, @@ -27,6 +29,8 @@ define( key: "testKey", name: "Test Name" }; + mockFormatter.formatDomainValue.andReturn(TEST_DOMAIN_VALUE); + column = new DomainColumn(testMetadata, mockFormatter); }); @@ -42,8 +46,16 @@ define( it("formats domain values as time", function () { mockDataSet.getDomainValue.andReturn(402513731000); + + // Should have just given the value the formatter gave expect(column.getValue(undefined, mockDataSet, 42)) - .toEqual("1982-276 17:22:11"); + .toEqual(TEST_DOMAIN_VALUE); + + // Make sure that service interactions were as expected + expect(mockFormatter.formatDomainValue) + .toHaveBeenCalledWith(402513731000); + expect(mockFormatter.formatRangeValue) + .not.toHaveBeenCalled(); }); }); diff --git a/platform/features/scrolling/test/RangeColumnSpec.js b/platform/features/scrolling/test/RangeColumnSpec.js index a3fe4832e4..d7234fc712 100644 --- a/platform/features/scrolling/test/RangeColumnSpec.js +++ b/platform/features/scrolling/test/RangeColumnSpec.js @@ -8,6 +8,8 @@ define( function (RangeColumn) { "use strict"; + var TEST_RANGE_VALUE = "some formatted range value"; + describe("A range column", function () { var mockDataSet, testMetadata, @@ -27,6 +29,8 @@ define( key: "testKey", name: "Test Name" }; + mockFormatter.formatRangeValue.andReturn(TEST_RANGE_VALUE); + column = new RangeColumn(testMetadata, mockFormatter); }); @@ -43,7 +47,13 @@ define( it("formats range values as time", function () { mockDataSet.getRangeValue.andReturn(123.45678); expect(column.getValue(undefined, mockDataSet, 42)) - .toEqual("123.457"); + .toEqual(TEST_RANGE_VALUE); + + // Make sure that service interactions were as expected + expect(mockFormatter.formatRangeValue) + .toHaveBeenCalledWith(123.45678); + expect(mockFormatter.formatDomainValue) + .not.toHaveBeenCalled(); }); }); }