Make tests pass with coconut.vdom

Author: back2dos

.github/workflows/ci.yml

@@ -15,11 +15,12 @@ jobs:
         haxe-version:
           - stable
           - nightly
-        target: 
+        target:
           - interp
           - neko
           - node
           - js
+          - js -lib coconut.vdom
           - cpp
           - php
           - jvm
@@ -29,7 +30,7 @@ jobs:
     steps:
     - name: Check out repo
       uses: actions/checkout@v2
-    
+
     - name: Get yarn cache directory path
       id: yarn-cache-dir-path
       run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -41,34 +42,34 @@ jobs:
         key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
         restore-keys: |
           ${{ runner.os }}-yarn-
-        
+
     - name: Cache Haxe
       uses: actions/cache@v1
       with:
         path: ${{ startsWith(runner.os, 'windows') && '%AppData%' || '~/haxe' }}
         key: ${{ runner.os }}-haxe
-        
+
     - name: Install Lix
       uses: lix-pm/setup-lix@master
-      
+
     - name: Install Haxe
       run: lix install haxe ${{ matrix.haxe-version }}
-    
+
     - name: Install Haxe Libraries
       run: lix download
-      
+
     - name: Run Test
       run: lix run travix ${{ matrix.target }}
 
   release:
     runs-on: ubuntu-latest
     needs: test
     if: startsWith(github.ref, 'refs/tags/') # consider using the "release" event. see: https://docs.github.com/en/actions/reference/events-that-trigger-workflows#release
-    
+
     steps:
     - name: Check out repo
       uses: actions/checkout@v2
-    
+
     - name: Get yarn cache directory path
       id: yarn-cache-dir-path
       run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -80,24 +81,23 @@ jobs:
         key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
         restore-keys: |
           ${{ runner.os }}-yarn-
-        
+
     - name: Cache Haxe
       uses: actions/cache@v1
       with:
         path: ${{ startsWith(runner.os, 'windows') && '%AppData%' || '~/haxe' }}
         key: ${{ runner.os }}-haxe
-        
+
     - name: Install Lix
       uses: lix-pm/setup-lix@master
-      
+
     - name: Install Haxe
       run: lix install haxe stable
-    
+
     - name: Install Haxe Libraries
       run: lix download
-      
+
     - name: Release to Haxelib
       run: lix run travix release
       env:
         HAXELIB_AUTH: ${{ secrets.HAXELIB_AUTH }}
-    

haxe_libraries/coconut.vdom.hxml

@@ -1,5 +1,5 @@
-# @install: lix --silent download "gh://github.com/MVCoconut/coconut.vdom#058fbb7b86580043bea3335ab0a58f863c143b72" into coconut.vdom/0.8.1/github/058fbb7b86580043bea3335ab0a58f863c143b72
+# @install: lix --silent download "gh://github.com/MVCoconut/coconut.vdom#4735d72f0faadff2e949a3901791ff97e59c520b" into coconut.vdom/0.9.0/github/4735d72f0faadff2e949a3901791ff97e59c520b
 -lib coconut.diffing
 -lib xDOM
--cp ${HAXE_LIBCACHE}/coconut.vdom/0.8.1/github/058fbb7b86580043bea3335ab0a58f863c143b72/src
--D coconut.vdom=0.8.1
+-cp ${HAXE_LIBCACHE}/coconut.vdom/0.9.0/github/4735d72f0faadff2e949a3901791ff97e59c520b/src
+-D coconut.vdom=0.9.0

tests/TodoMvc.hx

@@ -54,7 +54,9 @@ class TodoMvc {
 
   function walk(native:Native, cb:Native->Void) {
     #if coconut.vdom
-      #error
+      cb(native);
+      for (e in native.childNodes)
+        walk(cast e, cb);
     #else
       native.each(cb);
     #end
@@ -102,7 +104,7 @@ class TodoMvc {
     return asserts.done();
   }
 
-  @:include public function testHydration() {
+  public function testHydration() {
 
     function compare(markup) {
 
@@ -111,20 +113,31 @@ class TodoMvc {
           nodes = [];
 
       for (hydrate in [false, true]) {
-        new Root(root, DummyApplicator.INST, markup, hydrate);
+        new Root(
+          cast root,
+          #if coconut.vdom
+            @:privateAccess Renderer.BACKEND // meh
+          #else DummyApplicator.INST #end,
+          markup,
+          hydrate
+        );
         if (hydrate) {
           asserts.assert(root.innerHTML == innerHTML);
           walk(root, n -> {
             asserts.assert(nodes.shift() == n);
+            #if !coconut.vdom
             if (n != root)
               asserts.assert(n.wet);
+            #end
           });
         }
         else {
           innerHTML = root.innerHTML;
           walk(root, n -> {
             nodes.push(n);
+            #if !coconut.vdom
             asserts.assert(!n.wet);
+            #end
           });
         }
       }
@@ -161,7 +174,7 @@ class TodoMvc {
     '));
 
     asserts.assert(TodoListView.mounted == lists + 4);
-    asserts.assert(TodoItemView.mounted == lists + 10);
+    asserts.assert(TodoItemView.mounted == items + 10);
 
     return asserts.done();
   }