mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2024-11-16 23:04:53 +00:00
Use the correct import path in import.lua
Backported from 1.19.3
This commit is contained in:
parent
1d3ecb551d
commit
5e701f73d6
@ -18,7 +18,7 @@ if #files == 0 then
|
||||
return
|
||||
end
|
||||
|
||||
package.path = package.path .. "/rom/modules/internal/?.lua"
|
||||
package.path = package.path .. ";/rom/modules/internal/?.lua"
|
||||
|
||||
local ok, err = require("cc.import")(files)
|
||||
if not ok and err then printError(err) end
|
||||
|
36
src/test/resources/test-rom/spec/programs/import_spec.lua
Normal file
36
src/test/resources/test-rom/spec/programs/import_spec.lua
Normal file
@ -0,0 +1,36 @@
|
||||
local with_window = require "test_helpers".with_window
|
||||
|
||||
describe("The import program", function()
|
||||
local function create_file(name, contents)
|
||||
local did_read = false
|
||||
return {
|
||||
getName = function() return name end,
|
||||
read = function()
|
||||
if did_read then return end
|
||||
did_read = true
|
||||
return contents
|
||||
end,
|
||||
close = function() end,
|
||||
}
|
||||
end
|
||||
local function create_files(files) return { getFiles = function() return files end } end
|
||||
|
||||
it("uploads files", function()
|
||||
fs.delete("transfer.txt")
|
||||
|
||||
with_window(32, 5, function()
|
||||
local queue = {
|
||||
{ "import" },
|
||||
{ "file_transfer", create_files { create_file("transfer.txt", "empty file") } },
|
||||
}
|
||||
local co = coroutine.create(shell.run)
|
||||
for _, event in pairs(queue) do assert(coroutine.resume(co, table.unpack(event))) end
|
||||
end)
|
||||
|
||||
local handle = fs.open("transfer.txt", "rb")
|
||||
local contents = handle.readAll()
|
||||
handle.close()
|
||||
|
||||
expect(contents):eq("empty file")
|
||||
end)
|
||||
end)
|
@ -120,7 +120,7 @@ describe("The shell", function()
|
||||
local function create_files(files) return { getFiles = function() return files end } end
|
||||
|
||||
it("suspends the read prompt", function()
|
||||
fs.delete("tmp.txt")
|
||||
fs.delete("transfer.txt")
|
||||
|
||||
local win = with_window(32, 5, function()
|
||||
local queue = {
|
||||
|
Loading…
Reference in New Issue
Block a user