Merge pull request #588 from robooo/new-tests

New tests

5 files changed, 28 insertions, 15 deletions

diff --git a/spec/build_spec.lua b/spec/build_spec.lua
index 1ce99089..682c6dcf 100644
--- a/spec/build_spec.lua
+++ b/spec/build_spec.lua
@@ -169,12 +169,10 @@ describe("LuaRocks build tests #blackbox #b_build", function()
       end)
 
       it("LuaRocks build missing external", function()
-         assert.is_true(test_env.need_luasocket())
          assert.is_false(run.luarocks_bool("build " .. testing_paths.testing_dir .. "/testfiles/missing_external-0.1-1.rockspec INEXISTENT_INCDIR=\"/invalid/dir\""))
       end)
       
       it("LuaRocks build invalid patch", function()
-         assert.is_true(test_env.need_luasocket())
          assert.is_false(run.luarocks_bool("build " .. testing_paths.testing_dir .. "/testfiles/invalid_patch-0.1-1.rockspec"))
       end)
    end)
diff --git a/spec/install_spec.lua b/spec/install_spec.lua
index 0e406e22..0b2ffb53 100644
--- a/spec/install_spec.lua
+++ b/spec/install_spec.lua
@@ -83,23 +83,24 @@ describe("LuaRocks install tests #blackbox #b_install", function()
       end)
       
       it("LuaRocks install only-deps of luasocket packed rock", function()
-         assert.is_true(test_env.need_luasocket())
-         local output = run.luarocks("install --only-deps " .. testing_paths.testing_cache .. "/luasocket-3.0rc1-1." .. test_env.platform .. ".rock")
+         assert.is_true(run.luarocks_bool("build --pack-binary-rock luasocket"))
+         local output = run.luarocks("install --only-deps " .. "luasocket-3.0rc1-1." .. test_env.platform .. ".rock")
          assert.are.same(output, "Successfully installed dependencies for luasocket 3.0rc1-1")
+         assert.is_true(os.remove("luasocket-3.0rc1-1." .. test_env.platform .. ".rock"))
+      end)
+
+      it("LuaRocks install reinstall", function()
+         assert.is_true(run.luarocks_bool("build --pack-binary-rock luasocket"))
+         assert.is_true(run.luarocks_bool("install " .. "luasocket-3.0rc1-1." .. test_env.platform .. ".rock"))
+         assert.is_true(run.luarocks_bool("install --deps-mode=none " .. "luasocket-3.0rc1-1." .. test_env.platform .. ".rock"))
+         assert.is_true(os.remove("luasocket-3.0rc1-1." .. test_env.platform .. ".rock"))
       end)
 
       it("LuaRocks install binary rock of cprint", function()
-         assert.is_true(test_env.need_luasocket())
          assert.is_true(run.luarocks_bool("build --pack-binary-rock cprint"))
          assert.is_true(run.luarocks_bool("install cprint-0.1-2." .. test_env.platform .. ".rock"))
          assert.is_true(os.remove("cprint-0.1-2." .. test_env.platform .. ".rock"))
-      end)
-
-      it("LuaRocks install reinstall", function()
-         assert.is_true(test_env.need_luasocket())
-         assert.is_true(run.luarocks_bool("install " .. testing_paths.testing_cache .. "/luasocket-3.0rc1-1." .. test_env.platform .. ".rock"))
-         assert.is_true(run.luarocks_bool("install --deps-mode=none " .. testing_paths.testing_cache .. "/luasocket-3.0rc1-1." .. test_env.platform .. ".rock"))
-      end)
+      end)     
    end)
 
    describe("New install functionality based on pull request 552", function()
diff --git a/spec/new_version_spec.lua b/spec/new_version_spec.lua
index 4e4d5d27..c4185b1d 100644
--- a/spec/new_version_spec.lua
+++ b/spec/new_version_spec.lua
@@ -30,11 +30,19 @@ describe("LuaRocks new_version tests #blackbox #b_new_version", function()
       it("LuaRocks new version invalid url", function()
          assert.is_true(run.luarocks_bool("download --rockspec abelhas 1.0"))
          assert.is_true(run.luarocks_bool("new_version abelhas-1.0-1.rockspec 1.1 http://luainvalid"))
+         assert.is.truthy(lfs.attributes("abelhas-1.1-1.rockspec"))
          test_env.remove_files(lfs.currentdir(), "abelhas--")
       end)
    end)
 
    describe("LuaRocks new_version more complex tests", function()
+      it("LuaRocks new version with remote spec", function()
+         assert.is_true(run.luarocks_bool("new_version https://luarocks.org/manifests/luarocks/luasocket-2.0.2-6.rockspec"))
+         assert.is.truthy(lfs.attributes("luasocket-2.0.2-6.rockspec"))
+         assert.is.truthy(lfs.attributes("luasocket-2.0.2-7.rockspec"))
+         test_env.remove_files(lfs.currentdir(), "luasocket--")
+      end)
+
       it("LuaRocks new_version of luacov", function()
          assert.is_true(run.luarocks_bool("download --rockspec luacov 0.11.0"))
          assert.is_true(run.luarocks_bool("new_version luacov-0.11.0-1.rockspec 0.2"))
diff --git a/spec/pack_spec.lua b/spec/pack_spec.lua
index 416184a8..aa827682 100644
--- a/spec/pack_spec.lua
+++ b/spec/pack_spec.lua
@@ -1,6 +1,7 @@
 local test_env = require("test/test_environment")
 local lfs = require("lfs")
 local run = test_env.run
+local testing_paths = test_env.testing_paths
 
 test_env.unload_luarocks()
 
@@ -21,6 +22,10 @@ describe("LuaRocks pack tests #blackbox #b_pack", function()
       assert.is_true(run.luarocks_bool("pack luacov"))
       assert.is_true(test_env.remove_files(lfs.currentdir(), "luacov-"))
    end)
+
+   it("LuaRocks pack invalid rockspec", function()
+      assert.is_false(run.luarocks_bool("pack " .. testing_paths.testing_dir .. "/testfiles/invaild_validate-args-1.5.4-1.rockspec"))
+   end)
    
    it("LuaRocks pack src", function()
       assert.is_true(run.luarocks_bool("install luasec"))
diff --git a/spec/remove_spec.lua b/spec/remove_spec.lua
index 41c6348a..c7f83b95 100644
--- a/spec/remove_spec.lua
+++ b/spec/remove_spec.lua
@@ -44,8 +44,11 @@ describe("LuaRocks remove tests #blackbox #b_remove", function()
    end)
 
    describe("LuaRocks remove more complex tests", function()
+      before_each(function()
+         assert.is_true(test_env.need_rock("luasocket"))
+      end)
+
       it("LuaRocks remove fail, break dependencies", function()
-         assert.is_true(test_env.need_luasocket())
          assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasocket"))
          assert.is_true(run.luarocks_bool("build lualogging"))
 
@@ -54,7 +57,6 @@ describe("LuaRocks remove tests #blackbox #b_remove", function()
       end)
       
       it("LuaRocks remove force", function()
-         assert.is_true(test_env.need_luasocket())
          assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasocket"))
          assert.is_true(run.luarocks_bool("build lualogging"))
 
@@ -64,7 +66,6 @@ describe("LuaRocks remove tests #blackbox #b_remove", function()
       end)
       
       it("LuaRocks remove force fast", function()
-         assert.is_true(test_env.need_luasocket())
          assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasocket"))
          assert.is_true(run.luarocks_bool("build lualogging"))