alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Common UI] Tweak mct-scroll-* directives

Browse Source 
Make fixes/tweaks to behavior of mct-scroll-x and mct-scroll-y
directives after testing them against timeline markup. WTD-920.
This commit is contained in:
Victor Woeltjen
2015-02-25 16:28:53 -08:00
parent 9a88e5172a
commit 9fa09e25f0
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/commonUI/general/test/directives/MCTScrollSpec.js
View File

@@ -26,7 +26,7 @@ define(
mockParsed = jasmine.createSpy('parsed');
mockParsed.assign = jasmine.createSpy('assign');
mockScope = jasmine.createSpyObj('$scope', ['$watch']);
mockScope = jasmine.createSpyObj('$scope', ['$watch', '$apply']);
mockElement = [{ testProperty: 42 }];
mockElement.on = jasmine.createSpy('on');
@@ -71,7 +71,7 @@ define(
it("publishes initial scroll state", function () {
expect(mockParse).toHaveBeenCalledWith(EXPRESSION);
expect(mockParsed.assign).toHaveBeenCalledWith(42);
expect(mockParsed.assign).toHaveBeenCalledWith(mockScope, 42);
});
it("updates scroll state when scope changes", function () {
@@ -82,7 +82,8 @@ define(
it("updates scope when scroll state changes", function () {
mockElement[0].testProperty = 12321;
mockElement.on.mostRecentCall.args[1]({ target: mockElement[0] });
expect(mockParsed.assign).toHaveBeenCalledWith(12321);
expect(mockParsed.assign).toHaveBeenCalledWith(mockScope, 12321);
expect(mockScope.$apply).toHaveBeenCalledWith(EXPRESSION);
});
});