1 files changed, 2 insertions, 64 deletions

diff --git a/spec/unit/fs_spec.lua b/spec/unit/fs_spec.lua
index aea86af3..7643e9b5 100644
--- a/spec/unit/fs_spec.lua
+++ b/spec/unit/fs_spec.lua
@@ -1,6 +1,5 @@
 local test_env = require("spec.util.test_env")
 
-test_env.unload_luarocks()
 test_env.setup_specs()
 local fs = require("luarocks.fs")
 local path = require("luarocks.path")
@@ -542,7 +541,7 @@ describe("luarocks.fs #unit", function()
          if is_win then
             assert.same(tmpdir, fs.current_dir())
          else
-            assert.same(lfs.attributes(tmpdir).ino, lfs.attributes(fs.current_dir()).ino)
+            assert.same(lfs.attributes(tmpdir).ino, lfs.attributes((fs.current_dir())).ino)
          end
       end)
    end)
@@ -578,7 +577,7 @@ describe("luarocks.fs #unit", function()
          if is_win then
             assert.same(tmpdir, fs.current_dir())
          else
-            assert.same(lfs.attributes(tmpdir).ino, lfs.attributes(lfs.currentdir()).ino)
+            assert.same(lfs.attributes(tmpdir).ino, lfs.attributes(fs.current_dir()).ino)
          end
       end)
 
@@ -1283,67 +1282,6 @@ describe("luarocks.fs #unit", function()
       end)
    end)
 
-   describe("fs.download #mock", function()
-      local tmpfile
-      local tmpdir
-
-      setup(function()
-         test_env.mock_server_init()
-      end)
-
-      teardown(function()
-         test_env.mock_server_done()
-      end)
-
-      after_each(function()
-         if tmpfile then
-            os.remove(tmpfile)
-            tmpfile = nil
-         end
-         if tmpdir then
-            lfs.rmdir(tmpdir)
-            tmpdir = nil
-         end
-      end)
-
-      it("returns true and fetches the url argument into the specified filename", function()
-         tmpfile = get_tmp_path()
-         assert.truthy(fs.download("http://localhost:8080/file/a_rock.lua", tmpfile))
-         local fd = assert(io.open(tmpfile, "r"))
-         local downloadcontent = assert(fd:read("*a"))
-         fd:close()
-         fd = assert(io.open(testing_paths.fixtures_dir .. "/a_rock.lua", "r"))
-         local originalcontent = assert(fd:read("*a"))
-         fd:close()
-         assert.same(downloadcontent, originalcontent)
-      end)
-
-      it("returns true and fetches the url argument into a file whose name matches the basename of the url if the filename argument is not given", function()
-         tmpdir = get_tmp_path()
-         lfs.mkdir(tmpdir)
-         fs.change_dir(tmpdir)
-         assert.truthy(fs.download("http://localhost:8080/file/a_rock.lua"))
-         tmpfile = tmpdir .. "/a_rock.lua"
-         local fd = assert(io.open(tmpfile, "r"))
-         local downloadcontent = assert(fd:read("*a"))
-         fd:close()
-         fd = assert(io.open(testing_paths.fixtures_dir .. "/a_rock.lua", "r"))
-         local originalcontent = assert(fd:read("*a"))
-         fd:close()
-         assert.same(downloadcontent, originalcontent)
-         fs.pop_dir()
-      end)
-
-      it("returns false and does nothing if the url argument contains a nonexistent file", function()
-         tmpfile = get_tmp_path()
-         assert.falsy(fs.download("http://localhost:8080/file/nonexistent", tmpfile))
-      end)
-
-      it("returns false and does nothing if the url argument is invalid", function()
-         assert.falsy(fs.download("invalidurl"))
-      end)
-   end)
-
    describe("fs.zip", function()
       local tmpdir
       local olddir