test: . Rename blockedBy to blockedBy in TaskBuilder

Author: claremacrae

tests/Query/Filter/BlockedByField.test.ts

@@ -14,8 +14,8 @@ describe('id', () => {
         const filter = new BlockedByField().createFilterOrErrorMessage('has blocked by');
 
         // Act, Assert
-        testFilter(filter, new TaskBuilder().blockedBy([]), false);
-        testFilter(filter, new TaskBuilder().blockedBy(['abcdef']), true);
+        testFilter(filter, new TaskBuilder().dependsOn([]), false);
+        testFilter(filter, new TaskBuilder().dependsOn(['abcdef']), true);
     });
 
     it('by blocked by absence', () => {
@@ -25,7 +25,7 @@ describe('id', () => {
         expect(blockedByField.canCreateFilterForLine(line)).toEqual(true);
 
         // Act, Assert
-        testFilter(filter, new TaskBuilder().blockedBy([]), true);
-        testFilter(filter, new TaskBuilder().blockedBy(['abcdef']), false);
+        testFilter(filter, new TaskBuilder().dependsOn([]), true);
+        testFilter(filter, new TaskBuilder().dependsOn(['abcdef']), false);
     });
 });

tests/Query/Filter/BlockingField.test.ts

@@ -9,7 +9,7 @@ describe('blocking', () => {
     const child = new TaskBuilder().id('12345').build();
     const childWithoutParent = new TaskBuilder().id('23456').build();
     const childThatIsDone = new TaskBuilder().id('34567').status(Status.makeDone()).build();
-    const parent = new TaskBuilder().blockedBy(['12345', '34567']).build();
+    const parent = new TaskBuilder().dependsOn(['12345', '34567']).build();
     const allTasks = [notBlocking, child, childWithoutParent, childThatIsDone, parent];
 
     const isBlocking = new BlockingField().createFilterOrErrorMessage('is blocking');
@@ -39,9 +39,9 @@ describe('blocking', () => {
         const id1 = '1';
         const id2 = '2';
         const id3 = '3';
-        const task1 = new TaskBuilder().id(id1).blockedBy([id2]).build();
-        const task2 = new TaskBuilder().id(id2).blockedBy([id3]).build();
-        const task3 = new TaskBuilder().id(id3).blockedBy([id1]).build();
+        const task1 = new TaskBuilder().id(id1).dependsOn([id2]).build();
+        const task2 = new TaskBuilder().id(id2).dependsOn([id3]).build();
+        const task3 = new TaskBuilder().id(id3).dependsOn([id1]).build();
         const allTasks = [task1, task2, task3];
 
         expect(isBlocking).toMatchTaskInTaskList(task1, allTasks);
@@ -52,7 +52,7 @@ describe('blocking', () => {
     it('should work with Boolean filters', function () {
         const id = 'abc';
         const task1 = new TaskBuilder().id(id).build();
-        const task2 = new TaskBuilder().blockedBy([id]).build();
+        const task2 = new TaskBuilder().dependsOn([id]).build();
         const allTasks = [task1, task2];
 
         const booleanFilter = new BooleanField().createFilterOrErrorMessage('NOT ( NOT ( is blocking ) )');
@@ -70,7 +70,7 @@ describe('blocked', () => {
     const blocking = new TaskBuilder().id(blockingId).build();
 
     it('should hide blocked tasks', () => {
-        const blocked = new TaskBuilder().blockedBy([blockingId]).build();
+        const blocked = new TaskBuilder().dependsOn([blockingId]).build();
         const allTasks = [blocking, blocked];
 
         expect(isNotBlocked).toBeValid();
@@ -86,9 +86,9 @@ describe('blocked', () => {
         const blockingCompletedId = 'def';
         const blockingCompleted = new TaskBuilder().id(blockingCompletedId).status(Status.DONE).build();
 
-        const blockedByIncomplete = new TaskBuilder().blockedBy([blockingId]).build();
-        const blockedByComplete = new TaskBuilder().blockedBy([blockingCompletedId]).build();
-        const blockedByAll = new TaskBuilder().blockedBy([blockingId, blockingCompletedId]).build();
+        const blockedByIncomplete = new TaskBuilder().dependsOn([blockingId]).build();
+        const blockedByComplete = new TaskBuilder().dependsOn([blockingCompletedId]).build();
+        const blockedByAll = new TaskBuilder().dependsOn([blockingId, blockingCompletedId]).build();
 
         const allTasks = [blocking, blockedByIncomplete, blockedByComplete, blockedByAll, blockingCompleted];
 

tests/Task/Task.test.ts

@@ -1579,9 +1579,9 @@ describe('identicalTo', () => {
     });
 
     it('should check blockedBy', () => {
-        const lhs = new TaskBuilder().blockedBy([]);
-        expect(lhs).toBeIdenticalTo(new TaskBuilder().blockedBy([]));
-        expect(lhs).not.toBeIdenticalTo(new TaskBuilder().blockedBy(['12345']));
+        const lhs = new TaskBuilder().dependsOn([]);
+        expect(lhs).toBeIdenticalTo(new TaskBuilder().dependsOn([]));
+        expect(lhs).not.toBeIdenticalTo(new TaskBuilder().dependsOn(['12345']));
     });
 
     it('should correctly compare a task with status read from user settings', () => {

tests/Task/TaskDependency.test.ts

@@ -38,7 +38,7 @@ describe('TaskDependency', () => {
 
     it('Should not create a duplicate dependency - using addDependency', () => {
         const childTask = new TaskBuilder().id('123456').build();
-        const parentTask = new TaskBuilder().blockedBy(['123456']).description('parent task').build();
+        const parentTask = new TaskBuilder().dependsOn(['123456']).description('parent task').build();
 
         const [newParent, newChild] = addDependency(parentTask, childTask, ['123456']);
 
@@ -62,7 +62,7 @@ describe('TaskDependency', () => {
 
     it('Should remove a dependency', () => {
         const childTask = new TaskBuilder().id('123456').build();
-        const parentTask = new TaskBuilder().blockedBy(['123456']).description('parent task').build();
+        const parentTask = new TaskBuilder().dependsOn(['123456']).description('parent task').build();
 
         const newParent = removeDependency(parentTask, childTask);
 
@@ -75,7 +75,7 @@ describe('TaskDependency', () => {
         const childTask1 = new TaskBuilder().id('123456').build();
         const childTask2 = new TaskBuilder().id('234567').build();
         const childTask3 = new TaskBuilder().id('345678').build();
-        const parentTask = new TaskBuilder().description('parent task').blockedBy(['012345']).build();
+        const parentTask = new TaskBuilder().description('parent task').dependsOn(['012345']).build();
 
         const newParent = setDependenciesOnTasksWithIds(parentTask, [childTask1, childTask2, childTask3]);
 
@@ -85,7 +85,7 @@ describe('TaskDependency', () => {
 
     it('Should not create a duplicate dependency - using setDependenciesOnTasksWithIds', () => {
         const childTask = new TaskBuilder().id('123456').build();
-        const parentTask = new TaskBuilder().blockedBy(['123456']).description('parent task').build();
+        const parentTask = new TaskBuilder().dependsOn(['123456']).description('parent task').build();
 
         const newParent = setDependenciesOnTasksWithIds(parentTask, [childTask]);
 

tests/TaskSerializer/DefaultTaskSerializer.test.ts

@@ -139,7 +139,7 @@ describe.each(symbolMap)("DefaultTaskSerializer with '$taskFormat' symbols", ({
         });
 
         it('should serialize depends on', () => {
-            const task = new TaskBuilder().description('').blockedBy(['123456', 'abc123']).build();
+            const task = new TaskBuilder().description('').dependsOn(['123456', 'abc123']).build();
             const serialized = serialize(task);
             expect(serialized).toEqual(` ${blockedBySymbol} 123456,abc123`);
         });

tests/TestingTools/SampleTasks.ts

@@ -217,7 +217,7 @@ export class SampleTasks {
         const id2 = '0h17ye';
         return [
             new TaskBuilder().description('do this first').id(id1).build(),
-            new TaskBuilder().description('do this after first and some other task').blockedBy([id1, id2]).build(),
+            new TaskBuilder().description('do this after first and some other task').dependsOn([id1, id2]).build(),
         ];
     }
 

tests/TestingTools/TaskBuilder.ts

@@ -48,7 +48,7 @@ export class TaskBuilder {
 
     private _scheduledDateIsInferred: boolean = false;
     private _id: string = '';
-    private _blockedBy: string[] = [];
+    private _dependsOn: string[] = [];
 
     /**
      * Build a Task
@@ -88,7 +88,7 @@ export class TaskBuilder {
             doneDate: this._doneDate,
             cancelledDate: this._cancelledDate,
             recurrence: this._recurrence,
-            blockedBy: this._blockedBy,
+            blockedBy: this._dependsOn,
             id: this._id,
             blockLink: this._blockLink,
             tags: this._tags,
@@ -118,7 +118,7 @@ export class TaskBuilder {
             .dueDate('2023-07-04')
             .doneDate('2023-07-05')
             .cancelledDate('2023-07-06')
-            .blockedBy(['123456', 'abc123'])
+            .dependsOn(['123456', 'abc123'])
             .id('abcdef')
             .blockLink(' ^dcf64c')
             // Values in TaskLocation:
@@ -276,8 +276,8 @@ export class TaskBuilder {
         return this;
     }
 
-    public blockedBy(blockedBy: string[]) {
-        this._blockedBy = blockedBy;
+    public dependsOn(dependsOn: string[]) {
+        this._dependsOn = dependsOn;
         return this;
     }