Fixed tests

outr · Jan 21, 2022 · ac65276 · ac65276
1 parent 1161327
commit ac65276
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,6 @@
 # reactify
 
-[![Build Status](https://travis-ci.org/outr/reactify.svg?branch=master)](https://travis-ci.org/outr/reactify)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/759324d19db5496dbd9867b4a113c806)](https://www.codacy.com/app/matthicks/reactify?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=outr/reactify&amp;utm_campaign=Badge_Grade)
-[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/759324d19db5496dbd9867b4a113c806)](https://www.codacy.com/app/matthicks/reactify?utm_source=github.com&utm_medium=referral&utm_content=outr/reactify&utm_campaign=Badge_Coverage)
+[![CI](https://github.com/outr/reactify/actions/workflows/ci.yml/badge.svg)](https://github.com/outr/reactify/actions/workflows/ci.yml)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/outr/reactify)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.outr/reactify_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.outr/reactify_2.12)
 [![Latest version](https://index.scala-lang.org/outr/reactify/reactify/latest.svg)](https://index.scala-lang.org/outr/reactify)

diff --git a/reactify/src/test/scala/test/BindingSpec.scala b/reactify/src/test/scala/test/BindingSpec.scala
@@ -1,12 +1,13 @@
 package test
 
-import testy._
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 import reactify._
 import reactify.bind.Binding
 
 import scala.language.implicitConversions
 
-class BindingSpec extends Spec {
+class BindingSpec extends AnyWordSpec with Matchers {
   "Bindings" when {
     "dealing with a simple binding" should {
       val a = Var[String]("a")

diff --git a/reactify/src/test/scala/test/ChannelSpec.scala b/reactify/src/test/scala/test/ChannelSpec.scala
@@ -1,11 +1,12 @@
 package test
 
-import testy._
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 import reactify.Channel
 
 import scala.language.implicitConversions
 
-class ChannelSpec extends Spec {
+class ChannelSpec extends AnyWordSpec with Matchers {
   "Channels" should {
     "notify when changed" in {
       var changes = 0

diff --git a/reactify/src/test/scala/test/DepSpec.scala b/reactify/src/test/scala/test/DepSpec.scala
@@ -1,12 +1,13 @@
 package test
 
-import testy._
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 import reactify._
 
 import scala.collection.mutable.ListBuffer
 import scala.language.implicitConversions
 
-class DepSpec extends Spec {
+class DepSpec extends AnyWordSpec with Matchers {
   "Deps" should {
     val width: Var[Double] = Var(0.0)
 

diff --git a/reactify/src/test/scala/test/DepSpecialSpec.scala b/reactify/src/test/scala/test/DepSpecialSpec.scala
@@ -1,11 +1,12 @@
 package test
 
-import testy._
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 import reactify._
 
 import scala.language.implicitConversions
 
-class DepSpecialSpec extends Spec {
+class DepSpecialSpec extends AnyWordSpec with Matchers {
   "Deps Special Use-Cases" when {
     "combining Ints" should {
       "do simple addition" in {

diff --git a/reactify/src/test/scala/test/TransactionSpec.scala b/reactify/src/test/scala/test/TransactionSpec.scala
@@ -1,11 +1,13 @@
 package test
 
-import testy._
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 import reactify.Var
 import reactify.transaction.Transaction
+
 import scala.language.implicitConversions
 
-class TransactionSpec extends Spec {
+class TransactionSpec extends AnyWordSpec with Matchers {
   "Transactions" should {
     "support undoing" in {
       val v = Var("One")

diff --git a/reactify/src/test/scala/test/TriggerSpec.scala b/reactify/src/test/scala/test/TriggerSpec.scala
@@ -1,11 +1,12 @@
 package test
 
-import testy._
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 import reactify.Trigger
 
 import scala.language.implicitConversions
 
-class TriggerSpec extends Spec {
+class TriggerSpec extends AnyWordSpec with Matchers {
   "Triggers" should {
     "handle simple invocations" in {
       val t = Trigger()

diff --git a/reactify/src/test/scala/test/ValSpec.scala b/reactify/src/test/scala/test/ValSpec.scala
@@ -1,11 +1,12 @@
 package test
 
-import testy._
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 import reactify._
 
 import scala.language.implicitConversions
 
-class ValSpec extends Spec {
+class ValSpec extends AnyWordSpec with Matchers {
   "Vals" should {
     "contain the proper value" in {
       val v = Val(5)

diff --git a/reactify/src/test/scala/test/VarSpec.scala b/reactify/src/test/scala/test/VarSpec.scala
@@ -1,14 +1,14 @@
 package test
 
-import testy._
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 import reactify._
 import reactify.group.VarGroup
 
 import scala.collection.mutable.ListBuffer
-
 import scala.language.implicitConversions
 
-class VarSpec extends Spec {
+class VarSpec extends AnyWordSpec with Matchers {
   lazy val lazyDouble: Var[Double] = Var(0.0)
 
   "Vars" should {