Merge branch 'condition-ui' of https://github.com/nasa/openmct into set-criteria-options

This commit is contained in:
Joshi 2020-01-28 16:33:38 -08:00
commit 6f6fb859d6

View File

@ -65,7 +65,7 @@ describe("The condition", function () {
testConditionDefinition = {
definition: {
trigger: 'any',
trigger: TRIGGER.ANY,
criteria: [
{
operation: 'equalTo',
@ -103,7 +103,6 @@ describe("The condition", function () {
it("initializes with criteria from the condition definition", function () {
expect(conditionObj.criteria.length).toEqual(1);
let criterion = conditionObj.criteria[0];
console.log(criterion);
expect(criterion instanceof TelemetryCriterion).toBeTrue();
expect(criterion.operator).toEqual(testConditionDefinition.definition.criteria[0].operator);
expect(criterion.input).toEqual(testConditionDefinition.definition.criteria[0].input);