Merge pull request #461 from 3scale/add-missing-tests-config-parser

Add missing tests for the configuration parser module

Author: davidor

apicast/src/configuration_parser.lua

@@ -30,15 +30,6 @@ function _M.decode(contents, encoder)
   return ret
 end
 
-
-function _M.encode(contents, encoder)
-  if type(contents) == 'string' then return contents end
-
-  encoder = encoder or cjson
-
-  return encoder.encode(contents)
-end
-
 function _M.parse(contents, encoder)
   local config, err = _M.decode(contents, encoder)
 

spec/configuration_parser_spec.lua

@@ -15,23 +15,49 @@ describe('Configuration Parser', function()
 
   describe('.decode', function()
     it('ignores empty string', function()
-      assert.same(nil, _M.decode(''))
+      assert.is_nil(_M.decode(''))
+    end)
+
+    it('decodes nil as nil', function()
+      assert.is_nil(_M.decode(nil))
     end)
-  end)
 
-  describe('.encode', function()
-    it('encodes to json by default', function()
+    it('when given a table returns the same table', function()
       local t = { a = 1, b = 2 }
-      assert.same('{"a":1,"b":2}', _M.encode(t))
+      assert.same(t, _M.decode(t))
     end)
 
-    it('does not do double encoding', function()
-      local str = '{"a":1,"b":2}'
-      assert.same(str, _M.encode(str))
+    describe('when a decoder is not specified', function()
+      it('uses cjson', function()
+        local contents = '{"a":1,"b":2}'
+        assert.same(cjson.decode(contents), _M.decode(contents))
+      end)
+
+      it('returns nil and an error when cjson fails to decode', function()
+        local contents = '{"a:1}' --malformed
+        local res, err = _M.decode(contents)
+        assert.is_nil(res)
+        assert.not_nil(err)
+      end)
     end)
 
-    it('encodes nil to null', function()
-      assert.same('null', _M.encode(nil))
+    describe('when a decoder is specified', function()
+      local custom_decoder = {
+        decode = function(contents)
+          return (contents == 'err' and error('oh no')) or contents
+        end
+      }
+
+      it('uses the given decoder instead of cjson', function()
+        assert.equal(custom_decoder.decode('a'),
+                     _M.decode('a', custom_decoder))
+      end)
+
+      it('returns nil and an error when the given decoder fails', function()
+        local res, err = _M.decode('err', custom_decoder)
+        assert.is_nil(res)
+        assert.not_nil(err)
+      end)
     end)
   end)
 end)