Permalink
Browse files

2.10 WIP: tests passing for 2.10 to 2.9.0-1, but tests hanging for 2.9.0

- specs2 is org.specs2 packaged now
- fixed ambiguous call to XmlElem.
- need to use SBT 0.12.x
  • Loading branch information...
1 parent da7f670 commit 973f193064c54534c6a086bbbd44020f6445553c @d6y d6y committed Jan 8, 2013
View
@@ -4,13 +4,13 @@ organization := "net.liftmodules"
liftVersion <<= liftVersion ?? "2.5-SNAPSHOT"
-version <<= liftVersion apply { _ + "-1.2-SNAPSHOT" }
+version <<= liftVersion apply { _ + "-1.3-SNAPSHOT" }
-scalaVersion := "2.9.2"
+scalaVersion := "2.10.0"
scalacOptions ++= Seq("-unchecked", "-deprecation")
-crossScalaVersions := Seq("2.9.2", "2.9.1-1", "2.9.1", "2.9.0-1", "2.9.0")
+crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1-1", "2.9.1", "2.9.0-1", "2.9.0")
resolvers += "CB Central Mirror" at "http://repo.cloudbees.com/content/groups/public"
@@ -23,13 +23,10 @@ libraryDependencies <++= liftVersion { v =>
libraryDependencies <++= scalaVersion { sv =>
(sv match {
- case "2.9.2" | "2.9.1" | "2.9.1-1" => "org.scala-tools.testing" % "specs_2.9.1" % "1.6.9" % "test"
- case _ => "org.scala-tools.testing" %% "specs" % "1.6.8" % "test"
+ case "2.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test"
+ case "2.10.0" => "org.specs2" %% "specs2" % "1.13" % "test"
+ case "2.9.0-1" | "2.9.0" => "org.specs2" %% "specs2" % "1.7.1" % "test"
}) ::
- (sv match {
- case "2.9.2" => "org.scalacheck" % "scalacheck_2.9.1" % "1.9" % "test"
- case _ => "org.scalacheck" %% "scalacheck" % "1.9" % "test"
- }) ::
Nil
}
View
@@ -0,0 +1,2 @@
+sbt.version=0.12.1
+
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2010 WorldWide Conferencing, LLC
+ * Copyright 2006-2013 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -918,7 +918,8 @@ object TextileParser {
case class Image(url : String, alt : String, link : String, attrs : List[Attribute] ) extends ATextile(Nil, attrs) {
override def toHtml : NodeSeq = {
- val img = XmlElem(null, "img", fromStyle(AnyAttribute("src", url) :: AnyAttribute("alt", alt) :: attrs), TopScope, Nil : _*)
+ val children : List[scala.xml.Node] = Nil
+ val img = XmlElem(null, "img", fromStyle(AnyAttribute("src", url) :: AnyAttribute("alt", alt) :: attrs), TopScope, children : _*)
if (link ne null) XmlElem(null, "a", fromStyle(AnyAttribute("href", link) :: attrs), TopScope, img : _*)
else img
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2011 WorldWide Conferencing, LLC
+ * Copyright 2008-2013 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@
package net.liftmodules
package textile
-
-import org.specs.Specification
+import org.specs2.mutable._
import net.liftweb._
import util._
@@ -197,7 +196,7 @@ A regular example.
"deal with a very long line of text" in {
val sb = new StringBuilder()
(1 to 10000).foreach(i => sb.append(i.toString+" "))
- toHtml(sb.toString)
+ toHtml(sb.toString) must beAnInstanceOf[scala.xml.NodeSeq]
}
"h3" in {
@@ -607,12 +606,4 @@ We use CSS(Cascading Style Sheets).
time must be_< (if (shouldRelax) 10000L else 3000L)
}
-
- """Hello:
-* THis is a * on a line
-* This is a *strong* line
-* This is a **Bold** line
-* This is a line with no markup
-"""
-
}

0 comments on commit 973f193

Please sign in to comment.