specs back to green

Author: heythisisnate

spec/application_spec.lua

@@ -6,7 +6,7 @@ describe("application", function()
     if name == "actuators" then
       return {{pin=1,trigger=1} }
     elseif name == "settings" then
-      return {apiUrl = "http://192.168.1.123:8123/api/konnected", token = "secrettoken"}
+      return {endpoint = "http://192.168.1.123:8123/api/konnected", token = "secrettoken"}
     else
       return real_require(name)
     end

spec/device_spec.lua

@@ -7,8 +7,8 @@ describe("device", function()
   end)
 
   it("has expected properties", function()
-    assert.equal(device.swVersion, "2.2.6")
-    assert.equal(device.hwVersion, "2.2.6")
+    assert.equal(device.swVersion, "2.3.1")
+    assert.equal(device.hwVersion, "2.3.0")
     assert.equal(device.name, "Konnected")
   end)
 

spec/init_spec.lua

@@ -17,7 +17,7 @@ describe("init", function()
       nodemcu.wifi.sta.config = ""
       mock(_G.enduser_setup)
 
-      dofile("src/init.lua")
+      dofile("../init.lua")
     end)
 
     after_each(function()
@@ -35,7 +35,7 @@ describe("init", function()
     before_each(function()
       require("spec/nodemcu_stubs")
       stub(_G.tmr, 'create').returns(mock_timer)
-      dofile("src/init.lua")
+      dofile("../init.lua")
 
       spy.on(_G.gpio, 'write')
       spy.on(wifi.eventmon, 'unregister')
@@ -81,7 +81,7 @@ describe("init", function()
     before_each(function()
       require("spec/nodemcu_stubs")
       stub(_G.tmr, 'create').returns(mock_timer)
-      dofile("src/init.lua")
+      dofile("../init.lua")
       spy.on(wifi.eventmon, 'unregister')
 
       nodemcu.wifi.eventmon['STA_DISCONNECTED']({SSID = "test", BSSID = "test", reason = "201"})

spec/nodemcu_stubs.lua

@@ -25,6 +25,8 @@ _G.node = {
   heap = function() return 0 end,
   chipid = function() return 0 end,
   restart = function() end,
+  flashindex = function() return true end,
+  flashreload = function() end,
   info = function() return 1, 5, 4 end
 }
 
@@ -126,6 +128,30 @@ _G.unpack = function(t, i)
   end
 end
 
+_G.sntp = {
+  sync = function(_, success, fail)
+    success()
+  end
+}
+
+_G.rtctime = {
+  epoch2cal = function()
+    return {
+      year = 2019,
+      mon = 9,
+      day = 17,
+      hour = 17,
+      min = 46,
+      sec = 58
+    }
+  end
+}
+
+local df = dofile
+_G.dofile = function(n)
+  df('src/lfs/' .. n)
+end
+
 -- Print contents of `tbl`, with indentation.
 -- `indent` sets the initial level of indentation.
 function tprint (tbl, indent)

src/lfs/server_device.lua

@@ -1,5 +1,4 @@
 local module = ...
-local switch = require("switch")
 
 local function process(request)
   if request.method == "GET" then
@@ -26,11 +25,11 @@ local function process(request)
       if request.body[1] then
         local ret = {}
         for i in pairs(request.body) do
-          table.insert(ret, switch(request.body[i]))
+          table.insert(ret, require("switch")(request.body[i]))
         end
         return sjson.encode(ret)
       else
-        return sjson.encode(switch(request.body))
+        return sjson.encode(require("switch")(request.body))
       end
     end
   end