3 files changed, 12 insertions, 11 deletions

diff --git a/spec/dir_spec.lua b/spec/dir_spec.lua
index 04e26b57..27966777 100644
--- a/spec/dir_spec.lua
+++ b/spec/dir_spec.lua
@@ -12,8 +12,19 @@ describe("Luarocks dir test #unit", function()
          assert.truthy(dir.is_basic_protocol("https"))
          assert.truthy(dir.is_basic_protocol("ftp"))
          assert.truthy(dir.is_basic_protocol("file"))
-         assert.falsy(dir.is_basic_protocol("file", true))
+         assert.falsy(dir.is_basic_protocol("git"))
+         assert.falsy(dir.is_basic_protocol("git+https"))
          assert.falsy(dir.is_basic_protocol("invalid"))
       end)
    end)
+
+   describe("dir.deduce_base_dir", function()
+      assert.are.same("v0.3", dir.deduce_base_dir("https://example.com/hishamhm/lua-compat-5.2/archive/v0.3.zip"))
+      assert.are.same("lua-compat-5.2", dir.deduce_base_dir("https://example.com/hishamhm/lua-compat-5.2.zip"))
+      assert.are.same("lua-compat-5.2", dir.deduce_base_dir("https://example.com/hishamhm/lua-compat-5.2.tar.gz"))
+      assert.are.same("lua-compat-5.2", dir.deduce_base_dir("https://example.com/hishamhm/lua-compat-5.2.tar.bz2"))
+      assert.are.same("parser.moon", dir.deduce_base_dir("git://example.com/Cirru/parser.moon"))
+      assert.are.same("v0.3", dir.deduce_base_dir("https://example.com/hishamhm/lua-compat-5.2/archive/v0.3"))
+   end)
+
 end)
diff --git a/spec/fetch_spec.lua b/spec/fetch_spec.lua
index c02c5736..aa107970 100644
--- a/spec/fetch_spec.lua
+++ b/spec/fetch_spec.lua
@@ -208,15 +208,6 @@ describe("Luarocks fetch test #unit", function()
       end)
    end)
 
-   describe("fetch.url_to_base_dir", function()
-      assert.are.same("v0.3", fetch.url_to_base_dir("https://example.com/hishamhm/lua-compat-5.2/archive/v0.3.zip"))
-      assert.are.same("lua-compat-5.2", fetch.url_to_base_dir("https://example.com/hishamhm/lua-compat-5.2.zip"))
-      assert.are.same("lua-compat-5.2", fetch.url_to_base_dir("https://example.com/hishamhm/lua-compat-5.2.tar.gz"))
-      assert.are.same("lua-compat-5.2", fetch.url_to_base_dir("https://example.com/hishamhm/lua-compat-5.2.tar.bz2"))
-      assert.are.same("parser.moon", fetch.url_to_base_dir("git://example.com/Cirru/parser.moon"))
-      assert.are.same("v0.3", fetch.url_to_base_dir("https://example.com/hishamhm/lua-compat-5.2/archive/v0.3"))
-   end)
-   
    describe("fetch.load_local_rockspec", function()
       it("returns a table representing the rockspec from the given file skipping some checks if the quick argument is enabled", function()
          local rockspec = fetch.load_local_rockspec(testing_paths.fixtures_dir .. "/a_rock-1.0-1.rockspec", true)
diff --git a/spec/util_spec.lua b/spec/util_spec.lua
index 28f99550..3bb97a5b 100644
--- a/spec/util_spec.lua
+++ b/spec/util_spec.lua
@@ -2,7 +2,6 @@ local test_env = require("spec.util.test_env")
 local lfs = require("lfs")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
-local env_variables = test_env.env_variables
 
 describe("Basic tests #integration", function()