Step 6: Testing

gzm0 · sjrd · commit e12351a61b44 · 2014-11-22T17:14:02.000+01:00
diff --git a/build.sbt b/build.sbt
@@ -6,4 +6,13 @@ scalaVersion := "2.11.2"
 
 libraryDependencies += "org.scala-lang.modules.scalajs" %%% "scalajs-jquery" % "0.6"
 
+ScalaJSKeys.jsDependencies += scala.scalajs.sbtplugin.RuntimeDOM
+
 skip in ScalaJSKeys.packageJSDependencies := false
+
+// uTest settings
+utest.jsrunner.Plugin.utestJsSettings
+
+ScalaJSKeys.persistLauncher in Compile := true
+
+ScalaJSKeys.persistLauncher in Test := false
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1 +1,3 @@
 addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.6")
+
+addSbtPlugin("com.lihaoyi" % "utest-js-plugin" % "0.2.3")
diff --git a/scalajs-tutorial-fastopt.html b/scalajs-tutorial-fastopt.html
@@ -5,8 +5,6 @@
     <title>The Scala.js Tutorial</title>
   </head>
   <body>
-    <button id="click-me-button" type="button">Click me!</button>
-
     <!-- Include JavaScript dependencies -->
     <script type="text/javascript" src="./target/scala-2.11/scala-js-tutorial-jsdeps.js"></script>
     <!-- Include Scala.js compiled code -->
diff --git a/src/main/scala/tutorial/webapp/TutorialApp.scala b/src/main/scala/tutorial/webapp/TutorialApp.scala
@@ -10,8 +10,10 @@ object TutorialApp extends JSApp {
   }
 
   def setupUI(): Unit = {
+    jQuery("""<button type="button">Click me!</button>""")
+      .click(addClickedMessage _)
+      .appendTo(jQuery("body"))
     jQuery("body").append("<p>Hello World</p>")
-    jQuery("#click-me-button").click(addClickedMessage _)
   }
 
   def addClickedMessage(): Unit = {
diff --git a/src/test/scala/tutorial/webapp/TutorialTest.scala b/src/test/scala/tutorial/webapp/TutorialTest.scala
@@ -0,0 +1,31 @@
+package tutorial.webapp
+
+import utest._
+
+import org.scalajs.jquery.jQuery
+
+object TutorialTest extends TestSuite {
+
+  // Initialize App
+  TutorialApp.setupUI()
+
+  def tests = TestSuite {
+    'HelloWorld {
+      assert(jQuery("p:contains('Hello World')").length == 1)
+    }
+
+    'ButtonClick {
+      def messageCount =
+        jQuery("p:contains('You clicked the button!')").length
+
+      val button = jQuery("button:contains('Click me!')")
+      assert(button.length == 1)
+      assert(messageCount == 0)
+
+      for (c <- 1 to 5) {
+        button.click()
+        assert(messageCount == c)
+      }
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.6")`
	`2`	`+`
	`3`	`+addSbtPlugin("com.lihaoyi" % "utest-js-plugin" % "0.2.3")`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,10 @@ object TutorialApp extends JSApp {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`def setupUI(): Unit = {`
	`13`	`+ jQuery("""<button type="button">Click me!</button>""")`
	`14`	`+ .click(addClickedMessage _)`
	`15`	`+ .appendTo(jQuery("body"))`
`13`	`16`	`jQuery("body").append("<p>Hello World</p>")`
`14`		`- jQuery("#click-me-button").click(addClickedMessage _)`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`def addClickedMessage(): Unit = {`