Merge branch 'propspec-refactoring' of https://github.com/cheeseng/sc…

…alatest into HEAD
scalatest · Jun 10, 2019 · a353c02 · a353c02
2 parents 2335154 + f81165f
commit a353c02
Show file tree

Hide file tree

Showing 28 changed files with 6,369 additions and 6,076 deletions.
diff --git a/project/GenScalaTestJS.scala b/project/GenScalaTestJS.scala
@@ -221,6 +221,8 @@ object GenScalaTestJS {
     copyDir("scalatest/src/main/scala/org/scalatest/freespec", "org/scalatest/freespec", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/flatspec", "org/scalatest/flatspec", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/prop", "org/scalatest/prop", targetDir, List.empty) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/propspec", "org/scalatest/propspec", targetDir, List.empty) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/wordspec", "org/scalatest/wordspec", targetDir, List.empty) ++
     copyDir("scalatest/src/main/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,
       List(
         "Waiters.scala",        // skipeed because doesn't really make sense on js's single-thread environment.

diff --git a/project/GenScalaTestNative.scala b/project/GenScalaTestNative.scala
@@ -218,6 +218,12 @@ object GenScalaTestNative {
       asyncs("scalatest/src/main/scala/org/scalatest/flatspec")
     ) ++
     copyDir("scalatest/src/main/scala/org/scalatest/prop", "org/scalatest/prop", targetDir, List.empty) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/propspec", "org/scalatest/propspec", targetDir,
+      asyncs("scalatest/src/main/scala/org/scalatest/propspec")
+    ) ++
+    copyDir("scalatest/src/main/scala/org/scalatest/wordspec", "org/scalatest/wordspec", targetDir,
+      asyncs("scalatest/src/main/scala/org/scalatest/wordspec")
+    ) ++
     copyDir("scalatest/src/main/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,
       List(
         "Waiters.scala",        // skipeed because doesn't really make sense on js's single-thread environment.

diff --git a/project/scalatest.scala b/project/scalatest.scala
@@ -807,13 +807,15 @@ object ScalatestBuild {
         "org.scalatest.matchers",
         "org.scalatest.path",
         "org.scalatest.prop",
+        "org.scalatest.propspec",
         "org.scalatest.refspec",
         "org.scalatest.tags",
         "org.scalatest.tagobjects",
         "org.scalatest.time",
         "org.scalatest.tools",
         "org.scalatest.verb",
-        "org.scalatest.words"
+        "org.scalatest.words", 
+        "org.scalatest.wordspec"
       ),
       OsgiKeys.importPackage := Seq(
         "org.scalatest.*",
@@ -915,12 +917,14 @@ object ScalatestBuild {
         "org.scalatest.matchers",
         "org.scalatest.path",
         "org.scalatest.prop",
+        "org.scalatest.propspec",
         "org.scalatest.tags",
         "org.scalatest.tagobjects",
         "org.scalatest.time",
         "org.scalatest.tools",
         "org.scalatest.verb",
-        "org.scalatest.words"
+        "org.scalatest.words", 
+        "org.scalatest.wordspec"
       ),
       OsgiKeys.importPackage := Seq(
         "org.scalatest.*",
@@ -1010,13 +1014,15 @@ object ScalatestBuild {
       "org.scalatest.matchers",
       "org.scalatest.path",
       "org.scalatest.prop",
+      "org.scalatest.propspec",
       "org.scalatest.refspec",
       "org.scalatest.tags",
       "org.scalatest.tagobjects",
       "org.scalatest.time",
       "org.scalatest.tools",
       "org.scalatest.verb",
-      "org.scalatest.words"
+      "org.scalatest.words", 
+      "org.scalatest.wordspec"
     ),
     OsgiKeys.importPackage := Seq(
       "org.scalatest.*",
@@ -1160,12 +1166,14 @@ object ScalatestBuild {
       "org.scalatest.matchers",
       "org.scalatest.path",
       "org.scalatest.prop",
+      "org.scalatest.propspec",
       "org.scalatest.tags",
       "org.scalatest.tagobjects",
       "org.scalatest.time",
       "org.scalatest.tools",
       "org.scalatest.verb",
-      "org.scalatest.words"
+      "org.scalatest.words", 
+      "org.scalatest.wordspec"
     ),
     OsgiKeys.importPackage := Seq(
       "org.scalatest.*",
@@ -1272,13 +1280,15 @@ object ScalatestBuild {
         "org.scalatest.matchers",
         "org.scalatest.path",
         "org.scalatest.prop",
+        "org.scalatest.propspec",
         "org.scalatest.refspec",
         "org.scalatest.tags",
         "org.scalatest.tagobjects",
         "org.scalatest.time",
         "org.scalatest.tools",
         "org.scalatest.verb",
         "org.scalatest.words",
+        "org.scalatest.wordspec",
         "org.scalactic",
         "org.scalactic.anyvals",
         "org.scalactic.exceptions",
@@ -1344,12 +1354,14 @@ object ScalatestBuild {
         "org.scalatest.matchers",
         "org.scalatest.path",
         "org.scalatest.prop",
+        "org.scalatest.propspec",
         "org.scalatest.tags",
         "org.scalatest.tagobjects",
         "org.scalatest.time",
         "org.scalatest.tools",
         "org.scalatest.verb",
         "org.scalatest.words",
+        "org.scalatest.wordspec",
         "org.scalactic",
         "org.scalactic.anyvals",
         "org.scalactic.exceptions",
@@ -1414,12 +1426,14 @@ object ScalatestBuild {
           "org.scalatest.matchers",
           "org.scalatest.path",
           "org.scalatest.prop",
+          "org.scalatest.propspec",
           "org.scalatest.tags",
           "org.scalatest.tagobjects",
           "org.scalatest.time",
           "org.scalatest.tools",
           "org.scalatest.verb",
           "org.scalatest.words",
+          "org.scalatest.wordspec",
           "org.scalactic",
           "org.scalactic.anyvals",
           "org.scalactic.exceptions",