tests(helpers): rename directory details to internal

spec/config.ld

@@ -2,7 +2,7 @@ project='Kong test helpers'
 title='Kong test framework'
 description='Test helper functions for Kong (integration) testing'
 format='markdown'
-file={'./helpers.lua','./helpers','./details'}
+file={'./helpers.lua','./helpers','./internal'}
 dir='docs'
 readme='README.md'
 sort=true

spec/helpers.lua

@@ -25,24 +25,24 @@ local luassert = require "luassert.assert"
 local uuid = require("kong.tools.uuid").uuid
 
 
-local reload_module = require("spec.details.module").reload
+local reload_module = require("spec.internal.module").reload
 
 
 log.set_lvl(log.levels.quiet) -- disable stdout logs in tests
 
 
 -- reload some modules when env or _G changes
-local CONSTANTS = reload_module("spec.details.constants")
-local conf = reload_module("spec.details.conf")
-local shell = reload_module("spec.details.shell")
-local misc = reload_module("spec.details.misc")
-local DB = reload_module("spec.details.db")
-local grpc = reload_module("spec.details.grpc")
-local dns_mock = reload_module("spec.details.dns")
-local asserts = reload_module("spec.details.asserts") -- luacheck: ignore
-local pid = reload_module("spec.details.pid")
-local cmd = reload_module("spec.details.cmd")
-local server = reload_module("spec.details.server")
+local CONSTANTS = reload_module("spec.internal.constants")
+local conf = reload_module("spec.internal.conf")
+local shell = reload_module("spec.internal.shell")
+local misc = reload_module("spec.internal.misc")
+local DB = reload_module("spec.internal.db")
+local grpc = reload_module("spec.internal.grpc")
+local dns_mock = reload_module("spec.internal.dns")
+local asserts = reload_module("spec.internal.asserts") -- luacheck: ignore
+local pid = reload_module("spec.internal.pid")
+local cmd = reload_module("spec.internal.cmd")
+local server = reload_module("spec.internal.server")
 
 
 local exec = shell.exec

spec/details/asserts.lua → spec/internal/asserts.lua

@@ -14,8 +14,8 @@ local colors = require("ansicolors")
 local luassert = require("luassert.assert")
 
 
-local conf = require("spec.details.conf")
-local misc = require("spec.details.misc")
+local conf = require("spec.internal.conf")
+local misc = require("spec.internal.misc")
 
 
 local strip = require("kong.tools.string").strip

spec/details/cmd.lua → spec/internal/cmd.lua

@@ -18,12 +18,12 @@ local kill = require("kong.cmd.utils.kill")
 local prefix_handler = require("kong.cmd.utils.prefix_handler")
 
 
-local CONSTANTS = require("spec.details.constants")
-local conf = require("spec.details.conf")
-local shell = require("spec.details.shell")
-local DB = require("spec.details.db")
-local pid = require("spec.details.pid")
-local dns_mock = require("spec.details.dns")
+local CONSTANTS = require("spec.internal.constants")
+local conf = require("spec.internal.conf")
+local shell = require("spec.internal.shell")
+local DB = require("spec.internal.db")
+local pid = require("spec.internal.pid")
+local dns_mock = require("spec.internal.dns")
 
 
 -- initialized in start_kong()

spec/details/conf.lua → spec/internal/conf.lua

@@ -1,4 +1,4 @@
-local CONSTANTS = require("spec.details.constants")
+local CONSTANTS = require("spec.internal.constants")
 local conf_loader = require("kong.conf_loader")
 
 

spec/details/db.lua → spec/internal/db.lua

@@ -24,7 +24,7 @@ local PLUGINS_LIST
 -- Add to package path so dao helpers can insert custom plugins
 -- (while running from the busted environment)
 do
-  local CONSTANTS = require("spec.details.constants")
+  local CONSTANTS = require("spec.internal.constants")
 
   local paths = {}
   table.insert(paths, os.getenv("KONG_LUA_PACKAGE_PATH"))
@@ -39,7 +39,7 @@ end
 -- Conf and DAO
 -- ------------
 
-local conf = require("spec.details.conf")
+local conf = require("spec.internal.conf")
 
 
 _G.kong = kong_global.new()

spec/details/grpc.lua → spec/internal/grpc.lua

@@ -3,7 +3,7 @@ local shell = require("resty.shell")
 local resty_signal = require("resty.signal")
 
 
-local CONSTANTS = require("spec.details.constants")
+local CONSTANTS = require("spec.internal.constants")
 
 
 local function isnewer(path_a, path_b)

spec/details/misc.lua → spec/internal/misc.lua

@@ -13,10 +13,10 @@ local ffi = require("ffi")
 local pl_path = require("pl.path")
 local pkey = require("resty.openssl.pkey")
 local nginx_signals = require("kong.cmd.utils.nginx_signals")
-local shell = require("spec.details.shell")
+local shell = require("spec.internal.shell")
 
 
-local CONSTANTS = require("spec.details.constants")
+local CONSTANTS = require("spec.internal.constants")
 
 
 ffi.cdef [[

spec/details/pid.lua → spec/internal/pid.lua

@@ -9,7 +9,7 @@
 local shell = require("resty.shell")
 
 
-local CONSTANTS = require("spec.details.constants")
+local CONSTANTS = require("spec.internal.constants")
 
 
 -- Reads the pid from a pid file and returns it, or nil + err

spec/details/server.lua → spec/internal/server.lua

@@ -6,7 +6,7 @@
 -- @module spec.helpers
 
 
-local CONSTANTS = require("spec.details.constants")
+local CONSTANTS = require("spec.internal.constants")
 
 
 ---
@@ -63,7 +63,7 @@ local function tcp_server(port, opts)
         end
 
         if opts.tls and handshake_done then
-          local ssl = require "spec.details.ssl"
+          local ssl = require "spec.internal.ssl"
 
           local params = {
             mode = "server",
@@ -405,8 +405,8 @@ end
 
 local is_echo_server_ready, get_echo_server_received_data, echo_server_reset
 do
-  local shell = require("spec.details.shell")
-  local cmd = require("spec.details.cmd")
+  local shell = require("spec.internal.shell")
+  local cmd = require("spec.internal.cmd")
 
   -- Message id is maintained within echo server context and not
   -- needed for echo server user.

spec/details/shell.lua → spec/internal/shell.lua

@@ -10,8 +10,8 @@ local shell = require("resty.shell")
 local strip = require("kong.tools.string").strip
 
 
-local CONSTANTS = require("spec.details.constants")
-local conf = require("spec.details.conf")
+local CONSTANTS = require("spec.internal.constants")
+local conf = require("spec.internal.conf")
 
 
 ----------------