merging with master and fixing tests

Kong · May 20, 2015 · af31b0e · af31b0e
1 parent 422cc8d
commit af31b0e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/kong.yml b/kong.yml
@@ -7,9 +7,9 @@ plugins_available:
   - tcplog
   - udplog
   - filelog
+  - httplog
   - cors
   - request_transformer
-  - httplog
 
 ## The Kong working directory
 ## (Make sure you have read and write permissions)

diff --git a/spec/integration/cli/start_spec.lua b/spec/integration/cli/start_spec.lua
@@ -85,15 +85,15 @@ describe("CLI", function()
         }
       }
 
-      replace_conf_property("plugins_available", {"ssl", "keyauth", "basicauth", "tcplog", "udplog", "filelog", "request_transformer"})
+      replace_conf_property("plugins_available", {"ssl", "keyauth", "basicauth", "tcplog", "udplog", "filelog", "httplog", "request_transformer"})
 
       assert.has_error(function()
         spec_helper.start_kong(SERVER_CONF, true)
       end, "You are using a plugin that has not been enabled in the configuration: ratelimiting")
     end)
 
     it("should work the used plugins are enabled", function()
-      replace_conf_property("plugins_available", {"ssl", "keyauth", "basicauth", "tcplog", "udplog", "filelog", "request_transformer", "ratelimiting", "cors"})
+      replace_conf_property("plugins_available", {"ssl", "keyauth", "basicauth", "tcplog", "udplog", "filelog", "httplog", "request_transformer", "ratelimiting", "cors"})
 
       local _, exit_code = spec_helper.start_kong(SERVER_CONF, true)
       assert.are.same(0, exit_code)

diff --git a/spec/unit/statics_spec.lua b/spec/unit/statics_spec.lua
@@ -47,9 +47,9 @@ plugins_available:
   - tcplog
   - udplog
   - filelog
+  - httplog
   - cors
   - request_transformer
-  - httplog
 
 ## The Kong working directory
 ## (Make sure you have read and write permissions)
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,9 +7,9 @@ plugins_available: @@
       - tcplog
       - udplog
       - filelog
+      - httplog
       - cors
       - request_transformer
-      - httplog
     ## The Kong working directory
     ## (Make sure you have read and write permissions)
@@ Expand Down @@