Added failing test case for #316 trigger match bug

app/imports/api/engine/actions/applyTriggers.js

@@ -35,7 +35,7 @@ export function applyTrigger(trigger, prop, actionContext) {
   if (trigger.inactive) {
     return;
   }
-  
+
   // Prevent triggers from firing if their condition is false
   if (trigger.condition?.parseNode) {
     recalculateCalculation(trigger.condition, actionContext);
@@ -61,11 +61,11 @@ export function applyTrigger(trigger, prop, actionContext) {
     value: trigger.description,
     inline: false,
   }
-  if (trigger.description?.text){
+  if (trigger.description?.text) {
     recalculateInlineCalculations(trigger.description, actionContext);
     content.value = trigger.description.value;
   }
-  if(!trigger.silent) actionContext.addLog(content);
+  if (!trigger.silent) actionContext.addLog(content);
 
   // Get all the trigger's properties and apply them
   const properties = getPropertyDecendants(actionContext.creature._id, trigger._id);
@@ -78,7 +78,7 @@ export function applyTrigger(trigger, prop, actionContext) {
   trigger.firing = false;
 }
 
-function triggerMatchTags(trigger, prop) {
+export function triggerMatchTags(trigger, prop) {
   let matched = false;
   const propTags = getEffectivePropTags(prop);
   // Check the target tags

app/imports/api/engine/actions/applyTriggers.testFn.js

@@ -0,0 +1,67 @@
+import { triggerMatchTags } from '/imports/api/engine/actions/applyTriggers.js';
+import clean from '/imports/api/engine/computation/utility/cleanProp.testFn.js';
+import { assert } from 'chai';
+
+export default function () {
+  const prop = clean({
+    id: 'propWithTags',
+    type: 'action',
+    tags: ['yes1', 'notUsed', 'no1', 'yes2', 'no2', 'or1', 'or2'],
+  });
+  const positiveProp = clean({
+    id: 'propWithTags',
+    type: 'action',
+    tags: ['yes1', 'notUsed', 'yes2', 'or1', 'or2'],
+  });
+  assert.isTrue(
+    triggerMatchTags(clean({
+      type: 'trigger',
+      targetTags: ['yes1'],
+    }), prop),
+    'Trigger matches on a single target tag'
+  );
+  assert.isTrue(
+    triggerMatchTags(clean({
+      type: 'trigger',
+      targetTags: ['yes1', 'yes2'],
+    }), prop),
+    'Trigger matches on a multiple target tags'
+  );
+  assert.isFalse(
+    triggerMatchTags(clean({
+      type: 'trigger',
+      targetTags: ['yes1'],
+      extraTags: [{ operation: 'NOT', tags: ['no1'] }]
+    }), prop),
+    'Trigger correctly fails to match when not tags are present'
+  );
+  assert.isFalse(
+    triggerMatchTags(clean({
+      type: 'trigger',
+      extraTags: [{ operation: 'NOT', tags: ['no1'] }]
+    }), prop),
+    'Trigger correctly fails to match when only not tags are present'
+  );
+  assert.isTrue(
+    triggerMatchTags(clean({
+      type: 'trigger',
+      extraTags: [{ operation: 'NOT', tags: ['no1'] }]
+    }), positiveProp),
+    'Trigger matches when only not tags are present'
+  );
+  assert.isTrue(
+    triggerMatchTags(clean({
+      type: 'trigger',
+      extraTags: [{ operation: 'Or', tags: ['or1'] }]
+    }), positiveProp),
+    'Trigger matches when OR tags are present'
+  );
+  assert.isTrue(
+    triggerMatchTags(clean({
+      type: 'trigger',
+      targetTags: ['missing1'],
+      extraTags: [{ operation: 'Or', tags: ['or1'] }]
+    }), positiveProp),
+    'Trigger matches when only OR tags are present'
+  );
+}

app/imports/api/engine/actions/doAction.test.js

@@ -1,16 +1,17 @@
 import '/imports/api/simpleSchemaConfig.js';
 //import testTypes from './testTypes/index.js';
+import applyTriggers from '/imports/api/engine/actions/applyTriggers.testFn.js';
 import { doActionWork } from './doAction.js';
 import { CreatureLogSchema } from '/imports/api/creature/log/CreatureLogs.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 
-function cleanProp(prop){
+function cleanProp(prop) {
   let schema = CreatureProperties.simpleSchema(prop);
   return schema.clean(prop);
 }
 
-function cleanCreature(creature){
+function cleanCreature(creature) {
   let schema = Creatures.simpleSchema(creature);
   return schema.clean(creature);
 }
@@ -28,7 +29,7 @@ const testActionContext = {
   }),
   scope: {},
   addLog(content) {
-    if (content.name || content.value){
+    if (content.name || content.value) {
       this.log.content.push(content);
     }
   },
@@ -40,8 +41,8 @@ const action = cleanProp({
 });
 const actionAncestors = [];
 
-describe('Do Action', function(){
-  it('Does an empty action', function(){
+describe('Do Action', function () {
+  it('Does an empty action', function () {
     doActionWork({
       properties: [action],
       ancestors: actionAncestors,
@@ -51,3 +52,7 @@ describe('Do Action', function(){
   });
   //testTypes.forEach(test => it(test.text, test.fn));
 });
+
+describe('Action utility functions', function () {
+  it('Triggers match tags', applyTriggers);
+})