Refactored WordSpec into org.scalatest.wordspec package.

Author: cheeseng

project/GenScalaTestJS.scala

@@ -222,6 +222,7 @@ object GenScalaTestJS {
     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.

project/GenScalaTestNative.scala

@@ -221,6 +221,9 @@ object GenScalaTestNative {
     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.

project/scalatest.scala

@@ -810,7 +810,8 @@ object ScalatestBuild {
         "org.scalatest.time",
         "org.scalatest.tools",
         "org.scalatest.verb",
-        "org.scalatest.words"
+        "org.scalatest.words", 
+        "org.scalatest.wordspec"
       ),
       OsgiKeys.importPackage := Seq(
         "org.scalatest.*",
@@ -918,7 +919,8 @@ object ScalatestBuild {
         "org.scalatest.time",
         "org.scalatest.tools",
         "org.scalatest.verb",
-        "org.scalatest.words"
+        "org.scalatest.words", 
+        "org.scalatest.wordspec"
       ),
       OsgiKeys.importPackage := Seq(
         "org.scalatest.*",
@@ -1014,7 +1016,8 @@ object ScalatestBuild {
       "org.scalatest.time",
       "org.scalatest.tools",
       "org.scalatest.verb",
-      "org.scalatest.words"
+      "org.scalatest.words", 
+      "org.scalatest.wordspec"
     ),
     OsgiKeys.importPackage := Seq(
       "org.scalatest.*",
@@ -1164,7 +1167,8 @@ object ScalatestBuild {
       "org.scalatest.time",
       "org.scalatest.tools",
       "org.scalatest.verb",
-      "org.scalatest.words"
+      "org.scalatest.words", 
+      "org.scalatest.wordspec"
     ),
     OsgiKeys.importPackage := Seq(
       "org.scalatest.*",
@@ -1279,6 +1283,7 @@ object ScalatestBuild {
         "org.scalatest.tools",
         "org.scalatest.verb",
         "org.scalatest.words",
+        "org.scalatest.wordspec",
         "org.scalactic",
         "org.scalactic.anyvals",
         "org.scalactic.exceptions",
@@ -1351,6 +1356,7 @@ object ScalatestBuild {
         "org.scalatest.tools",
         "org.scalatest.verb",
         "org.scalatest.words",
+        "org.scalatest.wordspec",
         "org.scalactic",
         "org.scalactic.anyvals",
         "org.scalactic.exceptions",
@@ -1422,6 +1428,7 @@ object ScalatestBuild {
           "org.scalatest.tools",
           "org.scalatest.verb",
           "org.scalatest.words",
+          "org.scalatest.wordspec",
           "org.scalactic",
           "org.scalactic.anyvals",
           "org.scalactic.exceptions",