pleroma

commit: 906c3ab308baee9f439af2a00c966939e7c8338b
parent b2640f0dc46f2693df58b3330310ab25fdd30a2b
Author: lain <lain@soykaf.club>
Date:   Sun,  2 Mar 2025 21:11:49 +0000

Merge branch 'fix-safezip' into 'develop'

Safezip: Fix test (issue was a difference in file ordering between otp26 and otp27)

See merge request pleroma/pleroma!4336
Diffstat:
M
test/pleroma/safe_zip_test.exs
7
++-----

1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/test/pleroma/safe_zip_test.exs b/test/pleroma/safe_zip_test.exs
@@ -179,7 +179,6 @@ defmodule Pleroma.SafeZipTest do
   end
 
   describe "unzip_file/3" do
-    @tag :skip
     test "extracts files from a zip archive" do
       archive_path = Path.join(@fixtures_dir, "emojis.zip")
 
@@ -194,7 +193,7 @@ defmodule Pleroma.SafeZipTest do
       first_file = List.first(files)
 
       # Simply check that the file exists in the tmp directory
-      assert File.exists?(Path.join(@tmp_dir, Path.basename(first_file)))
+      assert File.exists?(first_file)
     end
 
     test "extracts specific files from a zip archive" do
@@ -251,7 +250,6 @@ defmodule Pleroma.SafeZipTest do
   end
 
   describe "unzip_data/3" do
-    @tag :skip
     test "extracts files from zip data" do
       archive_path = Path.join(@fixtures_dir, "emojis.zip")
       archive_data = File.read!(archive_path)
@@ -267,10 +265,9 @@ defmodule Pleroma.SafeZipTest do
       first_file = List.first(files)
 
       # Simply check that the file exists in the tmp directory
-      assert File.exists?(Path.join(@tmp_dir, Path.basename(first_file)))
+      assert File.exists?(first_file)
     end
 
-    @tag :skip
     test "extracts specific files from zip data" do
       archive_path = Path.join(@fixtures_dir, "emojis.zip")
       archive_data = File.read!(archive_path)