Use alias and refactor test methods

Author: danschultzer

lib/mix/tasks/phoenix_oauth2_provider.install.ex

@@ -2,6 +2,8 @@ defmodule Mix.Tasks.PhoenixOauth2Provider.Install do
   use Mix.Task
 
   alias PhoenixOauth2Provider.Mix.Utils
+  alias Mix.Tasks.ExOauth2Provider.Install, as: ExOAuth2ProviderInstall
+  alias Mix.{Phoenix, Project}
   require Logger
 
   @shortdoc "Configure the PhoenixOauth2Provider Package"
@@ -160,7 +162,7 @@ defmodule Mix.Tasks.PhoenixOauth2Provider.Install do
   defp install_ex_oauth2_provider(%{provider: true, repo: _repo} = config) do
     config
     |> install_ex_oauth2_provider_task_args()
-    |> Mix.Tasks.ExOauth2Provider.Install.run()
+    |> ExOAuth2ProviderInstall.run()
 
     config
   end
@@ -203,7 +205,7 @@ defmodule Mix.Tasks.PhoenixOauth2Provider.Install do
     source  = "priv/boilerplate"
     mapping = [{:eex, "phoenix_oauth2_provider_web.ex", Utils.web_path("phoenix_oauth2_provider_web.ex")}]
 
-    Mix.Phoenix.copy_from(@apps, source, binding, mapping)
+    Phoenix.copy_from(@apps, source, binding, mapping)
 
     config
   end
@@ -228,7 +230,7 @@ defmodule Mix.Tasks.PhoenixOauth2Provider.Install do
               |> Enum.map(&(elem(&1, 1)))
               |> Enum.map(&({:eex, &1, Utils.web_path("views/phoenix_oauth2_provider/#{&1}")}))
 
-    Mix.Phoenix.copy_from(@apps, source, binding, mapping)
+    Phoenix.copy_from(@apps, source, binding, mapping)
 
     config
   end
@@ -260,7 +262,7 @@ defmodule Mix.Tasks.PhoenixOauth2Provider.Install do
     source  = "priv/boilerplate/templates/#{name}"
     mapping = copy_templates_files(name, file_list)
 
-    Mix.Phoenix.copy_from(@apps, source, binding, mapping)
+    Phoenix.copy_from(@apps, source, binding, mapping)
   end
 
   defp copy_templates_files(name, file_list) do
@@ -287,7 +289,7 @@ defmodule Mix.Tasks.PhoenixOauth2Provider.Install do
               |> Enum.map(&(elem(&1, 1)))
               |> Enum.map(&({:text, &1, Utils.web_path("controllers/phoenix_oauth2_provider/#{&1}")}))
 
-    Mix.Phoenix.copy_from(@apps, source, binding, mapping)
+    Phoenix.copy_from(@apps, source, binding, mapping)
     Enum.each(mapping, &update_controller_file_with_base_module!(&1, base))
 
     config
@@ -379,10 +381,10 @@ defmodule Mix.Tasks.PhoenixOauth2Provider.Install do
     do_config({bin_opts, opts})
   end
   defp do_config({bin_opts, opts}) do
-    binding = Mix.Project.config()
+    binding = Project.config()
               |> Keyword.fetch!(:app)
               |> Atom.to_string()
-              |> Mix.Phoenix.inflect()
+              |> Phoenix.inflect()
 
     base = opts[:module] || binding[:base]
     opts = Keyword.put(opts, :base, base)

lib/mix/utils.ex

@@ -1,6 +1,8 @@
 defmodule PhoenixOauth2Provider.Mix.Utils do
   @moduledoc false
 
+  alias Mix.Phoenix
+
   @spec raise_option_errors([atom()]) :: no_return
   def raise_option_errors(list) do
     list
@@ -46,7 +48,7 @@ defmodule PhoenixOauth2Provider.Mix.Utils do
   @spec web_path(Path.t()) :: binary()
   def web_path(path), do: Path.join(get_web_prefix(), path)
 
-  defp get_web_prefix, do: Mix.Phoenix.web_path(Mix.Phoenix.otp_app())
+  defp get_web_prefix, do: Phoenix.web_path(Phoenix.otp_app())
 
   @spec list_to_existing_atoms([binary()]) :: [atom()]
   def list_to_existing_atoms(list) do

lib/phoenix_oauth2_provider.ex

@@ -12,6 +12,7 @@ defmodule PhoenixOauth2Provider do
   [ex_oauth2_provider](https://github.com/danschultzer/ex_oauth2_provider)
   library.
   """
+  alias Mix.Phoenix
 
   @doc """
   Will get current resource owner from endpoint
@@ -43,7 +44,7 @@ defmodule PhoenixOauth2Provider do
 
   defp web_module do
     config()
-    |> Keyword.get(:module, Mix.Phoenix.base())
+    |> Keyword.get(:module, Phoenix.base())
     |> Kernel.to_string()
     |> Kernel.<>("Web")
   end

lib/phoenix_oauth2_provider/web/controllers/authorized_application_controller.ex

@@ -1,21 +1,22 @@
 defmodule PhoenixOauth2Provider.AuthorizedApplicationController do
   @moduledoc false
   use PhoenixOauth2Provider.Web, :controller
-
   alias ExOauth2Provider.OauthApplications
-  import PhoenixOauth2Provider
 
   def index(conn, _params) do
-    applications = OauthApplications.get_authorized_applications_for(current_resource_owner(conn))
-    render(conn, "index.html", applications: applications)
+    applications = conn
+                   |> PhoenixOauth2Provider.current_resource_owner()
+                   |> OauthApplications.get_authorized_applications_for()
+
+                   render(conn, "index.html", applications: applications)
   end
 
   def delete(conn, %{"uid" => uid}) do
     application = OauthApplications.get_application!(uid)
-    {:ok, _application} = OauthApplications.revoke_all_access_tokens_for(application, current_resource_owner(conn))
+    {:ok, _application} = OauthApplications.revoke_all_access_tokens_for(application, PhoenixOauth2Provider.current_resource_owner(conn))
 
     conn
     |> put_flash(:info, "Application revoked.")
-    |> redirect(to: router_helpers().oauth_authorized_application_path(conn, :index))
+    |> redirect(to: PhoenixOauth2Provider.router_helpers().oauth_authorized_application_path(conn, :index))
   end
 end

test/controllers/authorization_controller_test.exs

@@ -1,22 +1,10 @@
 defmodule PhoenixOauth2Provider.AuthorizationControllerTest do
   use PhoenixOauth2Provider.Test.ConnCase
-  alias ExOauth2Provider.OauthApplications
+  alias ExOauth2Provider.{OauthAccessGrants.OauthAccessGrant,
+                          OauthApplications,
+                          Scopes}
   alias PhoenixOauth2Provider.Test.Fixtures
 
-  def valid_request(%OauthApplications.OauthApplication{} = application) do
-    %{client_id: application.uid, response_type: "code"}
-  end
-
-  def last_grant do
-    ExOauth2Provider.OauthAccessGrants.OauthAccessGrant
-    |> ExOauth2Provider.repo.all()
-    |> List.last()
-  end
-
-  def last_grant_token do
-    last_grant().token
-  end
-
   setup %{conn: conn} do
     user = Fixtures.user()
     conn = assign conn, :current_test_user, user
@@ -32,7 +20,7 @@ defmodule PhoenixOauth2Provider.AuthorizationControllerTest do
     assert body =~ "Authorize <strong>#{application.name}</strong> to use your account?"
     assert body =~ application.name
     application.scopes
-    |> ExOauth2Provider.Scopes.to_list
+    |> Scopes.to_list()
     |> Enum.each(fn(scope) ->
       assert body =~ "<li>#{scope}</li>"
     end)
@@ -100,4 +88,14 @@ defmodule PhoenixOauth2Provider.AuthorizationControllerTest do
       assert "The resource owner or authorization server denied the request." == body["error_description"]
     end
   end
+
+  defp valid_request(%{uid: uid}), do: %{client_id: uid, response_type: "code"}
+
+  defp last_grant do
+    OauthAccessGrant
+    |> ExOauth2Provider.repo().all()
+    |> List.last()
+  end
+
+  defp last_grant_token, do: last_grant().token
 end

test/controllers/token_controller_test.exs

@@ -1,13 +1,8 @@
 defmodule PhoenixOauth2Provider.TokenControllerTest do
   use PhoenixOauth2Provider.Test.ConnCase
   alias PhoenixOauth2Provider.Test.Fixtures
-
-  def last_access_token do
-    ExOauth2Provider.OauthAccessTokens.OauthAccessToken
-    |> ExOauth2Provider.repo.all()
-    |> List.last()
-    |> Map.get(:token)
-  end
+  alias ExOauth2Provider.{OauthAccessTokens,
+                          OauthAccessTokens.OauthAccessToken}
 
   setup %{conn: conn} do
     application = Fixtures.application(%{user: Fixtures.user()})
@@ -107,7 +102,7 @@ defmodule PhoenixOauth2Provider.TokenControllerTest do
       conn = post conn, Routes.oauth_token_path(conn, :revoke, request)
       body = json_response(conn, 200)
       assert body == %{}
-      assert ExOauth2Provider.OauthAccessTokens.is_revoked?(last_access_token())
+      assert OauthAccessTokens.is_revoked?(last_access_token())
     end
 
     test "revoke/2 with invalid token", %{conn: conn, request: request} do
@@ -116,4 +111,11 @@ defmodule PhoenixOauth2Provider.TokenControllerTest do
       assert body == %{}
     end
   end
+
+  defp last_access_token do
+    OauthAccessToken
+    |> ExOauth2Provider.repo.all()
+    |> List.last()
+    |> Map.get(:token)
+  end
 end

test/mix/tasks/phoenix_oauth2_provider.install_test.exs

@@ -5,6 +5,7 @@ Mix.shell(Mix.Shell.Process)
 defmodule Mix.Tasks.PhoenixOauth2Provider.InstallTest do
   use ExUnit.Case
   alias PhoenixOauth2Provider.Test.MixHelpers
+  alias Mix.Tasks.PhoenixOauth2Provider.Install
 
   defmodule MigrationsRepo do
     def __adapter__ do
@@ -24,8 +25,7 @@ defmodule Mix.Tasks.PhoenixOauth2Provider.InstallTest do
 
   test "generates files for application" do
     MixHelpers.in_tmp "generates_files_for_application", fn ->
-      ~w(--repo PhoenixOauth2Provider.Test.Repo --log-only --controllers --module PhoenixOauth2Provider.Test --no-provider)
-      |> Mix.Tasks.PhoenixOauth2Provider.Install.run()
+      Install.run(~w(--repo PhoenixOauth2Provider.Test.Repo --log-only --controllers --module PhoenixOauth2Provider.Test --no-provider))
 
       ~w(application_view.ex authorization_view.ex authorized_application_view.ex phoenix_oauth2_provider_view.ex layout_view.ex phoenix_oauth2_provider_view_helpers.ex)
       |> MixHelpers.assert_file_list(@all_views, web_path("views/phoenix_oauth2_provider/"))
@@ -44,8 +44,7 @@ defmodule Mix.Tasks.PhoenixOauth2Provider.InstallTest do
 
   test "does not generate files for full" do
     MixHelpers.in_tmp "does_not_generate_files_for_full", fn ->
-      ~w(--repo PhoenixOauth2Provider.Test.Repo --full --log-only --no-boilerplate --no-provider)
-      |> Mix.Tasks.PhoenixOauth2Provider.Install.run()
+      Install.run(~w(--repo PhoenixOauth2Provider.Test.Repo --full --log-only --no-boilerplate --no-provider))
 
       MixHelpers.assert_file_list([], @all_views, web_path("views/phoenix_oauth2_provider/"))
 
@@ -59,8 +58,7 @@ defmodule Mix.Tasks.PhoenixOauth2Provider.InstallTest do
     MixHelpers.in_tmp "installs_phoenix_oauth2_provider_config", fn ->
       file_path = "config.exs"
       File.touch!(file_path)
-      ~w(--repo PhoenixOauth2Provider.Test.Repo --no-boilerplate --no-migrations --config-file #{File.cwd!}/#{file_path})
-      |> Mix.Tasks.PhoenixOauth2Provider.Install.run()
+      Install.run(~w(--repo PhoenixOauth2Provider.Test.Repo --no-boilerplate --no-migrations --config-file #{File.cwd!}/#{file_path}))
 
       MixHelpers.assert_file file_path, fn file ->
         assert file =~ "config :phoenix_oauth2_provider, PhoenixOauth2Provider"
@@ -77,8 +75,7 @@ defmodule Mix.Tasks.PhoenixOauth2Provider.InstallTest do
 
   test "instructions" do
     MixHelpers.in_tmp "prints_instructions", fn ->
-      ~w(--repo PhoenixOauth2Provider.Test.Repo --no-boilerplate --no-migrations --no-config)
-      |> Mix.Tasks.PhoenixOauth2Provider.Install.run()
+      Install.run(~w(--repo PhoenixOauth2Provider.Test.Repo --no-boilerplate --no-migrations --no-config))
 
       assert_received {:mix_shell, :info, [
         """
@@ -124,8 +121,7 @@ defmodule Mix.Tasks.PhoenixOauth2Provider.InstallTest do
         """
       ]}
 
-      ~w(--repo PhoenixOauth2Provider.Test.Repo --no-boilerplate --controllers --no-migrations --no-config)
-      |> Mix.Tasks.PhoenixOauth2Provider.Install.run()
+      Install.run(~w(--repo PhoenixOauth2Provider.Test.Repo --no-boilerplate --controllers --no-migrations --no-config))
 
       assert_received {:mix_shell, :info, [
         """
@@ -162,8 +158,7 @@ defmodule Mix.Tasks.PhoenixOauth2Provider.InstallTest do
 
   describe "installs ex_oauth2_provider" do
     test "adds migrations" do
-      ~w(--repo PhoenixOauth2Provider.Test.Repo --no-boilerplate --no-config --repo #{to_string MigrationsRepo})
-      |> Mix.Tasks.PhoenixOauth2Provider.Install.run()
+      Install.run(~w(--repo PhoenixOauth2Provider.Test.Repo --no-boilerplate --no-config --repo #{to_string MigrationsRepo}))
 
       assert [_] = MixHelpers.tmp_path() |> Path.join("migrations/*_create_oauth_tables.exs") |> Path.wildcard()
       assert_received {:mix_shell, :info, [
@@ -178,8 +173,7 @@ defmodule Mix.Tasks.PhoenixOauth2Provider.InstallTest do
   describe "installed options" do
     test "install options default" do
       Application.put_env :phoenix_oauth2_provider, :opts, [:application]
-      ~w(--repo PhoenixOauth2Provider.Test.Repo --installed-options --no-provider)
-      |>  Mix.Tasks.PhoenixOauth2Provider.Install.run()
+      Install.run(~w(--repo PhoenixOauth2Provider.Test.Repo --installed-options --no-provider))
 
       assert_received {:mix_shell, :info, ["mix phoenix_oauth2_provider.install --application"]}
     end

test/support/conn_case.ex

@@ -14,21 +14,28 @@ defmodule PhoenixOauth2Provider.Test.ConnCase do
   """
   use ExUnit.CaseTemplate
 
+  alias Ecto.Adapters.SQL.Sandbox
+  alias PhoenixOauth2Provider.Test.{Endpoint,
+                                    ErrorView,
+                                    Repo,
+                                    Router.Helpers}
+  alias Phoenix.ConnTest
+
   using do
     quote do
       # Import conveniences for testing with connections
-      use Phoenix.ConnTest
-      import PhoenixOauth2Provider.Test.ErrorView
-      alias PhoenixOauth2Provider.Test.Router.Helpers, as: Routes
+      use ConnTest
+      import ErrorView
+      alias Helpers, as: Routes
 
-      @endpoint PhoenixOauth2Provider.Test.Endpoint
+      @endpoint Endpoint
     end
   end
 
   setup tags do
     unless tags[:async] do
-      :ok = Ecto.Adapters.SQL.Sandbox.checkout(PhoenixOauth2Provider.Test.Repo)
+      :ok = Sandbox.checkout(Repo)
     end
-    {:ok, conn: Phoenix.ConnTest.build_conn()}
+    {:ok, conn: ConnTest.build_conn()}
   end
 end

test/support/fixtures.ex

@@ -2,7 +2,8 @@ defmodule PhoenixOauth2Provider.Test.Fixtures do
   @moduledoc false
 
   alias PhoenixOauth2Provider.Test.{Repo, User}
-  alias ExOauth2Provider.{OauthAccessTokens,
+  alias ExOauth2Provider.{Config,
+                          OauthAccessTokens,
                           OauthAccessTokens.OauthAccessToken,
                           OauthAccessGrants,
                           OauthAccessGrants.OauthAccessGrant,
@@ -38,7 +39,7 @@ defmodule PhoenixOauth2Provider.Test.Fixtures do
   @spec access_grant(map()) :: OauthAccessGrant.t()
   def access_grant(%{application: application, user: user} = attrs) do
     attrs = %{redirect_uri: application.redirect_uri,
-              expires_in: ExOauth2Provider.Config.authorization_code_expires_in()}
+              expires_in: Config.authorization_code_expires_in()}
             |> Map.merge(attrs)
 
     {:ok, access_token} = OauthAccessGrants.create_grant(user, application, attrs)