Skip to content

Commit

Permalink
style: cleaning specs and spec_helpers
Browse files Browse the repository at this point in the history
  • Loading branch information
thibaultcha committed Mar 17, 2015
1 parent e13fa6f commit a5e1860
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bin/kong
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function show_help {
}

function show_version {
printf "Kong version: 0.0.1beta-1\n"
printf "Version: 0.0.1beta-1\n"
}

function start {
Expand Down
2 changes: 2 additions & 0 deletions spec/integration/server/server_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ end
describe("#server-cli", function()

describe("CLI", function()

it("should return the right version", function()
local result, exit_code = spec_helper.os_execute(spec_helper.KONG_BIN.." -v")
assert.are.same("Kong version: "..constants.VERSION, stringy.strip(result))
end)

end)

describe("Plugins Check", function()
Expand Down
5 changes: 2 additions & 3 deletions spec/spec_helpers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ local configuration, dao_factory = utils.load_configuration_and_dao(TEST_CONF_FI
local migrations = Migrations(dao_factory)
local faker = Faker(dao_factory)

local _M = {
KONG_BIN = KONG_BIN
}
local _M = {}

_M.KONG_BIN = KONG_BIN
_M.CONF_FILE = TEST_CONF_FILE
_M.PROXY_URL = PROXY_URL
_M.API_URL = API_URL
Expand Down

0 comments on commit a5e1860

Please sign in to comment.