From 88b412d17096475e41e6eb778d2c16836e2b0e62 Mon Sep 17 00:00:00 2001 From: Nathan Fischer Date: Wed, 15 May 2019 16:07:29 -0700 Subject: Downstream files overwrite upstream files on assembly resolves #608 --- scalalib/test/src/HelloWorldTests.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scalalib') diff --git a/scalalib/test/src/HelloWorldTests.scala b/scalalib/test/src/HelloWorldTests.scala index da08f056..57750991 100644 --- a/scalalib/test/src/HelloWorldTests.scala +++ b/scalalib/test/src/HelloWorldTests.scala @@ -766,7 +766,7 @@ object HelloWorldTests extends TestSuite { resourcePath = helloWorldMultiResourcePath ) - 'writeFirstWhenNoRule - { + 'writeDownstreamWhenNoRule - { 'withDeps - workspaceTest(HelloWorldAkkaHttpNoRules) { eval => val Right((result, _)) = eval.apply(HelloWorldAkkaHttpNoRules.core.assembly) @@ -802,11 +802,11 @@ object HelloWorldTests extends TestSuite { val referenceContent = readFileFromJar(jarFile, "reference.conf") assert( - referenceContent.contains("Model Reference Config File"), - referenceContent.contains("foo.bar=2"), + !referenceContent.contains("Model Reference Config File"), + !referenceContent.contains("foo.bar=2"), - !referenceContent.contains("Core Reference Config File"), - !referenceContent.contains("bar.baz=hello") + referenceContent.contains("Core Reference Config File"), + referenceContent.contains("bar.baz=hello") ) } } -- cgit v1.2.3