Fix branch name from Push event (#31)

* Fix branch name from Push event

- closes #30

Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

* Add new test cases for WebhooksController

Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

Author: tallysmartins

lib/elixir_bench_web/controllers/github/webhooks_controller.ex

@@ -17,17 +17,23 @@ defmodule ElixirBenchWeb.Github.WebHooks do
 
   defp extract_job_attrs("push", payload) do
     slug = get_in(payload, ["repository", "full_name"])
-    branch_name = get_in(payload, ["ref"])
     commit_sha = get_in(payload, ["after"])
 
+    branch_name =
+      case get_in(payload, ["ref"]) do
+        nil -> nil
+        "" -> nil
+        name -> String.replace(name, "refs/heads/", "")
+      end
+
     %{slug: slug, branch_name: branch_name, commit_sha: commit_sha}
   end
 
   defp extract_job_attrs("pull_request", payload) do
     # data is fetched from sender's repository refered as "head"
     slug = get_in(payload, ["pull_request", "head", "repo", "full_name"])
-    branch_name = get_in(payload, ["pull_request", "head", "ref"])
     commit_sha = get_in(payload, ["pull_request", "head", "sha"])
+    branch_name = get_in(payload, ["pull_request", "head", "ref"])
 
     %{slug: slug, branch_name: branch_name, commit_sha: commit_sha}
   end

test/elixir_bench_web/controllers/github/webhooks_controller_test.exs

@@ -42,6 +42,44 @@ defmodule ElixirBenchWeb.Github.WebHooksControllerTest do
       assert %{"branch_name" => "changes", "repo_slug" => "baxterthehacker/public-repo"} = data
     end
 
+    test "validate branch ref name in push events", context do
+      insert(:repo, @github_repo_attrs)
+
+      payload = push_payload() |> Jason.decode!()
+
+      refs_head = %{payload | "ref" => "refs/heads/mybranch"}
+      empty_string = %{payload | "ref" => ""}
+      nil_value = %{payload | "ref" => nil}
+
+      assert_difference(Repo, 0) do
+        assert_difference(Job, 1) do
+          {:ok, %{"data" => data}} =
+            context.conn
+            |> set_headers("push")
+            |> post("/hooks/handle", %{"payload" => Jason.encode!(refs_head)})
+            |> decode_response_body
+        end
+      end
+
+      assert %{"branch_name" => "mybranch", "repo_slug" => "baxterthehacker/public-repo"} = data
+
+      {:ok, %{"errors" => errors}} =
+        context.conn
+        |> set_headers("push")
+        |> post("/hooks/handle", %{"payload" => Jason.encode!(empty_string)})
+        |> decode_response_body
+
+      assert %{"branch_name" => ["can't be blank"]} = errors
+
+      {:ok, %{"errors" => errors}} =
+        context.conn
+        |> set_headers("push")
+        |> post("/hooks/handle", %{"payload" => Jason.encode!(nil_value)})
+        |> decode_response_body
+
+      assert %{"branch_name" => ["can't be blank"]} = errors
+    end
+
     test "respond to ping event", context do
       response =
         context.conn