summaryrefslogtreecommitdiff
path: root/scalalib
diff options
context:
space:
mode:
authorNathan Fischer <nathan@lightform.com>2019-05-15 16:07:29 -0700
committerNathan Fischer <nfischer921@gmail.com>2019-05-16 11:11:02 -0700
commit88b412d17096475e41e6eb778d2c16836e2b0e62 (patch)
tree5fd0edffc138e8f403fa24d1dc7ac20fdfa8a9db /scalalib
parent3cd0e9d277289c318884656042d92005ce13dacf (diff)
downloadmill-88b412d17096475e41e6eb778d2c16836e2b0e62.tar.gz
mill-88b412d17096475e41e6eb778d2c16836e2b0e62.tar.bz2
mill-88b412d17096475e41e6eb778d2c16836e2b0e62.zip
Downstream files overwrite upstream files on assembly
resolves #608
Diffstat (limited to 'scalalib')
-rw-r--r--scalalib/test/src/HelloWorldTests.scala10
1 files changed, 5 insertions, 5 deletions
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")
)
}
}