flok 0.0.31 → 0.0.32

data/spec/kern/assets/goto.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "hello", "world"
 
   action :my_action do
@@ -20,8 +19,6 @@ controller :my_controller do
 end
 
 controller :my_controller2 do
-  view :test_view2
-
   action :my_action do
     on_entry %{
     }

data/spec/kern/assets/goto2.rb

@@ -1,6 +1,4 @@
 controller :my_controller do
-  view :test_view
-
   action :my_action do
     on_entry %{
     }

data/spec/kern/assets/lower_event.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "hello", "world"
 
   action :my_action do
@@ -16,7 +15,6 @@ controller :my_controller do
 end
 
 controller :my_sub_controller do
-  view :test_view2
   spots "hello", "world"
 
   action :my_action do

data/spec/kern/assets/raise_event.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "hello", "world"
 
   action :my_action do
@@ -16,7 +15,6 @@ controller :my_controller do
 end
 
 controller :my_sub_controller do
-  view :test_view2
   spots "hello", "world"
 
   action :my_action do

data/spec/kern/assets/rest_service.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "hello", "world"
 
   action :my_action do

data/spec/kern/assets/send_event.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "hello", "world"
 
   action :my_action do

data/spec/kern/assets/test_event.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "hello", "world"
 
   action :my_action do

data/spec/kern/assets/test_event2.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "content"
 
   action :my_action do
@@ -17,7 +16,6 @@ end
 #This controller will receive test_event but should
 #pass it up to 'my_controller'
 controller :my_controller2 do
-  view :test_view
 
   action :my_action do
     on_entry %{

data/spec/kern/assets/test_event3.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "content"
 
   action :my_action do
@@ -12,7 +11,6 @@ end
 #This controller will receive test_event but should
 #pass it up to 'my_controller'
 controller :my_controller2 do
-  view :test_view
 
   action :my_action do
     on_entry %{

data/spec/kern/assets/timer_service.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "hello", "world"
 
   action :my_action do

data/spec/kern/controller_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe "kern:controller_spec" do
 
     base = ctx.eval("base")
 
-    @driver.mexpect("if_init_view", ["test_view", {}, base+1, ["main", "hello", "world"]])
+    @driver.mexpect("if_init_view", ["my_controller", {}, base+1, ["main", "hello", "world"]])
     @driver.mexpect("if_controller_init", [base, base+1, "my_controller", {}])
     @driver.mexpect("if_attach_view", [base+1, 0])
     @driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "my_action"}])
@@ -48,7 +48,7 @@ RSpec.describe "kern:controller_spec" do
 
     base = ctx.eval("base")
 
-    @driver.mexpect("if_init_view", ["test_view", {}, base+1, ["main", "hello", "world"]])
+    @driver.mexpect("if_init_view", ["my_controller", {}, base+1, ["main", "hello", "world"]])
     @driver.mexpect("if_controller_init", [base, base+1, "my_controller", {"secret" => secret}])
     @driver.mexpect("if_attach_view", [base+1, 0])
     @driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "my_action"}])
@@ -71,12 +71,12 @@ RSpec.describe "kern:controller_spec" do
 
     base = ctx.eval("base")
 
-    @driver.mexpect("if_init_view", ["test_view", {}, base+1, ["main", "hello", "world"]])
+    @driver.mexpect("if_init_view", ["my_controller", {}, base+1, ["main", "hello", "world"]])
     @driver.mexpect("if_controller_init", [base, base+1, "my_controller", {"secret" => secret}])
     @driver.mexpect("if_attach_view", [base+1, 0])
-    @driver.mexpect("if_init_view", ["test_view2", {}, base+5, ["main", "hello", "world"]])
 
     #We expect the sub controller to receive the same info
+    @driver.mexpect("if_init_view", ["my_sub_controller", {}, base+5, ["main", "hello", "world"]])
     @driver.mexpect("if_controller_init", [base+4, base+5, "my_sub_controller", {"secret" => secret}])
   end
 
@@ -163,14 +163,14 @@ RSpec.describe "kern:controller_spec" do
     base = ctx.eval('base')
 
     #First, we expect the base vc to be setup as a view
-    @driver.mexpect("if_init_view", ["test_view", {}, base+1, ["main", "hello", "world"]])
+    @driver.mexpect("if_init_view", ["my_controller", {}, base+1, ["main", "hello", "world"]])
     @driver.mexpect("if_controller_init", [base, base+1, "my_controller", {}])
     @driver.mexpect("if_attach_view", [base+1, 0])
 
     #Now we expect the embedded view to be setup as a view within the base view
     #It's +5, because the base takes us 4 (+3) entries, and then the next embedded takes up
     #the next view controlelr and finally main view entry (5th)
-    @driver.mexpect("if_init_view", ["test_view2", {}, base+5, ["main", "hello", "world"]])
+    @driver.mexpect("if_init_view", ["my_sub_controller", {}, base+5, ["main", "hello", "world"]])
     @driver.mexpect("if_controller_init", [base+4, base+5, "my_sub_controller", {}])
     @driver.mexpect("if_attach_view", [base+5, base+2])
 
@@ -239,7 +239,7 @@ RSpec.describe "kern:controller_spec" do
     expect(ctx.eval("test_action_called_params")).not_to eq(nil)
   end
 
-  it "Can initiate a controller via _embed and have a tracked list of embeds in info" do
+  it  "Can initiate a controller via _embed and have a tracked list of embeds in info" do
     #Compile the controller
     ctx = flok_new_user File.read('./spec/kern/assets/controller1.rb')
 
@@ -305,12 +305,12 @@ RSpec.describe "kern:controller_spec" do
     #['vc', 'main', 'hello', 'world'], ['vc', 'main']
     #|--0-----1--------2--------3---|=======================The my_controller
     #                                  |-4------5---|====== The my_controller2
-    @driver.mexpect("if_init_view", ["test_view", {}, base+1, ["main", "hello", "world"]])
+    @driver.mexpect("if_init_view", ["my_controller", {}, base+1, ["main", "hello", "world"]])
     @driver.mexpect("if_controller_init", [base, base+1, "my_controller", {}])
     @driver.mexpect("if_attach_view", [base+1, 0]) #Attach to main root spot
 
     #Embed my_controller2 in action 'my_action'
-    @driver.mexpect("if_init_view", ["test_view2", {}, base+5, ["main"]])
+    @driver.mexpect("if_init_view", ["my_controller2", {}, base+5, ["main"]])
     @driver.mexpect("if_controller_init", [base+4, base+5, "my_controller2", {}])
     @driver.mexpect("if_attach_view", [base+5, base+2])
 
@@ -377,7 +377,7 @@ RSpec.describe "kern:controller_spec" do
     base = ctx.eval("base")
 
     #The usual
-    @driver.mexpect("if_init_view", ["test_view", {}, base+1, ["main"]])
+    @driver.mexpect("if_init_view", ["my_controller", {}, base+1, ["main"]])
     @driver.mexpect("if_controller_init", [base, base+1, "my_controller", {}])
     @driver.mexpect("if_attach_view", [base+1, 0])
     @driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "my_action"}])
@@ -403,7 +403,7 @@ RSpec.describe "kern:controller_spec" do
 
     base = ctx.eval("base")
 
-    @driver.mexpect("if_init_view", ["test_view", {}, base+1, ["main", "content"]])
+    @driver.mexpect("if_init_view", ["my_controller", {}, base+1, ["main", "content"]])
     @driver.mexpect("if_controller_init", [base, base+1, "my_controller", {}])
     @driver.mexpect("if_attach_view", [base+1, 0])
     @driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "my_action"}])
@@ -428,7 +428,7 @@ RSpec.describe "kern:controller_spec" do
 
     base = ctx.eval("base")
 
-    @driver.mexpect("if_init_view", ["test_view", {}, base+1, ["main", "hello", "world"]])
+    @driver.mexpect("if_init_view", ["my_controller", {}, base+1, ["main", "hello", "world"]])
     @driver.mexpect("if_controller_init", [base, base+1, "my_controller", {}])
     @driver.mexpect("if_attach_view", [base+1, 0])
     @driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "my_action"}])

data/spec/kern/debug_spec.rb

@@ -9,9 +9,10 @@ require './spec/lib/rspec_extensions.rb'
 RSpec.describe "kern:debug_spec" do
   include_context "kern"
 
- it "Can retreive the controller's context" do
+  #includes context, events, etc.
+  it "Can retreive the controller's describe" do
     #Compile the controller
-    ctx = flok_new_user File.read('./spec/kern/assets/controller_context.rb')
+    ctx = flok_new_user File.read('./spec/kern/assets/controller_describe.rb')
 
     #Do not run anything
     ctx.eval %{
@@ -24,15 +25,20 @@ RSpec.describe "kern:debug_spec" do
 
     base = ctx.eval("base")
 
-    @driver.mexpect("if_init_view", ["my_view", {}, base+1, ["main"]])
+    @driver.mexpect("if_init_view", ["my_controller", {}, base+1, ["main"]])
     @driver.mexpect("if_controller_init", [base, base+1, "my_controller", {"hello" => "world"}])
     @driver.mexpect("if_attach_view", [base+1, 0])
     @driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "index"}])
 
     #Request context for view controller
-    @driver.int "int_debug_controller_context", [base]
-    @driver.mexpect("if_event", [-333, "debug_controller_context_res", {
-      "hello" => "world"
+    @driver.int "int_debug_controller_describe", [base]
+    @driver.mexpect("if_event", [-333, "debug_controller_describe_res", {
+      "context" => {
+        "hello" => "world"
+      },
+      "events" => [
+        "test"
+      ]
     }])
   end
 end

data/spec/kern/debug_ui_spec.rb

@@ -9,139 +9,273 @@ require './spec/lib/rspec_extensions.rb'
 RSpec.describe "kern:debug_ui_spec" do
   include_context "kern"
 
-it "Can call int_debug_dump_ui and get back root view hierarchy" do
+#it "Can call int_debug_dump_ui and get back root view hierarchy" do
+    ##Compile the controller
+    #ctx = flok_new_user File.read('./spec/kern/assets/controller_bare.rb')
+
+    ##Do not run anything
+    #ctx.eval %{
+      #int_dispatch([]);
+    #}
+
+    #@driver.int "int_debug_dump_ui", []
+
+    #@driver.mexpect("if_event", [-333, "debug_dump_ui_res", {
+      #"type" => "spot",
+      #"name" => "root",
+      #"ptr" => 0,
+      #"children" => []
+    #}])
+  #end
+
+ #it "Can call int_debug_dump_ui for one controller correctly" do
+    ##Compile the controller
+    #ctx = flok_new_user File.read('./spec/kern/assets/controller_bare.rb')
+
+    ##Do not run anything
+    #ctx.eval %{
+      #//Call embed on main root view
+      #base = _embed("my_controller", 0, {}, null);
+
+      #//Drain queue
+      #int_dispatch([]);
+    #}
+
+    #base = ctx.eval("base")
+
+    #@driver.mexpect("if_init_view", ["my_controller", {}, base+1, ["main"]])
+    #@driver.mexpect("if_controller_init", [base, base+1, "my_controller", {}])
+    #@driver.mexpect("if_attach_view", [base+1, 0])
+    #@driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "index"}])
+
+    #@driver.int "int_debug_dump_ui", []
+    #@driver.mexpect("if_event", [-333, "debug_dump_ui_res", {
+      #"type" => "spot",
+      #"name" => "root",
+      #"ptr" => 0,
+      #"children" => [
+        #{
+          #"name" => "my_controller",
+          #"ptr" => base,
+          #"type" => "vc",
+          #"action" => "index",
+          #"events" => ["test"],
+          #"children" => [
+            #{
+              #"type" => "view",
+              #"name" => "my_controller",
+              #"ptr" => base+1,
+              #"children" => []
+            #}
+          #]
+        #}
+      #]
+    #}])
+  #end
+
+  #it "Can call int_debug_dump_ui for one controller correctly with spots" do
+    ##Compile the controller
+    #ctx = flok_new_user File.read('./spec/kern/assets/controller_spots.rb')
+
+    ##Do not run anything
+    #ctx.eval %{
+      #//Call embed on main root view
+      #base = _embed("my_controller", 0, {}, null);
+
+      #//Drain queue
+      #int_dispatch([]);
+    #}
+
+    #base = ctx.eval("base")
+
+    #@driver.mexpect("if_init_view", ["my_controller", {}, base+1, ["main", "one", "two"]])
+    #@driver.mexpect("if_controller_init", [base, base+1, "my_controller", {}])
+    #@driver.mexpect("if_attach_view", [base+1, 0])
+    #@driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "index"}])
+
+    #@driver.int "int_debug_dump_ui", []
+    #@driver.mexpect("if_event", [-333, "debug_dump_ui_res", {
+      #"type" => "spot",
+      #"name" => "root",
+      #"ptr" => 0,
+      #"children" => [
+        #{
+          #"name" => "my_controller",
+          #"ptr" => base,
+          #"type" => "vc",
+          #"action" => "index",
+          #"events" => ["test", "test2"],
+          #"children" => [
+            #{
+              #"type" => "view",
+              #"name" => "my_controller",
+              #"ptr" => base+1,
+              #"children" => [
+                #{"name" => "one", "type" => "spot", "children" => [], "ptr" => base+2},
+                #{"name" => "two", "type" => "spot", "children" => [], "ptr" => base+3},
+              #]
+            #}
+          #]
+        #}
+      #]
+    #}])
+  #end
+
+  #it "Can call int_debug_dump_ui for one controller correctly with spots and one embedded" do
+    ##Compile the controller
+    #ctx = flok_new_user File.read('./spec/kern/assets/controller_spots_embed.rb')
+
+    ##Do not run anything
+    #ctx.eval %{
+      #//Call embed on main root view
+      #base = _embed("my_controller", 0, {}, null);
+
+      #//Drain queue
+      #int_dispatch([]);
+    #}
+
+    #base = ctx.eval("base")
+
+    #@driver.mexpect("if_init_view", ["my_controller", {}, base+1, ["main", "one", "two"]])
+    #@driver.mexpect("if_controller_init", [base, base+1, "my_controller", {}])
+    #@driver.mexpect("if_attach_view", [base+1, 0])
+    #@driver.mexpect("if_init_view", ["my_other_controller", {}, base+5, ["main"]])
+    #@driver.mexpect("if_controller_init", [base+4, base+5, "my_other_controller", {}])
+    #@driver.mexpect("if_attach_view", [base+5, base+2])
+    #@driver.mexpect("if_event", [base+4, "action", {"from" => nil, "to" => "index"}])
+    #@driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "index"}])
+
+    #@driver.int "int_debug_dump_ui", []
+    #@driver.mexpect("if_event", [-333, "debug_dump_ui_res", {
+      #"type" => "spot",
+      #"name" => "root",
+      #"ptr" => 0,
+      #"children" => [
+        #{
+          #"name" => "my_controller",
+          #"ptr" => base,
+          #"type" => "vc",
+          #"action" => "index",
+          #"events" => ["test1"],
+          #"children" => [
+            #{
+              #"type" => "view",
+              #"name" => "my_controller",
+              #"ptr" => base+1,
+              #"children" => [
+                #{"name" => "one", "type" => "spot", "children" => [
+                  #{
+                    #"name" => "my_other_controller",
+                    #"ptr" => base+4,
+                    #"type" => "vc",
+                    #"action" => "index",
+                    #"events" => ["test2"],
+                    #"children" => [
+                      #{
+                        #"type" => "view",
+                        #"ptr" => base+5,
+                        #"name" => "my_other_controller",
+                        #"children" => [],
+                      #}
+                    #]
+                  #}
+                #], "ptr" => base+2},
+                #{"name" => "two", "type" => "spot", "children" => [], "ptr" => base+3},
+              #]
+            #}
+          #]
+        #}
+      #]
+    #}])
+  #end
+
+  #it "Can call int_debug_dump_ui for one controller correctly with spots and one embedded that was later removed" do
+    ##Compile the controller
+    #ctx = flok_new_user File.read('./spec/kern/assets/controller_spots_embed_removed.rb')
+
+    ##Do not run anything
+    #ctx.eval %{
+      #//Call embed on main root view
+      #base = _embed("my_controller", 0, {}, null);
+
+      #//Drain queue
+      #int_dispatch([3, "int_event", base, "next", {}]);
+    #}
+
+    #base = ctx.eval("base")
+
+    #@driver.mexpect("if_init_view", ["my_controller", {}, base+1, ["main", "one", "two"]])
+    #@driver.mexpect("if_controller_init", [base, base+1, "my_controller", {}])
+    #@driver.mexpect("if_attach_view", [base+1, 0])
+    #@driver.mexpect("if_init_view", ["my_other_controller", {}, base+5, ["main"]])
+    #@driver.mexpect("if_controller_init", [base+4, base+5, "my_other_controller", {}])
+    #@driver.mexpect("if_attach_view", [base+5, base+2])
+    #@driver.mexpect("if_event", [base+4, "action", {"from" => nil, "to" => "index"}])
+    #@driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "index"}])
+
+    ##Expect the view to be removed, and for our action to switch
+    #@driver.mexpect("if_free_view", [base+5])
+    #@driver.mexpect("if_event", [base, "action", {"from" => "index", "to" => "other"}])
+
+    #@driver.int "int_debug_dump_ui", []
+    #@driver.mexpect("if_event", [-333, "debug_dump_ui_res", {
+      #"type" => "spot",
+      #"name" => "root",
+      #"ptr" => 0,
+      #"children" => [
+        #{
+          #"name" => "my_controller",
+          #"events" => ["test2"],
+          #"ptr" => base,
+          #"type" => "vc",
+          #"action" => "other",
+          #"children" => [
+            #{
+              #"type" => "view",
+              #"name" => "my_controller",
+              #"ptr" => base+1,
+              #"children" => [
+                #{"name" => "one", "type" => "spot", "children" => [], "ptr" => base+2},
+                #{"name" => "two", "type" => "spot", "children" => [], "ptr" => base+3},
+              #]
+            #}
+          #]
+        #}
+      #]
+    #}])
+  #end
+
+  it "Can go forward and then back and have the correct hierarchy (where a parent controlls children like nav)" do
     #Compile the controller
-    ctx = flok_new_user File.read('./spec/kern/assets/controller_bare.rb')
-
-    #Do not run anything
-    ctx.eval %{
-      int_dispatch([]);
-    }
-
-    @driver.int "int_debug_dump_ui", []
-
-    @driver.mexpect("if_event", [-333, "debug_dump_ui_res", {
-      "type" => "spot",
-      "name" => "root",
-      "ptr" => 0,
-      "children" => []
-    }])
-  end
-
- it "Can call int_debug_dump_ui for one controller correctly" do
-    #Compile the controller
-    ctx = flok_new_user File.read('./spec/kern/assets/controller_bare.rb')
-
-    #Do not run anything
-    ctx.eval %{
-      //Call embed on main root view
-      base = _embed("my_controller", 0, {}, null);
-
-      //Drain queue
-      int_dispatch([]);
-    }
-
-    base = ctx.eval("base")
-
-    @driver.mexpect("if_init_view", ["my_view", {}, base+1, ["main"]])
-    @driver.mexpect("if_controller_init", [base, base+1, "my_controller", {}])
-    @driver.mexpect("if_attach_view", [base+1, 0])
-    @driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "index"}])
-
-    @driver.int "int_debug_dump_ui", []
-    @driver.mexpect("if_event", [-333, "debug_dump_ui_res", {
-      "type" => "spot",
-      "name" => "root",
-      "ptr" => 0,
-      "children" => [
-        {
-          "name" => "my_controller",
-          "ptr" => base,
-          "type" => "vc",
-          "action" => "index",
-          "children" => [
-            {
-              "type" => "view",
-              "name" => "my_view",
-              "ptr" => base+1,
-              "children" => []
-            }
-          ]
-        }
-      ]
-    }])
-  end
-
-  it "Can call int_debug_dump_ui for one controller correctly with spots" do
-    #Compile the controller
-    ctx = flok_new_user File.read('./spec/kern/assets/controller_spots.rb')
+    ctx = flok_new_user File.read('./spec/kern/assets/forward_and_back.rb')
 
     #Do not run anything
     ctx.eval %{
       //Call embed on main root view
-      base = _embed("my_controller", 0, {}, null);
+      base = _embed("fabric", 0, {}, null);
 
       //Drain queue
-      int_dispatch([]);
+      int_dispatch([3, "int_event", base, "next_clicked", {}]);
     }
 
     base = ctx.eval("base")
 
-    @driver.mexpect("if_init_view", ["my_view", {}, base+1, ["main", "one", "two"]])
-    @driver.mexpect("if_controller_init", [base, base+1, "my_controller", {}])
+    @driver.mexpect("if_init_view", ["fabric", {}, base+1, ["main", "content"]])
+    @driver.mexpect("if_controller_init", [base, base+1, "fabric", {}])
     @driver.mexpect("if_attach_view", [base+1, 0])
-    @driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "index"}])
-
-    @driver.int "int_debug_dump_ui", []
-    @driver.mexpect("if_event", [-333, "debug_dump_ui_res", {
-      "type" => "spot",
-      "name" => "root",
-      "ptr" => 0,
-      "children" => [
-        {
-          "name" => "my_controller",
-          "ptr" => base,
-          "type" => "vc",
-          "action" => "index",
-          "children" => [
-            {
-              "type" => "view",
-              "name" => "my_view",
-              "ptr" => base+1,
-              "children" => [
-                {"name" => "one", "type" => "spot", "children" => [], "ptr" => base+2},
-                {"name" => "two", "type" => "spot", "children" => [], "ptr" => base+3},
-              ]
-            }
-          ]
-        }
-      ]
-    }])
-  end
-
-  it "Can call int_debug_dump_ui for one controller correctly with spots and one embedded" do
-    #Compile the controller
-    ctx = flok_new_user File.read('./spec/kern/assets/controller_spots_embed.rb')
-
-    #Do not run anything
-    ctx.eval %{
-      //Call embed on main root view
-      base = _embed("my_controller", 0, {}, null);
-
-      //Drain queue
-      int_dispatch([]);
-    }
+    @driver.mexpect("if_init_view", ["one", {}, base+4, ["main"]])
+    @driver.mexpect("if_controller_init", [base+3, base+4, "one", {}])
+    @driver.mexpect("if_attach_view", [base+4, base+2])
+    @driver.mexpect("if_event", [base+3, "action", {"from" => nil, "to" => "index"}])
+    @driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "one"}])
 
-    base = ctx.eval("base")
-
-    @driver.mexpect("if_init_view", ["my_view", {}, base+1, ["main", "one", "two"]])
-    @driver.mexpect("if_controller_init", [base, base+1, "my_controller", {}])
-    @driver.mexpect("if_attach_view", [base+1, 0])
-    @driver.mexpect("if_init_view", ["my_other_view", {}, base+5, ["main"]])
-    @driver.mexpect("if_controller_init", [base+4, base+5, "my_other_controller", {}])
-    @driver.mexpect("if_attach_view", [base+5, base+2])
-    @driver.mexpect("if_event", [base+4, "action", {"from" => nil, "to" => "index"}])
-    @driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "index"}])
+    #Expect the view to be removed, and for our action to switch
+    @driver.mexpect("if_free_view", [base+4])
+    @driver.mexpect("if_init_view", ["two", {}, base+6, ["main"]])
+    @driver.mexpect("if_controller_init", [base+5, base+6, "two", {}])
+    @driver.mexpect("if_attach_view", [base+6, base+2])
+    @driver.mexpect("if_event", [base+5, "action", {"from" => nil, "to" => "index"}])
+    @driver.mexpect("if_event", [base, "action", {"from" => "one", "to" => "two"}])
 
     @driver.int "int_debug_dump_ui", []
     @driver.mexpect("if_event", [-333, "debug_dump_ui_res", {
@@ -150,88 +284,34 @@ it "Can call int_debug_dump_ui and get back root view hierarchy" do
       "ptr" => 0,
       "children" => [
         {
-          "name" => "my_controller",
+          "name" => "fabric",
+          "events" => ["back_clicked"],
           "ptr" => base,
           "type" => "vc",
-          "action" => "index",
+          "action" => "two",
           "children" => [
             {
               "type" => "view",
-              "name" => "my_view",
+              "name" => "fabric",
               "ptr" => base+1,
               "children" => [
-                {"name" => "one", "type" => "spot", "children" => [
+                {"name" => "content", "type" => "spot", "ptr" => base+2, "children" => [
                   {
-                    "name" => "my_other_controller",
-                    "ptr" => base+4,
+                    "name" => "two",
+                    "events" => [],
                     "type" => "vc",
                     "action" => "index",
+                    "ptr" => base+5,
                     "children" => [
                       {
                         "type" => "view",
-                        "ptr" => base+5,
-                        "name" => "my_other_view",
-                        "children" => [],
+                        "name" => "two",
+                        "ptr" => base+6,
+                        "children" => []
                       }
                     ]
                   }
-                ], "ptr" => base+2},
-                {"name" => "two", "type" => "spot", "children" => [], "ptr" => base+3},
-              ]
-            }
-          ]
-        }
-      ]
-    }])
-  end
-
-  it "Can call int_debug_dump_ui for one controller correctly with spots and one embedded that was later removed" do
-    #Compile the controller
-    ctx = flok_new_user File.read('./spec/kern/assets/controller_spots_embed_removed.rb')
-
-    #Do not run anything
-    ctx.eval %{
-      //Call embed on main root view
-      base = _embed("my_controller", 0, {}, null);
-
-      //Drain queue
-      int_dispatch([3, "int_event", base, "next", {}]);
-    }
-
-    base = ctx.eval("base")
-
-    @driver.mexpect("if_init_view", ["my_view", {}, base+1, ["main", "one", "two"]])
-    @driver.mexpect("if_controller_init", [base, base+1, "my_controller", {}])
-    @driver.mexpect("if_attach_view", [base+1, 0])
-    @driver.mexpect("if_init_view", ["my_other_view", {}, base+5, ["main"]])
-    @driver.mexpect("if_controller_init", [base+4, base+5, "my_other_controller", {}])
-    @driver.mexpect("if_attach_view", [base+5, base+2])
-    @driver.mexpect("if_event", [base+4, "action", {"from" => nil, "to" => "index"}])
-    @driver.mexpect("if_event", [base, "action", {"from" => nil, "to" => "index"}])
-
-    #Expect the view to be removed, and for our action to switch
-    @driver.mexpect("if_free_view", [base+5])
-    @driver.mexpect("if_event", [base, "action", {"from" => "index", "to" => "other"}])
-
-    @driver.int "int_debug_dump_ui", []
-    @driver.mexpect("if_event", [-333, "debug_dump_ui_res", {
-      "type" => "spot",
-      "name" => "root",
-      "ptr" => 0,
-      "children" => [
-        {
-          "name" => "my_controller",
-          "ptr" => base,
-          "type" => "vc",
-          "action" => "other",
-          "children" => [
-            {
-              "type" => "view",
-              "name" => "my_view",
-              "ptr" => base+1,
-              "children" => [
-                {"name" => "one", "type" => "spot", "children" => [], "ptr" => base+2},
-                {"name" => "two", "type" => "spot", "children" => [], "ptr" => base+3},
+                ]}
               ]
             }
           ]