Added and fixed some tests for tag targeted effects

app/imports/api/engine/computation/computeComputation/tests/computeCalculations.testFn.js

@@ -0,0 +1,114 @@
+import { buildComputationFromProps } from '/imports/api/engine/computation/buildCreatureComputation.js';
+import { assert } from 'chai';
+import computeCreatureComputation from '../../computeCreatureComputation.js';
+import clean from '../../utility/cleanProp.testFn.js';
+
+export default function () {
+  const computation = buildComputationFromProps(testProperties);
+  computeCreatureComputation(computation);
+  const prop = id => computation.propsById[id];
+  // Tags target effects on attributes
+  assert.equal(prop('taggedCon').value, 26, 'Tagged targeted effects affect attribute values');
+  assert.equal(prop('taggedCon').baseValue.value, 10, 'Tag targeted effects target the attribute itself, not the base value');
+  // Tag target effects on a calculation
+  assert.equal(prop('attackAction').attackRoll.value, 20, 'Tag targeted effects change the attack roll correctly');
+  // Tag target effects can deal with rolls
+  assert.equal(prop('attackAction').attackRoll.value, 20, 'Tag targeted effects change the attack roll correctly');
+  assert.equal(prop('attackAction2').attackRoll.value, 'min(3 + d4, d100)', 'Tag targeted effects change the attack roll correctly');
+}
+
+var testProperties = [
+  // Constitution plus some effects that target it by tag
+  clean({
+    _id: 'taggedCon',
+    variableName: 'constitution',
+    type: 'attribute',
+    attributeType: 'ability',
+    baseValue: {
+      calculation: '10'
+    },
+    tags: ['tag']
+  }),
+  clean({
+    _id: 'add3ToCon',
+    type: 'effect',
+    operation: 'add',
+    amount: {
+      calculation: '3'
+    },
+    targetByTags: true,
+    targetTags: ['tag'],
+  }),
+  clean({
+    _id: 'mulConBy2',
+    type: 'effect',
+    operation: 'mul',
+    amount: {
+      calculation: '2'
+    },
+    targetByTags: true,
+    targetTags: ['tag'],
+  }),
+
+  // Attack action plus some effects that target it by tag
+  clean({
+    _id: 'attackAction',
+    type: 'action',
+    ancestors: [{ id: 'charId' }],
+    attackRoll: {
+      calculation: '3'
+    },
+    tags: ['attackTag']
+  }),
+  clean({
+    _id: 'add1ToAttack',
+    type: 'effect',
+    operation: 'add',
+    amount: {
+      calculation: '1'
+    },
+    targetByTags: true,
+    targetTags: ['attackTag'],
+  }),
+  clean({
+    _id: 'mulAttackBy5',
+    type: 'effect',
+    operation: 'mul',
+    amount: {
+      calculation: '5'
+    },
+    targetByTags: true,
+    targetTags: ['attackTag'],
+  }),
+
+  // Attack action plus some effects that target it by tag but have rolled values
+  clean({
+    _id: 'attackAction2',
+    type: 'action',
+    ancestors: [{ id: 'charId' }],
+    attackRoll: {
+      calculation: '3'
+    },
+    tags: ['attackTag2']
+  }),
+  clean({
+    _id: 'addD4ToAttackRoll',
+    type: 'effect',
+    operation: 'add',
+    amount: {
+      calculation: 'd4'
+    },
+    targetByTags: true,
+    targetTags: ['attackTag2'],
+  }),
+  clean({
+    _id: 'MaxAttackByD100',
+    type: 'effect',
+    operation: 'max',
+    amount: {
+      calculation: 'd100'
+    },
+    targetByTags: true,
+    targetTags: ['attackTag2'],
+  }),
+];

app/imports/api/engine/computation/computeComputation/tests/index.js

@@ -1,5 +1,6 @@
 import computeAction from './computeAction.testFn.js';
 import computeAttribute from './computeAttribute.testFn.js';
+import computeCalculations from './computeCalculations.testFn.js';
 import computeClasses from './computeClasses.testFn.js';
 import computeConstants from './computeConstants.testFn.js';
 import computeInventory from './computeInventory.testFn.js';
@@ -14,6 +15,9 @@ export default [{
 }, {
   text: 'Computes attributes',
   fn: computeAttribute,
+}, {
+  text: 'Computes calculations',
+  fn: computeCalculations,
 }, {
   text: 'Computes classes',
   fn: computeClasses,