Merge branch 'open1233' into open-master

This commit is contained in:
Victor Woeltjen
2015-06-29 15:09:40 -07:00
5 changed files with 62 additions and 6 deletions

View File

@ -34,6 +34,7 @@ define(
mockFormatter,
mockDomainObject,
mockSubscription,
mockEvent,
testGrid,
testModel,
testValues,
@ -98,6 +99,10 @@ define(
'subscription',
[ 'unsubscribe', 'getTelemetryObjects', 'getRangeValue', 'getDatum' ]
);
mockEvent = jasmine.createSpyObj(
'event',
[ 'preventDefault' ]
);
testGrid = [ 123, 456 ];
testModel = {
@ -302,7 +307,7 @@ define(
// Notify that a drop occurred
testModel.composition.push('d');
findOn('mctDrop')(
{},
mockEvent,
'd',
{ x: 300, y: 100 }
);
@ -310,12 +315,31 @@ define(
// Should have added an element
expect(testConfiguration.elements.length).toEqual(4);
// ...and prevented default...
expect(mockEvent.preventDefault).toHaveBeenCalled();
// Should have triggered commit (provided by
// EditRepresenter) with some message.
expect(mockScope.commit)
.toHaveBeenCalledWith(jasmine.any(String));
});
it("ignores drops when default has been prevented", function () {
// Avoids redundant drop-handling, WTD-1233
mockEvent.defaultPrevented = true;
// Notify that a drop occurred
testModel.composition.push('d');
findOn('mctDrop')(
mockEvent,
'd',
{ x: 300, y: 100 }
);
// Should NOT have added an element
expect(testConfiguration.elements.length).toEqual(3);
});
it("unsubscribes when destroyed", function () {
// Make an object available
findWatch('domainObject')(mockDomainObject);