Merge pull request #6 from AustinBGibbons/master

Upgrade to Scalajs 0.6.0 and Scala 2.11.5. Replace jasmine with utest

.travis.yml

@@ -1,8 +1,8 @@
 language: scala
 script:
-  - sbt ++$TRAVIS_SCALA_VERSION test packageJS fullOptJS
+  - sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSStage in Global := FastOptStage' test 'set scalaJSStage in Global := FullOptStage' test
 scala:
   - 2.10.4
-  - 2.11.1
+  - 2.11.5
 jdk:
   - oraclejdk7

build.sbt

@@ -1,17 +1,19 @@
 // Turn this project into a Scala.js project by importing these settings
-scalaJSSettings
+enablePlugins(ScalaJSPlugin)
 
 name := "Example"
 
 version := "0.1-SNAPSHOT"
 
-scalaVersion := "2.11.1"
+scalaVersion := "2.11.5"
 
-ScalaJSKeys.persistLauncher := true
+persistLauncher in Compile := true
 
-ScalaJSKeys.persistLauncher in Test := false
+persistLauncher in Test := false
+
+testFrameworks += new TestFramework("utest.runner.Framework")
 
 libraryDependencies ++= Seq(
-    "org.scala-lang.modules.scalajs" %%% "scalajs-dom" % "0.6",
-    "org.scala-lang.modules.scalajs" %% "scalajs-jasmine-test-framework" % scalaJSVersion % "test"
+    "org.scala-js" %%% "scalajs-dom" % "0.8.0",
+    "com.lihaoyi" %%% "utest" % "0.3.0" % "test"
 )

project/build.sbt

@@ -1 +1 @@
-addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.6")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0")

src/test/scala/example/ScalaJSExampleTest.scala

@@ -1,19 +1,16 @@
 package example
 
-import scala.scalajs.js
-import js.Dynamic.{ global => g }
-import scala.scalajs.test.JasmineTest
+import utest._
 
-object ScalaJSExampleTest extends JasmineTest {
+object ScalaJSExampleTest extends TestSuite {
 
-  describe("ScalaJSExample") {
+  import ScalaJSExample._
 
-    it("should implement square()") {
-      import ScalaJSExample._
-
-      expect(square(0)).toBe(0)
-      expect(square(4)).toBe(16)
-      expect(square(-5)).toBe(25)
+  def tests = TestSuite {
+    'ScalaJSExample {
+      assert(square(0) == 0)
+      assert(square(4) == 16)
+      assert(square(-5) == 25)
     }
   }
 }