From 5e34da0d17251ead6d4304e3d5b67de1d97178a5 Mon Sep 17 00:00:00 2001 From: Josh Smith Date: Sun, 25 Sep 2016 22:29:26 -0700 Subject: [PATCH] Fix tests on CI --- circle.yml | 2 +- web/models/organization.ex | 3 +-- web/models/organization_membership.ex | 7 ++----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/circle.yml b/circle.yml index fdbf500c4..6a5338dd0 100644 --- a/circle.yml +++ b/circle.yml @@ -13,7 +13,7 @@ dependencies: - mix compile test: override: - - mix test --cover + - mix test --include requires_env --cover post: - mix inch.report diff --git a/web/models/organization.ex b/web/models/organization.ex index 3f6cbd8bd..247994404 100644 --- a/web/models/organization.ex +++ b/web/models/organization.ex @@ -7,7 +7,6 @@ defmodule CodeCorps.Organization do use CodeCorps.Web, :model alias CodeCorps.SluggedRoute - alias CodeCorps.Project import CodeCorps.Base64ImageUploader import CodeCorps.ModelHelpers @@ -22,7 +21,7 @@ defmodule CodeCorps.Organization do has_one :slugged_route, SluggedRoute - has_many :projects, Project + has_many :projects, CodeCorps.Project has_many :organization_memberships, CodeCorps.OrganizationMembership has_many :members, through: [:organization_memberships, :member] diff --git a/web/models/organization_membership.ex b/web/models/organization_membership.ex index 4b732a59d..96f7ae8e1 100644 --- a/web/models/organization_membership.ex +++ b/web/models/organization_membership.ex @@ -7,14 +7,11 @@ defmodule CodeCorps.OrganizationMembership do import CodeCorps.ModelHelpers - alias CodeCorps.Organization - alias CodeCorps.User - schema "organization_memberships" do field :role, :string - belongs_to :organization, Organization - belongs_to :member, User + belongs_to :organization, CodeCorps.Organization + belongs_to :member, CodeCorps.User timestamps() end