Skip to content

Commit

Permalink
Merge branch 'master' into fix-codestyle
Browse files Browse the repository at this point in the history
  • Loading branch information
PavelVesnin committed Jul 6, 2017
2 parents d144f05 + 5fecc15 commit 70dac25
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
defmodule PRM.Mixfile do
use Mix.Project

@version "0.2.25"
@version "0.2.26"

def project do
[app: :prm,
Expand Down
10 changes: 10 additions & 0 deletions test/web/controllers/legal_entity_controller_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,16 @@ defmodule PRM.Web.LegalEntityControllerTest do
json_response(conn, 422)
end

test "show legal_entity by id", %{conn: conn} do
legal_entity = fixture(:legal_entity)
conn = get conn, legal_entity_path(conn, :show, legal_entity.id)
response = json_response(conn, 200)["data"]

assert "VERIFIED" == response["mis_verified"]
refute is_nil(response["nhs_verified"])
refute response["nhs_verified"]
end

test "creates legal_entity and renders legal_entity when data is valid", %{conn: conn} do
conn = post conn, legal_entity_path(conn, :create), @create_attrs
assert %{"id" => id, "medical_service_provider" => _} = json_response(conn, 201)["data"]
Expand Down

0 comments on commit 70dac25

Please sign in to comment.