Skip to content

Commit 7c810b2

Browse files
committed
update to scalajs 1.0.0-M1
1 parent 54a3c03 commit 7c810b2

File tree

11 files changed

+2093
-25
lines changed

11 files changed

+2093
-25
lines changed

.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"ignore" : ["sjs.test.js"]
3+
}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@ npm-debug.log
3232

3333

3434
#project
35+
*.test.js
36+
*.test.js.map

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ env:
1818
JSENV=node
1919

2020
script:
21-
- sbt ++$TRAVIS_SCALA_VERSION test:fastOptJS test:fullOptJS
22-
- sbt ++$TRAVIS_SCALA_VERSION 'set parallelExecution in ThisBuild := false' test
23-
- sbt ++$TRAVIS_SCALA_VERSION 'set parallelExecution in ThisBuild := false' 'set scalaJSStage in ThisBuild := FullOptStage' test
24-
21+
- sbt ++$TRAVIS_SCALA_VERSION testDev testProd
2522

2623
deploy:
2724
provider: script

build.sbt

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name := "web"
22

3-
//version := "2017.3.0-SNAPSHOT"
3+
//version := "2017.7.0-SNAPSHOT"
44

55
enablePlugins(ScalaJSPlugin)
66

@@ -20,8 +20,9 @@ scalacOptions ++= Seq(
2020
)
2121

2222
//Dependencies
23-
libraryDependencies += "scalajs-react-interface" %%% "universal" % "2017.4.23-beta" % Provided
24-
libraryDependencies += "scalajs-react-interface" %%% "core" % "2017.4.23-beta" % Provided
23+
libraryDependencies ++= Seq("scalajs-react-interface" %%% "universal" % "2017.7.9-RC" % Provided,
24+
"scalajs-react-interface" %%% "core" % "2017.7.9-RC" % Provided)
25+
2526

2627

2728

@@ -43,5 +44,40 @@ publishArtifact in Test := false
4344

4445
//Test
4546
resolvers += Resolver.bintrayRepo("scalajs-react-interface", "maven")
46-
libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.0" % Test
47-
scalaJSStage in Global := FastOptStage
47+
scalaJSUseMainModuleInitializer in Test := true
48+
49+
scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))
50+
51+
val TEST_FILE = s"./sjs.test.js"
52+
53+
artifactPath in Test in fastOptJS := new File(TEST_FILE)
54+
artifactPath in Test in fullOptJS := new File(TEST_FILE)
55+
56+
val testDev = Def.taskKey[Unit]("test in dev mode")
57+
val testProd = Def.taskKey[Unit]("test in prod mode")
58+
59+
testDev := {
60+
(fastOptJS in Test).value
61+
runJest()
62+
}
63+
64+
testProd := {
65+
(fullOptJS in Test).value
66+
runJest()
67+
}
68+
69+
def runJest() = {
70+
import sys.process._
71+
val jestResult = "npm test".!
72+
if (jestResult != 0) throw new IllegalStateException("Jest Suite failed")
73+
}
74+
75+
resolvers += Resolver.bintrayRepo("scalajs-react-interface", "maven")
76+
resolvers += Resolver.bintrayRepo("scalajs-jest", "maven")
77+
78+
libraryDependencies ++= Seq(
79+
"org.scala-js" %%% "scalajs-dom" % "0.9.3" % Test,
80+
"scalajs-jest" %%% "core" % "2017.7.9-beta" % Test
81+
)
82+
//scalaJSStage in Global := FastOptStage
83+
scalaJSStage in Global := FullOptStage

package.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"name": "sr--test",
3+
"version": "0.1.0",
4+
"description": "sri test",
5+
"repository": {
6+
"type": "git",
7+
"url": ""
8+
},
9+
"scripts": {
10+
"test": "jest"
11+
},
12+
"devDependencies": {},
13+
"dependencies": {
14+
"jest": "^20.0.4"
15+
}
16+
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
sbt.version=0.13.11
1+
sbt.version=0.13.15
22

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.15")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M1")
22
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
3-
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "1.1.1")
3+
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "1.3.0")
44
addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")

src/test/scala/sri/web/BaseTest.scala

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
1-
package sri.web;
1+
package sri.web
22

3-
import org.scalactic.source.Position
4-
import org.scalatest._
3+
import scalajsjest.JestSuite;
54

6-
import scala.scalajs.js.JavaScriptException
75

8-
class BaseTest extends FunSuite with BeforeAndAfter{
96

10-
override protected def test(testName: String, testTags: org.scalatest.Tag*)(testFun: => Any)(implicit pos: Position) = {
11-
super.test(testName, testTags: _*)(try testFun catch {
12-
case jse @ JavaScriptException(e) =>
13-
println(e)
14-
jse.printStackTrace()
15-
throw jse
16-
})
17-
}
7+
class BaseTest extends JestSuite {
8+
189

1910
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package sri.web
2+
3+
import scalajsjest.JestSuite
4+
5+
class SampleTest extends BaseTest{
6+
7+
test("Simple", () => {
8+
expect(true).toBeTruthy()
9+
})
10+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package sri.web
2+
3+
import scalajsjest.JestRunner
4+
5+
object TestRunner {
6+
7+
def main(args: Array[String]): Unit = {
8+
JestRunner.run()
9+
}
10+
}

0 commit comments

Comments
 (0)