fix existing tests

6 files changed, 55 insertions, 34 deletions

diff --git a/spec/cell_spec.moon b/spec/cell_spec.moon
index 673fedf..0b2ff64 100644
--- a/spec/cell_spec.moon
+++ b/spec/cell_spec.moon
@@ -1,14 +1,16 @@
+import do_setup from require 'spec.test_setup'
 import Cell, RootCell from require 'alv.cell'
 import ValueStream, Scope, Tag, SimpleRegistry, globals from require 'alv'
-import Logger from require 'alv.logger'
-Logger\init 'silent'
+import Copilot from require 'alv.copilot'
 
-hello_world = Cell.parse (Tag.parse '2'), { '', (ValueStream.sym 'hello'), ' ', (ValueStream.str 'world'), '' }
-two_plus_two = Cell.parse (Tag.parse '3'), { '', (ValueStream.sym '+'), ' ', (ValueStream.num 2), ' ', (ValueStream.num 2), '' }
+setup do_setup
 
-reg = SimpleRegistry!
-setup -> reg\grab!
-teardown -> reg\release!
+hello_world = Cell.parse Tag.parse('2'), {
+  '', (ValueStream.sym 'hello'), ' ', (ValueStream.str 'world'), ''
+}
+two_plus_two = Cell.parse Tag.parse('3'), {
+  '', (ValueStream.sym '+'), ' ', (ValueStream.num 2), ' ', (ValueStream.num 2), ''
+}
 
 describe 'Cell', ->
   describe 'when cloned', ->
diff --git a/spec/input_spec.moon b/spec/input_spec.moon
index 9a380f1..6ab4388 100644
--- a/spec/input_spec.moon
+++ b/spec/input_spec.moon
@@ -1,11 +1,7 @@
+import do_setup from require 'spec.test_setup'
 import Input, Result, ValueStream, EventStream, IOStream from require 'alv.base'
-import SimpleRegistry from require 'alv'
-import Logger from require 'alv.logger'
-Logger\init 'silent'
 
-reg = SimpleRegistry!
-setup -> reg\grab!
-teardown -> reg\release!
+setup do_setup
 
 class MyIO extends IOStream
   new: => super 'my-io'
@@ -65,7 +61,7 @@ describe 'Input.hot', ->
       assert.is.false input\dirty!
       input\finish_setup!
 
-      reg\next_tick!
+      COPILOT\next_tick!
       stream\add 1
 
       assert.is.true input\dirty!
@@ -97,7 +93,7 @@ describe 'Input.hot', ->
       assert.is.false input\dirty!
       input\finish_setup!
 
-      reg\next_tick!
+      COPILOT\next_tick!
       stream.is_dirty = true
 
       assert.is.true input\dirty!
@@ -133,7 +129,7 @@ describe 'Input.hot', ->
         newinput\finish_setup!
 
       it 'is not dirty when equal', ->
-        newval = ValueStream.num 1
+        newval = ValueStream.num!
         newval\set 1
 
         assert.is.true newval\dirty!
@@ -148,6 +144,6 @@ describe 'Input.hot', ->
         assert.is.true stream\dirty!
         assert.is.true input\dirty!
 
-        reg\next_tick!
+        COPILOT\next_tick!
         assert.is.false stream\dirty!
         assert.is.false input\dirty!
diff --git a/spec/result_spec.moon b/spec/result_spec.moon
index be60677..f7006f1 100644
--- a/spec/result_spec.moon
+++ b/spec/result_spec.moon
@@ -1,7 +1,8 @@
+import do_setup from require 'spec.test_setup'
 import Result, Scope, SimpleRegistry from require 'alv'
 import Input, Op, ValueStream, EventStream, IOStream from require 'alv.base'
-import Logger from require 'alv.logger'
-Logger\init 'silent'
+
+setup do_setup
 
 op_with_inputs = (inputs) ->
   with Op!
@@ -11,10 +12,6 @@ result_with_sideinput = (value, input) ->
   with Result :value
     .side_inputs = { [value]: input }
 
-reg = SimpleRegistry!
-setup -> reg\grab!
-teardown -> reg\release!
-
 class DirtyIO extends IOStream
   new: => super 'dirty-io'
   dirty: => true
diff --git a/spec/tag_spec.moon b/spec/tag_spec.moon
index e68409a..f92dca0 100644
--- a/spec/tag_spec.moon
+++ b/spec/tag_spec.moon
@@ -1,11 +1,8 @@
+import do_setup from require 'spec.test_setup'
 import Tag from require 'alv.tag'
 import Registry from require 'alv.registry'
-import Logger from require 'alv.logger'
-Logger\init 'silent'
 
-reg = Registry!
-setup -> reg\begin_eval!
-teardown -> reg\end_eval!
+setup do_setup
 
 describe 'Tag', ->
   describe 'should be constructable', ->
diff --git a/spec/test_setup.moon b/spec/test_setup.moon
new file mode 100644
index 0000000..ca5c71c
--- /dev/null
+++ b/spec/test_setup.moon
@@ -0,0 +1,32 @@
+require 'alv'
+import Copilot from require 'alv.copilot'
+import Module from require 'alv.module'
+import Logger from require 'alv.logger'
+Logger\init 'silent'
+
+class TestModule extends Module
+
+class TestCopilot extends Copilot
+  new: =>
+    @T = 0
+    @active_module = Module!
+
+  begin_eval: => @active_module.registry\begin_eval!
+  end_eval: => @active_module.registry\end_eval!
+  next_tick: => @T += 1
+
+  require: =>
+    error "not implemented"
+
+export COPILOT
+
+{
+  :TestCopilot
+
+  do_setup: ->
+    COPILOT = TestCopilot!
+    COPILOT\begin_eval!
+
+  do_teardown: ->
+    COPILOT\end_eval!
+}
diff --git a/spec/value_spec.moon b/spec/value_spec.moon
index 7a68199..d81ed40 100644
--- a/spec/value_spec.moon
+++ b/spec/value_spec.moon
@@ -1,7 +1,6 @@
+import do_setup from require 'spec.test_setup'
 import ValueStream, Result, Scope, SimpleRegistry from require 'alv'
 import Op, Builtin from require 'alv.base'
-import Logger from require 'alv.logger'
-Logger\init 'silent'
 
 class TestOp extends Op
   new: (...) => super ...
@@ -9,9 +8,7 @@ class TestOp extends Op
 class TestBuiltin extends Builtin
   new: (...) =>
 
-reg = SimpleRegistry!
-setup -> reg\grab!
-teardown -> reg\release!
+setup do_setup
 
 describe 'ValueStream', ->
   describe '.wrap', ->
@@ -174,7 +171,7 @@ describe 'ValueStream', ->
       assert.is.true b\dirty!
       assert.is.true bb\dirty!
 
-      reg\next_tick!
+      COPILOT\next_tick!
       aa\set 4
 
       assert.is.equal 3, a!