From db054d6d06437cd94b6cb2dd3db319be03e0d0e4 Mon Sep 17 00:00:00 2001 From: Gantcho Kojuharov Date: Mon, 24 Jul 2017 16:09:08 +0300 Subject: [PATCH] do not remove service links --- src/coffee/compose.coffee | 2 +- tests/coffee/compose.test.coffee | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/coffee/compose.coffee b/src/coffee/compose.coffee index 3c86abb..15d441e 100644 --- a/src/coffee/compose.coffee +++ b/src/coffee/compose.coffee @@ -23,7 +23,7 @@ module.exports = (config) -> for l in links deps[l] = condition: 'service_started' unless deps[l] service.depends_on = deps - delete service.links + # delete service.links _resolvePath: resolvePath = (root, path) -> path = path[1...] if path[0] is '/' diff --git a/tests/coffee/compose.test.coffee b/tests/coffee/compose.test.coffee index 89c74b4..621732f 100644 --- a/tests/coffee/compose.test.coffee +++ b/tests/coffee/compose.test.coffee @@ -50,24 +50,30 @@ describe 'Compose', -> links: ['db'] depends_on: ['some_other_service'] compose(standardCfg)._migrateLinksToDependsOn '', service - assert.deepEqual service, depends_on: - db: {condition: 'service_started'} - some_other_service: {condition: 'service_started'} + assert.deepEqual service, + links: ['db'] + depends_on: + db: {condition: 'service_started'} + some_other_service: {condition: 'service_started'} it 'should merge all links with all depends_on (as object) services', -> service = links: ['db'] depends_on: some_other_service: condition: 'some_condition' compose(standardCfg)._migrateLinksToDependsOn '', service - assert.deepEqual service, depends_on: - db: {condition: 'service_started'} - some_other_service: {condition: 'some_condition'} + assert.deepEqual service, + links: ['db'] + depends_on: + db: {condition: 'service_started'} + some_other_service: {condition: 'some_condition'} it 'should prefer a dependency from depends_on over one from links if they are the same', -> service = links: ['db'] depends_on: db: condition: 'my_specific_condition' compose(standardCfg)._migrateLinksToDependsOn '', service - assert.deepEqual service, depends_on: - db: {condition: 'my_specific_condition'} + assert.deepEqual service, + links: ['db'] + depends_on: + db: {condition: 'my_specific_condition'} describe '_resolvePath', -> it 'should resolve a path relative to a given root', ->