aboutsummaryrefslogtreecommitdiff
path: root/src/test/scala/spray
diff options
context:
space:
mode:
authorJohannes Rudolph <johannes.rudolph@gmail.com>2014-07-08 14:24:41 +0200
committerJohannes Rudolph <johannes.rudolph@gmail.com>2014-07-08 14:24:41 +0200
commit6a0844a9be28ab845272cf194773bf6a2b99c552 (patch)
treef99ac41f91b8e5e043fcdd6c9f438670b9bf0e63 /src/test/scala/spray
parenta13f2dece099b450127bb97281a9489e01779c5f (diff)
downloadsbt-boilerplate-6a0844a9be28ab845272cf194773bf6a2b99c552.tar.gz
sbt-boilerplate-6a0844a9be28ab845272cf194773bf6a2b99c552.tar.bz2
sbt-boilerplate-6a0844a9be28ab845272cf194773bf6a2b99c552.zip
fix parsing to allow an arbitrary number of elements on the top-level, fixes #3
Diffstat (limited to 'src/test/scala/spray')
-rw-r--r--src/test/scala/spray/boilerplate/GeneratorSpecs.scala2
-rw-r--r--src/test/scala/spray/boilerplate/TemplateParserSpecs.scala9
2 files changed, 4 insertions, 7 deletions
diff --git a/src/test/scala/spray/boilerplate/GeneratorSpecs.scala b/src/test/scala/spray/boilerplate/GeneratorSpecs.scala
index 7651398..d88010b 100644
--- a/src/test/scala/spray/boilerplate/GeneratorSpecs.scala
+++ b/src/test/scala/spray/boilerplate/GeneratorSpecs.scala
@@ -5,7 +5,7 @@ import org.specs2.mutable.Specification
class GeneratorSpecs extends Specification {
"Generation" should {
"keep outer template unchanged" in {
- gen4("a1b2c3d4") === "a1b2c3d4" pendingUntilFixed
+ gen4("a1b2c3d4") === "a1b2c3d4"
}
"inflate 1 in expansion" in {
gen4("[#a1#]") === "a1, a2, a3, a4"
diff --git a/src/test/scala/spray/boilerplate/TemplateParserSpecs.scala b/src/test/scala/spray/boilerplate/TemplateParserSpecs.scala
index 063eaa0..a0ff049 100644
--- a/src/test/scala/spray/boilerplate/TemplateParserSpecs.scala
+++ b/src/test/scala/spray/boilerplate/TemplateParserSpecs.scala
@@ -7,18 +7,15 @@ class TemplateParserSpecs extends Specification {
"TemplateParser.parse" should {
"without expansion" in {
- parse("abc") === FixedString("abc") pendingUntilFixed
+ parse("abc") === FixedString("abc")
}
-
"just expansion" in {
- parse("[# def #]") === Expand(LiteralString(" def "), ", ") pendingUntilFixed
+ parse("[# def #]") === Expand(LiteralString(" def "), ", ")
}
-
"multiple expansions" in {
parse("[#a#]abc[#b#]") ===
- Sequence(List(Expand(LiteralString("a"), ", "), FixedString("abc"), Expand(LiteralString("b"), ", "))) pendingUntilFixed
+ Sequence(List(Expand(LiteralString("a"), ", "), FixedString("abc"), Expand(LiteralString("b"), ", ")))
}
-
"one surrounded expansion" in {
parse("abc[#a#]def") === Sequence(List(FixedString("abc"), Expand(LiteralString("a"), ", "), FixedString("def")))
}