Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

<p align="center">
<a href="https://travis-ci.org/DevSide/tasko">
<img src="https://travis-ci.org/DevSide/tasko.svg?branch=master" alt="Build Status">
<img src="https://img.shields.io/travis/DevSide/tasko/master.svg" alt="Build Status">
</a>
<a href='https://coveralls.io/github/DevSide/tasko?branch=master'>
<img src='https://coveralls.io/repos/github/DevSide/tasko/badge.svg?branch=master' alt='Coverage Status' />
<img src='https://img.shields.io/coveralls/github/DevSide/tasko/master.svg' alt='Coverage Status' />
</a>
<a href="http://badge.fury.io/js/tasko">
<img src="https://badge.fury.io/js/tasko.svg" alt="NPM Version">
<a href="https://www.npmjs.com/package/tasko">
<img src="https://img.shields.io/npm/v/tasko.svg" alt="NPM Version">
</a>
</p>

Expand Down
50 changes: 25 additions & 25 deletions src/__tests__/composite.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ describe('composite.spec', () => {
const cases = require('jest-in-case')

const {
serieSelector,
serieSequence,
serieAll,
serialSelector,
serialSequence,
serialAll,
parallelSequence,
parallelSelector,
parallelAll,
Expand Down Expand Up @@ -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()

Expand All @@ -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()

Expand All @@ -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()

Expand All @@ -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()

Expand All @@ -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()

Expand All @@ -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()

Expand All @@ -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()

Expand All @@ -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()

Expand All @@ -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()

Expand Down
40 changes: 20 additions & 20 deletions src/__tests__/configArray.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe('configArray.spec', () => {
jest.mock('../composite', () => ({
serieSelector: jest.fn(),
serialSelector: jest.fn(),
parallelSequence: jest.fn(),
}))

Expand All @@ -17,7 +17,7 @@ describe('configArray.spec', () => {
const createTask3 = () => {}

beforeEach(() => {
composite.serieSelector.mockClear()
composite.serialSelector.mockClear()
composite.parallelSequence.mockClear()
})

Expand All @@ -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,
},
},
Expand All @@ -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)
})
})
})
12 changes: 6 additions & 6 deletions src/composite.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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',
}

Expand All @@ -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)
Expand Down