move fixtures from github_webhooks to test/fixtures for clarity see: #…

…6 (comment)
dwyl · Mar 16, 2017 · 7d78d1e · 7d78d1e
1 parent d98d532
commit 7d78d1e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/test/controllers/webhooks_controller_test.exs b/test/controllers/webhooks_controller_test.exs
@@ -1,8 +1,8 @@
 defmodule Dwylbot.WebhooksControllerTest do
  use Dwylbot.ConnCase
  @root_dir File.cwd!
- @data_in_progress Path.join(~w(#{@root_dir} github_webhooks dwylbot-test.json))
- @data_bug Path.join(~w(#{@root_dir} github_webhooks dwylbot-test-bug-label.json))
+ @data_in_progress Path.join(~w(#{@root_dir} test/fixtures dwylbot-test.json))
+ @data_bug Path.join(~w(#{@root_dir} test/fixtures dwylbot-test-bug-label.json))
 
  test "GET /webhooks", %{conn: conn} do
  conn = get conn, "/webhooks"

diff --git a/github_webhooks/assignee.json → test/fixtures/assignee.json b/github_webhooks/assignee.json → test/fixtures/assignee.json
diff --git a/github_webhooks/dwylbot-test-bug-label.json → test/fixtures/dwylbot-test-bug-label.json b/github_webhooks/dwylbot-test-bug-label.json → test/fixtures/dwylbot-test-bug-label.json
diff --git a/github_webhooks/dwylbot-test.json → test/fixtures/dwylbot-test.json b/github_webhooks/dwylbot-test.json → test/fixtures/dwylbot-test.json
diff --git a/github_webhooks/in_progress.json → test/fixtures/in_progress.json b/github_webhooks/in_progress.json → test/fixtures/in_progress.json
diff --git a/github_webhooks/multiple_labels.json → test/fixtures/multiple_labels.json b/github_webhooks/multiple_labels.json → test/fixtures/multiple_labels.json
diff --git a/web/controllers/webhooks_controller.ex b/web/controllers/webhooks_controller.ex
@@ -7,7 +7,7 @@ defmodule Dwylbot.WebhooksController do
  end
 
  def create(conn, params) do
- IO.inspect params
+ # IO.inspect params
  action = params["action"]
  labels = params["issue"]["labels"]
  assignees = params["issue"]["assignees"]
@@ -16,13 +16,17 @@ defmodule Dwylbot.WebhooksController do
  issue_id = params["issue"]["number"]
  sender = params["sender"]["login"]
 
- invalid = action == "labeled" && contain_label?("in-progress", labels) && Enum.empty?(assignees)
+ invalid = action == "labeled"
+ && contain_label?("in-progress", labels) && Enum.empty?(assignees)
 
  if invalid do
- client = Tentacat.Client.new(%{access_token: System.get_env("GITHUB_ACCESS_TOKEN")})
- comment_body = %{"body" => "@#{sender} the `in-progress` label has been added to this issue **without an Assignee**.
-Please assign a user to this issue before applying the `in-progress` label."}
- Tentacat.Issues.Comments.create(owner, repo, issue_id, comment_body, client)
+ client = Tentacat.Client.new(%{access_token:
+ System.get_env("GITHUB_ACCESS_TOKEN")})
+ comment_body = %{"body" => "@#{sender} the `in-progress` label has been
+ added to this issue **without an Assignee**. Please assign a user to this
+ issue before applying the `in-progress` label."}
+ Tentacat.Issues.Comments.create(owner, repo, issue_id,
+ comment_body, client)
  conn
  |> put_status(201)
  |> json(%{ok: true})