Skip to content

Commit a353c02

Browse files
cheesengcheeseng
committed
Merge branch 'propspec-refactoring' of https://github.com/cheeseng/scalatest into HEAD
2 parents 2335154 + f81165f commit a353c02

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
@@ -807,13 +807,15 @@ object ScalatestBuild {
807807
"org.scalatest.matchers",
808808
"org.scalatest.path",
809809
"org.scalatest.prop",
810+
"org.scalatest.propspec",
810811
"org.scalatest.refspec",
811812
"org.scalatest.tags",
812813
"org.scalatest.tagobjects",
813814
"org.scalatest.time",
814815
"org.scalatest.tools",
815816
"org.scalatest.verb",
816-
"org.scalatest.words"
817+
"org.scalatest.words",
818+
"org.scalatest.wordspec"
817819
),
818820
OsgiKeys.importPackage := Seq(
819821
"org.scalatest.*",
@@ -915,12 +917,14 @@ object ScalatestBuild {
915917
"org.scalatest.matchers",
916918
"org.scalatest.path",
917919
"org.scalatest.prop",
920+
"org.scalatest.propspec",
918921
"org.scalatest.tags",
919922
"org.scalatest.tagobjects",
920923
"org.scalatest.time",
921924
"org.scalatest.tools",
922925
"org.scalatest.verb",
923-
"org.scalatest.words"
926+
"org.scalatest.words",
927+
"org.scalatest.wordspec"
924928
),
925929
OsgiKeys.importPackage := Seq(
926930
"org.scalatest.*",
@@ -1010,13 +1014,15 @@ object ScalatestBuild {
10101014
"org.scalatest.matchers",
10111015
"org.scalatest.path",
10121016
"org.scalatest.prop",
1017+
"org.scalatest.propspec",
10131018
"org.scalatest.refspec",
10141019
"org.scalatest.tags",
10151020
"org.scalatest.tagobjects",
10161021
"org.scalatest.time",
10171022
"org.scalatest.tools",
10181023
"org.scalatest.verb",
1019-
"org.scalatest.words"
1024+
"org.scalatest.words",
1025+
"org.scalatest.wordspec"
10201026
),
10211027
OsgiKeys.importPackage := Seq(
10221028
"org.scalatest.*",
@@ -1160,12 +1166,14 @@ object ScalatestBuild {
11601166
"org.scalatest.matchers",
11611167
"org.scalatest.path",
11621168
"org.scalatest.prop",
1169+
"org.scalatest.propspec",
11631170
"org.scalatest.tags",
11641171
"org.scalatest.tagobjects",
11651172
"org.scalatest.time",
11661173
"org.scalatest.tools",
11671174
"org.scalatest.verb",
1168-
"org.scalatest.words"
1175+
"org.scalatest.words",
1176+
"org.scalatest.wordspec"
11691177
),
11701178
OsgiKeys.importPackage := Seq(
11711179
"org.scalatest.*",
@@ -1272,13 +1280,15 @@ object ScalatestBuild {
12721280
"org.scalatest.matchers",
12731281
"org.scalatest.path",
12741282
"org.scalatest.prop",
1283+
"org.scalatest.propspec",
12751284
"org.scalatest.refspec",
12761285
"org.scalatest.tags",
12771286
"org.scalatest.tagobjects",
12781287
"org.scalatest.time",
12791288
"org.scalatest.tools",
12801289
"org.scalatest.verb",
12811290
"org.scalatest.words",
1291+
"org.scalatest.wordspec",
12821292
"org.scalactic",
12831293
"org.scalactic.anyvals",
12841294
"org.scalactic.exceptions",
@@ -1344,12 +1354,14 @@ object ScalatestBuild {
13441354
"org.scalatest.matchers",
13451355
"org.scalatest.path",
13461356
"org.scalatest.prop",
1357+
"org.scalatest.propspec",
13471358
"org.scalatest.tags",
13481359
"org.scalatest.tagobjects",
13491360
"org.scalatest.time",
13501361
"org.scalatest.tools",
13511362
"org.scalatest.verb",
13521363
"org.scalatest.words",
1364+
"org.scalatest.wordspec",
13531365
"org.scalactic",
13541366
"org.scalactic.anyvals",
13551367
"org.scalactic.exceptions",
@@ -1414,12 +1426,14 @@ object ScalatestBuild {
14141426
"org.scalatest.matchers",
14151427
"org.scalatest.path",
14161428
"org.scalatest.prop",
1429+
"org.scalatest.propspec",
14171430
"org.scalatest.tags",
14181431
"org.scalatest.tagobjects",
14191432
"org.scalatest.time",
14201433
"org.scalatest.tools",
14211434
"org.scalatest.verb",
14221435
"org.scalatest.words",
1436+
"org.scalatest.wordspec",
14231437
"org.scalactic",
14241438
"org.scalactic.anyvals",
14251439
"org.scalactic.exceptions",

0 commit comments

Comments
 (0)