Skip to content

Commit 622212d

Browse files
bvennersbvenners
committed
Merge branch 'propspec-refactoring' of https://github.com/cheeseng/scalatest into cheeseng-propspec-refactoring
2 parents d4c3f4e + f81165f commit 622212d

28 files changed

+6369
-6076
lines changed

‎project/GenScalaTestJS.scala‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,8 @@ object GenScalaTestJS {
221221
copyDir("scalatest/src/main/scala/org/scalatest/freespec", "org/scalatest/freespec", targetDir, List.empty) ++
222222
copyDir("scalatest/src/main/scala/org/scalatest/flatspec", "org/scalatest/flatspec", targetDir, List.empty) ++
223223
copyDir("scalatest/src/main/scala/org/scalatest/prop", "org/scalatest/prop", targetDir, List.empty) ++
224+
copyDir("scalatest/src/main/scala/org/scalatest/propspec", "org/scalatest/propspec", targetDir, List.empty) ++
225+
copyDir("scalatest/src/main/scala/org/scalatest/wordspec", "org/scalatest/wordspec", targetDir, List.empty) ++
224226
copyDir("scalatest/src/main/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,
225227
List(
226228
"Waiters.scala", // skipeed because doesn't really make sense on js's single-thread environment.

‎project/GenScalaTestNative.scala‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,12 @@ object GenScalaTestNative {
218218
asyncs("scalatest/src/main/scala/org/scalatest/flatspec")
219219
) ++
220220
copyDir("scalatest/src/main/scala/org/scalatest/prop", "org/scalatest/prop", targetDir, List.empty) ++
221+
copyDir("scalatest/src/main/scala/org/scalatest/propspec", "org/scalatest/propspec", targetDir,
222+
asyncs("scalatest/src/main/scala/org/scalatest/propspec")
223+
) ++
224+
copyDir("scalatest/src/main/scala/org/scalatest/wordspec", "org/scalatest/wordspec", targetDir,
225+
asyncs("scalatest/src/main/scala/org/scalatest/wordspec")
226+
) ++
221227
copyDir("scalatest/src/main/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,
222228
List(
223229
"Waiters.scala", // skipeed because doesn't really make sense on js's single-thread environment.

‎project/scalatest.scala‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -803,13 +803,15 @@ object ScalatestBuild {
803803
"org.scalatest.matchers",
804804
"org.scalatest.path",
805805
"org.scalatest.prop",
806+
"org.scalatest.propspec",
806807
"org.scalatest.refspec",
807808
"org.scalatest.tags",
808809
"org.scalatest.tagobjects",
809810
"org.scalatest.time",
810811
"org.scalatest.tools",
811812
"org.scalatest.verb",
812-
"org.scalatest.words"
813+
"org.scalatest.words",
814+
"org.scalatest.wordspec"
813815
),
814816
OsgiKeys.importPackage := Seq(
815817
"org.scalatest.*",
@@ -911,12 +913,14 @@ object ScalatestBuild {
911913
"org.scalatest.matchers",
912914
"org.scalatest.path",
913915
"org.scalatest.prop",
916+
"org.scalatest.propspec",
914917
"org.scalatest.tags",
915918
"org.scalatest.tagobjects",
916919
"org.scalatest.time",
917920
"org.scalatest.tools",
918921
"org.scalatest.verb",
919-
"org.scalatest.words"
922+
"org.scalatest.words",
923+
"org.scalatest.wordspec"
920924
),
921925
OsgiKeys.importPackage := Seq(
922926
"org.scalatest.*",
@@ -1005,13 +1009,15 @@ object ScalatestBuild {
10051009
"org.scalatest.matchers",
10061010
"org.scalatest.path",
10071011
"org.scalatest.prop",
1012+
"org.scalatest.propspec",
10081013
"org.scalatest.refspec",
10091014
"org.scalatest.tags",
10101015
"org.scalatest.tagobjects",
10111016
"org.scalatest.time",
10121017
"org.scalatest.tools",
10131018
"org.scalatest.verb",
1014-
"org.scalatest.words"
1019+
"org.scalatest.words",
1020+
"org.scalatest.wordspec"
10151021
),
10161022
OsgiKeys.importPackage := Seq(
10171023
"org.scalatest.*",
@@ -1155,12 +1161,14 @@ object ScalatestBuild {
11551161
"org.scalatest.matchers",
11561162
"org.scalatest.path",
11571163
"org.scalatest.prop",
1164+
"org.scalatest.propspec",
11581165
"org.scalatest.tags",
11591166
"org.scalatest.tagobjects",
11601167
"org.scalatest.time",
11611168
"org.scalatest.tools",
11621169
"org.scalatest.verb",
1163-
"org.scalatest.words"
1170+
"org.scalatest.words",
1171+
"org.scalatest.wordspec"
11641172
),
11651173
OsgiKeys.importPackage := Seq(
11661174
"org.scalatest.*",
@@ -1267,13 +1275,15 @@ object ScalatestBuild {
12671275
"org.scalatest.matchers",
12681276
"org.scalatest.path",
12691277
"org.scalatest.prop",
1278+
"org.scalatest.propspec",
12701279
"org.scalatest.refspec",
12711280
"org.scalatest.tags",
12721281
"org.scalatest.tagobjects",
12731282
"org.scalatest.time",
12741283
"org.scalatest.tools",
12751284
"org.scalatest.verb",
12761285
"org.scalatest.words",
1286+
"org.scalatest.wordspec",
12771287
"org.scalactic",
12781288
"org.scalactic.anyvals",
12791289
"org.scalactic.exceptions",
@@ -1339,12 +1349,14 @@ object ScalatestBuild {
13391349
"org.scalatest.matchers",
13401350
"org.scalatest.path",
13411351
"org.scalatest.prop",
1352+
"org.scalatest.propspec",
13421353
"org.scalatest.tags",
13431354
"org.scalatest.tagobjects",
13441355
"org.scalatest.time",
13451356
"org.scalatest.tools",
13461357
"org.scalatest.verb",
13471358
"org.scalatest.words",
1359+
"org.scalatest.wordspec",
13481360
"org.scalactic",
13491361
"org.scalactic.anyvals",
13501362
"org.scalactic.exceptions",
@@ -1409,12 +1421,14 @@ object ScalatestBuild {
14091421
"org.scalatest.matchers",
14101422
"org.scalatest.path",
14111423
"org.scalatest.prop",
1424+
"org.scalatest.propspec",
14121425
"org.scalatest.tags",
14131426
"org.scalatest.tagobjects",
14141427
"org.scalatest.time",
14151428
"org.scalatest.tools",
14161429
"org.scalatest.verb",
14171430
"org.scalatest.words",
1431+
"org.scalatest.wordspec",
14181432
"org.scalactic",
14191433
"org.scalactic.anyvals",
14201434
"org.scalactic.exceptions",

0 commit comments

Comments
 (0)