File.ls & ls! tests now cover non-existent directory situation

Author: n1rvana

lib/elixir/test/elixir/file_test.exs

@@ -397,26 +397,28 @@ defmodule FileTest do
     end
   end
 
-  defmodule ListDir do
-
-    test :ls do
-      {code, value} = File.ls(fixture_path)
-      assert code == :ok
-      refute code == :error
-      assert is_list value
-      assert 0 < Enum.count(value) 
-      assert List.member?(value, "code_sample.exs")
-      assert List.member?(value, "file.txt")
-    end
-  
-   test :ls2 do
-      {code, value} = File.ls!(fixture_path)
-      assert code == :ok
-      refute code == :error
-      assert is_list value
-      assert 0 < Enum.count(value) 
-      assert List.member?(value, "code_sample.exs")
-      assert List.member?(value, "file.txt")
+  test :ls do
+    {code, value} = File.ls(fixture_path)
+    assert code == :ok
+    refute code == :error
+    assert is_list value
+    assert 0 < Enum.count(value) 
+    assert List.member?(value, "code_sample.exs")
+    assert List.member?(value, "file.txt")
+    {code2, reason} = File.ls(fixture_path("non-existent-subdirectory"))
+    refute code2 == :ok
+    assert code2 == :error
+    assert reason != nil
+  end
+
+  test :ls2 do
+    value = File.ls!(fixture_path)
+    assert is_list value
+    assert 0 < Enum.count(value) 
+    assert List.member?(value, "code_sample.exs")
+    assert List.member?(value, "file.txt")
+    assert_raise File.Error, fn ->
+        File.ls!(fixture_path("non-existent-subdirectory"))
     end
   end