From 70501802428cd4a662dc626241258fde950cab16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@dashbit.co>
Date: Mon, 21 Feb 2022 08:08:24 +0100
Subject: [PATCH] Resolve paths instead of raising

---
 lib/livebook/file_system/file.ex        |  8 +-------
 test/livebook/file_system/file_test.exs | 18 +++++++-----------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/lib/livebook/file_system/file.ex b/lib/livebook/file_system/file.ex
index cfc270339..0be8f9b55 100644
--- a/lib/livebook/file_system/file.ex
+++ b/lib/livebook/file_system/file.ex
@@ -29,13 +29,7 @@ defmodule Livebook.FileSystem.File do
 
     path =
       if path do
-        resolved_path = FileSystem.resolve_path(file_system, default_path, path)
-
-        unless path == resolved_path do
-          raise ArgumentError, "expected an expanded absolute path, got: #{inspect(path)}"
-        end
-
-        path
+        FileSystem.resolve_path(file_system, default_path, path)
       else
         default_path
       end
diff --git a/test/livebook/file_system/file_test.exs b/test/livebook/file_system/file_test.exs
index 4da94e0b5..a34cec516 100644
--- a/test/livebook/file_system/file_test.exs
+++ b/test/livebook/file_system/file_test.exs
@@ -1,4 +1,4 @@
-defmodule Livebook.FileSystem.FileTest do
+  defmodule Livebook.FileSystem.FileTest do
   use ExUnit.Case, async: true
 
   import Livebook.TestHelpers
@@ -6,22 +6,18 @@ defmodule Livebook.FileSystem.FileTest do
   alias Livebook.FileSystem
 
   describe "new/2" do
-    test "raises an error when a relative path is given" do
+    test "resolves relative paths" do
       file_system = FileSystem.Local.new()
 
-      assert_raise ArgumentError, ~s{expected an expanded absolute path, got: "file.txt"}, fn ->
-        FileSystem.File.new(file_system, "file.txt")
-      end
+      assert FileSystem.File.new(file_system, "file.txt").path ==
+               Path.join(File.cwd!(), "file.txt")
     end
 
-    test "raises an error when a unexpanded path is given" do
+    test "resolves unexpanded paths" do
       file_system = FileSystem.Local.new()
 
-      assert_raise ArgumentError,
-                   ~s{expected an expanded absolute path, got: "/dir/nested/../file.txt"},
-                   fn ->
-                     FileSystem.File.new(file_system, "/dir/nested/../file.txt")
-                   end
+      assert FileSystem.File.new(file_system, "/dir/nested/../file.txt").path ==
+               Path.expand("/dir/file.txt")
     end
 
     test "uses default file system path if non is given" do