Skip to content

Commit c6318c4

Browse files
committed
Refactored FlatSpec style trait into org.scalatest.flatspec package.
1 parent 3fe0f3f commit c6318c4

19 files changed

+5356
-6874
lines changed

project/GenScalaTestDotty.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ object GenScalaTestDotty {
152152
copyDir("scalatest/src/main/scala/org/scalatest/funspec", "org/scalatest/funspec", targetDir, List.empty) ++
153153
copyDir("scalatest/src/main/scala/org/scalatest/funsuite", "org/scalatest/funsuite", targetDir, List.empty) ++
154154
copyDir("scalatest/src/main/scala/org/scalatest/freespec", "org/scalatest/freespec", targetDir, List.empty) ++
155+
copyDir("scalatest/src/main/scala/org/scalatest/flatspec", "org/scalatest/flatspec", targetDir, List.empty) ++
155156
copyDir("scalatest/src/main/scala/org/scalatest/matchers", "org/scalatest/matchers", targetDir,
156157
List(
157158
"Matcher.scala", // Re-implemented with new macro

project/GenScalaTestJS.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ object GenScalaTestJS {
219219
copyDir("scalatest/src/main/scala/org/scalatest/featurespec", "org/scalatest/featurespec", targetDir, List.empty) ++
220220
copyDir("scalatest/src/main/scala/org/scalatest/funspec", "org/scalatest/funspec", targetDir, List.empty) ++
221221
copyDir("scalatest/src/main/scala/org/scalatest/freespec", "org/scalatest/freespec", targetDir, List.empty) ++
222+
copyDir("scalatest/src/main/scala/org/scalatest/flatspec", "org/scalatest/flatspec", targetDir, List.empty) ++
222223
copyDir("scalatest/src/main/scala/org/scalatest/prop", "org/scalatest/prop", targetDir, List.empty) ++
223224
copyDir("scalatest/src/main/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,
224225
List(

project/GenScalaTestNative.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,9 @@ object GenScalaTestNative {
214214
copyDir("scalatest/src/main/scala/org/scalatest/freespec", "org/scalatest/freespec", targetDir,
215215
asyncs("scalatest/src/main/scala/org/scalatest/freespec")
216216
) ++
217+
copyDir("scalatest/src/main/scala/org/scalatest/flatspec", "org/scalatest/flatspec", targetDir,
218+
asyncs("scalatest/src/main/scala/org/scalatest/flatspec")
219+
) ++
217220
copyDir("scalatest/src/main/scala/org/scalatest/prop", "org/scalatest/prop", targetDir, List.empty) ++
218221
copyDir("scalatest/src/main/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,
219222
List(

project/scalatest.scala

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,7 @@ object ScalatestBuild {
796796
"org.scalatest.featurespec",
797797
"org.scalatest.funspec",
798798
"org.scalatest.freespec",
799+
"org.scalatest.flatpec",
799800
"org.scalatest.matchers",
800801
"org.scalatest.path",
801802
"org.scalatest.prop",
@@ -904,6 +905,7 @@ object ScalatestBuild {
904905
"org.scalatest.featurespec",
905906
"org.scalatest.funspec",
906907
"org.scalatest.freespec",
908+
"org.scalatest.flatspec",
907909
"org.scalatest.matchers",
908910
"org.scalatest.path",
909911
"org.scalatest.prop",
@@ -997,6 +999,7 @@ object ScalatestBuild {
997999
"org.scalatest.featurespec",
9981000
"org.scalatest.funspec",
9991001
"org.scalatest.freespec",
1002+
"org.scalatest.flatspec",
10001003
"org.scalatest.matchers",
10011004
"org.scalatest.path",
10021005
"org.scalatest.prop",
@@ -1250,6 +1253,7 @@ object ScalatestBuild {
12501253
"org.scalatest.featurespec",
12511254
"org.scalatest.funspec",
12521255
"org.scalatest.freespec",
1256+
"org.scalatest.flatspec",
12531257
"org.scalatest.matchers",
12541258
"org.scalatest.path",
12551259
"org.scalatest.prop",
@@ -1321,6 +1325,7 @@ object ScalatestBuild {
13211325
"org.scalatest.featurespec",
13221326
"org.scalatest.funspec",
13231327
"org.scalatest.freespec",
1328+
"org.scalatest.flatspec",
13241329
"org.scalatest.matchers",
13251330
"org.scalatest.path",
13261331
"org.scalatest.prop",
@@ -1390,6 +1395,7 @@ object ScalatestBuild {
13901395
"org.scalatest.featurespec",
13911396
"org.scalatest.funspec",
13921397
"org.scalatest.freespec",
1398+
"org.scalatest.flatspec",
13931399
"org.scalatest.matchers",
13941400
"org.scalatest.path",
13951401
"org.scalatest.prop",

scalatest/src/main/scala/org/scalatest/AsyncFlatSpec.scala

Lines changed: 35 additions & 2201 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)