Merge pull request #240 from binaryseed/fix-valid-check

Fix schema valid check
absinthe-graphql · Dec 7, 2020 · dc234e1 · dc234e1
2 parents b17dc11 + fc715ee
commit dc234e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/absinthe/plug.ex b/lib/absinthe/plug.ex
@@ -239,9 +239,13 @@ defmodule Absinthe.Plug do
   end
 
   defp valid_schema_module?(module) do
-    is_atom(module) &&
-      Code.ensure_loaded?(module) &&
-      Absinthe.Schema in Keyword.get(module.__info__(:attributes), :behaviour, [])
+    with true <- is_atom(module),
+         {:module, _} <- Code.ensure_compiled(module),
+         true <- Absinthe.Schema in Keyword.get(module.__info__(:attributes), :behaviour, []) do
+      true
+    else
+      _ -> false
+    end
   end
 
   @doc false

diff --git a/test/lib/absinthe/plug_test.exs b/test/lib/absinthe/plug_test.exs
@@ -584,7 +584,7 @@ defmodule Absinthe.PlugTest do
     end
 
     assert_raise ArgumentError, @message_matcher, fn ->
-      Absinthe.Plug.init(schema: "not even a module")
+      Absinthe.Plug.init(schema: "not even an atom")
     end
   end
-Original file line number
+Diff line change
@@ Expand Up / @@ -584,7 +584,7 @@ defmodule Absinthe.PlugTest do @@
         end
         assert_raise ArgumentError, @message_matcher, fn ->
-          Absinthe.Plug.init(schema: "not even a module")
+          Absinthe.Plug.init(schema: "not even an atom")
         end
       end
@@ Expand Down @@