diff --git a/README.md b/README.md index a40e681..1098981 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,13 @@

- Build Status + Build Status - Coverage Status + Coverage Status - - NPM Version + + NPM Version

diff --git a/src/__tests__/composite.spec.js b/src/__tests__/composite.spec.js index 0ecc706..3724c33 100644 --- a/src/__tests__/composite.spec.js +++ b/src/__tests__/composite.spec.js @@ -4,9 +4,9 @@ describe('composite.spec', () => { const cases = require('jest-in-case') const { - serieSelector, - serieSequence, - serieAll, + serialSelector, + serialSequence, + serialAll, parallelSequence, parallelSelector, parallelAll, @@ -84,22 +84,22 @@ describe('composite.spec', () => { expect(success).toBeCalled() }, { - 'serie sequence': { composite: serieSequence }, - 'serie selector': { composite: serieSelector }, - 'serie all': { composite: serieAll }, + 'serial sequence': { composite: serialSequence }, + 'serial selector': { composite: serialSelector }, + 'serial all': { composite: serialAll }, 'parallel sequence': { composite: parallelSequence }, 'parallel selector': { composite: parallelSelector }, 'parallel all': { composite: parallelAll }, }, ) - describe('serie', () => { + describe('serial', () => { describe('sequence', () => { it('should success when all task succeed', () => { createSuccessTask = getCreateSuccessTask() - const task = serieSequence(createSuccessTask, createSuccessTask)(success, fail, message) - expect(task.name).toBe('serie-sequence') + const task = serialSequence(createSuccessTask, createSuccessTask)(success, fail, message) + expect(task.name).toBe('serial-sequence') task.run() @@ -116,8 +116,8 @@ describe('composite.spec', () => { createSuccessTask = getCreateSuccessTask() createFailTask = getCreateFailTask() - const task = serieSequence(createSuccessTask, createFailTask, createSuccessTask)(success, fail, message) - expect(task.name).toBe('serie-sequence') + const task = serialSequence(createSuccessTask, createFailTask, createSuccessTask)(success, fail, message) + expect(task.name).toBe('serial-sequence') task.run() @@ -132,8 +132,8 @@ describe('composite.spec', () => { createSuccessTask = getCreateSuccessTask(true) createFailTask = getCreateFailTask(true) - const task = serieSequence(createSuccessTask, createFailTask, createSuccessTask)(success, fail, message) - expect(task.name).toBe('serie-sequence') + const task = serialSequence(createSuccessTask, createFailTask, createSuccessTask)(success, fail, message) + expect(task.name).toBe('serial-sequence') task.run() @@ -159,8 +159,8 @@ describe('composite.spec', () => { it('should fail when all task failed', () => { createFailTask = getCreateFailTask() - const task = serieSelector(createFailTask, createFailTask)(success, fail, message) - expect(task.name).toBe('serie-selector') + const task = serialSelector(createFailTask, createFailTask)(success, fail, message) + expect(task.name).toBe('serial-selector') task.run() @@ -177,8 +177,8 @@ describe('composite.spec', () => { createSuccessTask = getCreateSuccessTask() createFailTask = getCreateFailTask() - const task = serieSelector(createFailTask, createSuccessTask, createFailTask)(success, fail, message) - expect(task.name).toBe('serie-selector') + const task = serialSelector(createFailTask, createSuccessTask, createFailTask)(success, fail, message) + expect(task.name).toBe('serial-selector') task.run() @@ -193,8 +193,8 @@ describe('composite.spec', () => { createSuccessTask = getCreateSuccessTask(true) createFailTask = getCreateFailTask(true) - const task = serieSelector(createFailTask, createSuccessTask, createFailTask)(success, fail, message) - expect(task.name).toBe('serie-selector') + const task = serialSelector(createFailTask, createSuccessTask, createFailTask)(success, fail, message) + expect(task.name).toBe('serial-selector') task.run() @@ -220,8 +220,8 @@ describe('composite.spec', () => { it('should success when all task succeed', () => { createSuccessTask = getCreateSuccessTask() - const task = serieAll(createSuccessTask, createSuccessTask)(success, fail, message) - expect(task.name).toBe('serie-all') + const task = serialAll(createSuccessTask, createSuccessTask)(success, fail, message) + expect(task.name).toBe('serial-all') task.run() @@ -236,8 +236,8 @@ describe('composite.spec', () => { createSuccessTask = getCreateSuccessTask() createFailTask = getCreateFailTask() - const task = serieAll(createSuccessTask, createFailTask, createSuccessTask)(success, fail, message) - expect(task.name).toBe('serie-all') + const task = serialAll(createSuccessTask, createFailTask, createSuccessTask)(success, fail, message) + expect(task.name).toBe('serial-all') task.run() @@ -252,8 +252,8 @@ describe('composite.spec', () => { createSuccessTask = getCreateSuccessTask(true) createFailTask = getCreateFailTask(true) - const task = serieAll(createSuccessTask, createFailTask, createSuccessTask)(success, fail, message) - expect(task.name).toBe('serie-all') + const task = serialAll(createSuccessTask, createFailTask, createSuccessTask)(success, fail, message) + expect(task.name).toBe('serial-all') task.run() diff --git a/src/__tests__/configArray.spec.js b/src/__tests__/configArray.spec.js index 1308739..93ad4cc 100644 --- a/src/__tests__/configArray.spec.js +++ b/src/__tests__/configArray.spec.js @@ -1,6 +1,6 @@ describe('configArray.spec', () => { jest.mock('../composite', () => ({ - serieSelector: jest.fn(), + serialSelector: jest.fn(), parallelSequence: jest.fn(), })) @@ -17,7 +17,7 @@ describe('configArray.spec', () => { const createTask3 = () => {} beforeEach(() => { - composite.serieSelector.mockClear() + composite.serialSelector.mockClear() composite.parallelSequence.mockClear() }) @@ -31,36 +31,36 @@ describe('configArray.spec', () => { { null: { config: null, message: errorElement }, '[]': { config: [], message: errorCompositeName }, - '["serieSelector"]': { - config: ['serieSelector'], + '["serialSelector"]': { + config: ['serialSelector'], message: errorComposite, }, '["unknown", () => {}]': { config: ['unknown', () => {}], message: errorCompositeName, }, - '["serieSelector", null]': { - config: ['serieSelector', null], + '["serialSelector", null]': { + config: ['serialSelector', null], message: errorElement, }, - '["serieSelector", []]': { - config: ['serieSelector', []], + '["serialSelector", []]': { + config: ['serialSelector', []], message: errorCompositeName, }, - '["serieSelector", ["parallelSequence"]]': { - config: ['serieSelector', ['parallelSequence']], + '["serialSelector", ["parallelSequence"]]': { + config: ['serialSelector', ['parallelSequence']], message: errorComposite, }, - '["serieSelector", ["unknown", () => {}]]': { - config: ['serieSelector', ['unknown', () => {}]], + '["serialSelector", ["unknown", () => {}]]': { + config: ['serialSelector', ['unknown', () => {}]], message: errorCompositeName, }, - '["serieSelector", ["parallelSequence", null]]': { - config: ['serieSelector', ['parallelSequence', null]], + '["serialSelector", ["parallelSequence", null]]': { + config: ['serialSelector', ['parallelSequence', null]], message: errorElement, }, - '["serieSelector", ["parallelSequence", []]]': { - config: ['serieSelector', ['parallelSequence', []]], + '["serialSelector", ["parallelSequence", []]]': { + config: ['serialSelector', ['parallelSequence', []]], message: errorCompositeName, }, }, @@ -72,19 +72,19 @@ describe('configArray.spec', () => { }) it('should parse a single composite config', () => { - configArray(['serieSelector', createTask1, createTask2]) + configArray(['serialSelector', createTask1, createTask2]) - expect(composite.serieSelector).toBeCalledWith(createTask1, createTask2) + expect(composite.serialSelector).toBeCalledWith(createTask1, createTask2) }) it('should parse a two-levels composite config', () => { const parallelSequenceTaskBuilder = () => {} composite.parallelSequence.mockImplementation(() => parallelSequenceTaskBuilder) - configArray(['serieSelector', createTask1, ['parallelSequence', createTask2, createTask3]]) + configArray(['serialSelector', createTask1, ['parallelSequence', createTask2, createTask3]]) expect(composite.parallelSequence).toBeCalledWith(createTask2, createTask3) - expect(composite.serieSelector).toBeCalledWith(createTask1, parallelSequenceTaskBuilder) + expect(composite.serialSelector).toBeCalledWith(createTask1, parallelSequenceTaskBuilder) }) }) }) diff --git a/src/composite.js b/src/composite.js index 818d705..7345127 100644 --- a/src/composite.js +++ b/src/composite.js @@ -53,7 +53,7 @@ const composite = (branch, mode) => (...createTasks) => { } } - if (branch === SERIE) { + if (branch === SERIAL) { runNext = (i, ...params) => tasks[i + 1].run(...params) runAll = (...params) => runNext(-1, ...params) } else { @@ -76,11 +76,11 @@ const composite = (branch, mode) => (...createTasks) => { } } -const SERIE = 0 +const SERIAL = 0 const PARALLEL = 1 const BRANCH_NAME = { - [SERIE]: 'serie', + [SERIAL]: 'serial', [PARALLEL]: 'parallel', } @@ -94,9 +94,9 @@ const MODE_NAME = { [ALL]: 'all', } -export const serieSequence = composite(SERIE, SEQUENCE) -export const serieSelector = composite(SERIE, SELECTOR) -export const serieAll = composite(SERIE, ALL) +export const serialSequence = composite(SERIAL, SEQUENCE) +export const serialSelector = composite(SERIAL, SELECTOR) +export const serialAll = composite(SERIAL, ALL) export const parallelSequence = composite(PARALLEL, SEQUENCE) export const parallelSelector = composite(PARALLEL, SELECTOR)