New upload tests with mock-server

3 files changed, 132 insertions, 1 deletions

diff --git a/spec/upload_spec.lua b/spec/upload_spec.lua
index c10ef0e9..ee397ed4 100644
--- a/spec/upload_spec.lua
+++ b/spec/upload_spec.lua
@@ -1,10 +1,37 @@
 local test_env = require("test/test_environment")
 local run = test_env.run
+local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
 
 local extra_rocks = {
-   "/lua-cjson-2.1.0-1.src.rock"
+   "/lua-cjson-2.1.0-1.src.rock",
+   
+   "/copas-2.0.1-1.src.rock",
+   "/coxpcall-1.16.0-1.src.rock",
+   "/dkjson-2.5-2.src.rock",
+   "/luafilesystem-1.6.3-1.src.rock",
+   "/luasec-0.6-1.rockspec",
+   "/luasocket-3.0rc1-1.src.rock",
+   "/luasocket-3.0rc1-1.rockspec",
+   "/restserver-0.1-1.src.rock",
+   "/restserver-xavante-0.2-1.src.rock",
+   "/rings-1.3.0-1.src.rock",
+   "/wsapi-1.6.1-1.src.rock",
+   "/wsapi-xavante-1.6.1-1.src.rock",
+   "/xavante-2.4.0-1.src.rock"
+-- "copas    2.0.1-1",
+-- coxpcall    1.16.0-1
+-- dkjson    2.5-2
+-- luafilesystem    1.6.3-2
+-- luasec    0.6-1
+-- luasocket    3.0rc1-2
+-- restserver    0.1-1
+-- restserver-xavante    0.2-1
+-- rings    1.3.0-1
+-- wsapi    1.6.1-1
+-- wsapi-xavante    1.6.1-1
+-- xavante    2.4.0-1
 }
 
 describe("LuaRocks upload tests #blackbox #b_upload", function()
@@ -34,6 +61,24 @@ describe("LuaRocks upload tests #blackbox #b_upload", function()
       assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --force luacov-0.11.0-1.rockspec"))
       assert.is_true(run.luarocks_bool("install lua-cjson"))
    end)
+
+   describe("LuaRocks upload tests with Xavante server", function()
+      before_each(function()
+         assert.is_true(test_env.need_rock("restserver-xavante"))
+         os.execute(testing_paths.lua .. " " .. testing_paths.testing_dir .. "/mock-server.lua &")
+      end)
+      
+      after_each(function()
+         os.execute("curl localhost:8080/shutdown")
+      end)
+
+      it("LuaRocks upload rockspec with api-key", function()
+         assert.is_true(run.luarocks_bool("upload " .. testing_paths.testing_server .. "/luasocket-3.0rc1-1.rockspec --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"}))
+      end)
+      it("LuaRocks upload rockspec with api-key and skip-pack", function()
+         assert.is_true(run.luarocks_bool("upload --skip-pack " .. testing_paths.testing_server .. "/luasocket-3.0rc1-1.rockspec --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"}))
+      end)
+   end)
 end)
 
 
diff --git a/test/luarocks_site.lua b/test/luarocks_site.lua
new file mode 100644
index 00000000..cfa77dca
--- /dev/null
+++ b/test/luarocks_site.lua
@@ -0,0 +1,6 @@
+-- Config file of LuaRocks site for tests
+upload = {
+   server = "http://localhost:8080",
+   tool_version = "1.0.0",
+   api_version = "1",
+}
\ No newline at end of file
diff --git a/test/mock-server.lua b/test/mock-server.lua
new file mode 100644
index 00000000..797e2bc5
--- /dev/null
+++ b/test/mock-server.lua
@@ -0,0 +1,80 @@
+#!/usr/bin/env lua
+
+--- A simple LuaRocks mock-server for testing.
+local restserver = require("restserver")
+local server = restserver:new():port(8080)
+
+server:add_resource("api/tool_version", {
+   {
+      method = "GET",
+      path = "/",
+      produces = "application/json",
+      handler = function(query)
+         local json = { version = query.current }
+         return restserver.response():status(200):entity(json)
+      end
+   }
+})
+
+server:add_resource("api/1/{id:[0-9]+}/status", {
+   {
+      method = "GET",
+      path = "/",
+      produces = "application/json",
+      handler = function(query)
+         local json = { user_id = "123", created_at = "29.1.1993" }
+         return restserver.response():status(200):entity(json)
+      end
+   }
+})
+
+server:add_resource("/api/1/{id:[0-9]+}/check_rockspec", {
+   {
+      method = "GET",
+      path = "/",
+      produces = "application/json",
+      handler = function(query)
+         local json = {}
+         return restserver.response():status(200):entity(json)
+      end
+   }
+})
+
+server:add_resource("/api/1/{id:[0-9]+}/upload", {
+   {
+      method = "POST",
+      path = "/",
+      produces = "application/json",
+      handler = function(query)
+         local json = {module = "luasocket", version = {id = "1.0"}, module_url = "http://localhost/luasocket", manifests = "root", is_new = "is_new"}
+         return restserver.response():status(200):entity(json)
+      end
+   }
+})
+
+server:add_resource("/api/1/{id:[0-9]+}/upload_rock/{id:[0-9]+}", {
+   {
+      method = "POST",
+      path = "/",
+      produces = "application/json",
+      handler = function(query)
+         local json = {"rock","module_url"}
+         return restserver.response():status(200):entity(json)
+      end
+   }
+})
+
+-- SHUTDOWN this mock-server
+server:add_resource("/shutdown", {
+   {
+      method = "GET",
+      path = "/",
+      handler = function(query)
+         os.exit()
+         return restserver.response():status(200):entity()
+      end
+   }
+})
+
+-- This loads the restserver.xavante plugin
+server:enable("restserver.xavante"):start()
\ No newline at end of file