Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 74ac6b7

Browse files
committed
refactor(create-article): fix article_tags tests
1 parent ec9494f commit 74ac6b7

File tree

4 files changed

+28
-32
lines changed

4 files changed

+28
-32
lines changed

test/groupher_server/cms/article_tags/blog_tag_test.exs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ defmodule GroupherServer.Test.CMS.ArticleTag.BlogTag do
1212
article_tag_attrs = mock_attrs(:article_tag)
1313
article_tag_attrs2 = mock_attrs(:article_tag)
1414

15-
post_attrs = mock_attrs(:blog)
15+
blog_attrs = mock_attrs(:blog)
1616

17-
{:ok, ~m(user community blog post_attrs article_tag_attrs article_tag_attrs2)a}
17+
{:ok, ~m(user community blog blog_attrs article_tag_attrs article_tag_attrs2)a}
1818
end
1919

2020
describe "[blog tag CURD]" do
@@ -80,30 +80,29 @@ defmodule GroupherServer.Test.CMS.ArticleTag.BlogTag do
8080

8181
describe "[create/update blog with tags]" do
8282
test "can create blog with exsited article tags",
83-
~m(community user post_attrs article_tag_attrs article_tag_attrs2)a do
83+
~m(community user blog_attrs article_tag_attrs article_tag_attrs2)a do
8484
{:ok, article_tag} = CMS.create_article_tag(community, :blog, article_tag_attrs, user)
8585
{:ok, article_tag2} = CMS.create_article_tag(community, :blog, article_tag_attrs2, user)
8686

87-
post_with_tags =
88-
Map.merge(post_attrs, %{article_tags: [%{id: article_tag.id}, %{id: article_tag2.id}]})
87+
blog_with_tags = Map.merge(blog_attrs, %{article_tags: [article_tag.id, article_tag2.id]})
8988

90-
{:ok, created} = CMS.create_article(community, :blog, post_with_tags, user)
89+
{:ok, created} = CMS.create_article(community, :blog, blog_with_tags, user)
9190
{:ok, blog} = ORM.find(Blog, created.id, preload: :article_tags)
9291

9392
assert exist_in?(article_tag, blog.article_tags)
9493
assert exist_in?(article_tag2, blog.article_tags)
9594
end
9695

9796
test "can not create blog with other community's article tags",
98-
~m(community user post_attrs article_tag_attrs article_tag_attrs2)a do
97+
~m(community user blog_attrs article_tag_attrs article_tag_attrs2)a do
9998
{:ok, community2} = db_insert(:community)
10099
{:ok, article_tag} = CMS.create_article_tag(community, :blog, article_tag_attrs, user)
101100
{:ok, article_tag2} = CMS.create_article_tag(community2, :blog, article_tag_attrs2, user)
102101

103-
post_with_tags =
104-
Map.merge(post_attrs, %{article_tags: [%{id: article_tag.id}, %{id: article_tag2.id}]})
102+
blog_with_tags =
103+
Map.merge(blog_attrs, %{article_tags: [%{id: article_tag.id}, %{id: article_tag2.id}]})
105104

106-
{:error, reason} = CMS.create_article(community, :blog, post_with_tags, user)
105+
{:error, reason} = CMS.create_article(community, :blog, blog_with_tags, user)
107106
is_error?(reason, :invalid_domain_tag)
108107
end
109108
end

test/groupher_server/cms/article_tags/job_tag_test.exs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ defmodule GroupherServer.Test.CMS.ArticleTag.JobTag do
1212
article_tag_attrs = mock_attrs(:article_tag)
1313
article_tag_attrs2 = mock_attrs(:article_tag)
1414

15-
post_attrs = mock_attrs(:job)
15+
job_attrs = mock_attrs(:job)
1616

17-
{:ok, ~m(user community job post_attrs article_tag_attrs article_tag_attrs2)a}
17+
{:ok, ~m(user community job job_attrs article_tag_attrs article_tag_attrs2)a}
1818
end
1919

2020
describe "[job tag CURD]" do
@@ -80,30 +80,29 @@ defmodule GroupherServer.Test.CMS.ArticleTag.JobTag do
8080

8181
describe "[create/update job with tags]" do
8282
test "can create job with exsited article tags",
83-
~m(community user post_attrs article_tag_attrs article_tag_attrs2)a do
83+
~m(community user job_attrs article_tag_attrs article_tag_attrs2)a do
8484
{:ok, article_tag} = CMS.create_article_tag(community, :job, article_tag_attrs, user)
8585
{:ok, article_tag2} = CMS.create_article_tag(community, :job, article_tag_attrs2, user)
8686

87-
post_with_tags =
88-
Map.merge(post_attrs, %{article_tags: [%{id: article_tag.id}, %{id: article_tag2.id}]})
87+
job_with_tags = Map.merge(job_attrs, %{article_tags: [article_tag.id, article_tag2.id]})
8988

90-
{:ok, created} = CMS.create_article(community, :job, post_with_tags, user)
89+
{:ok, created} = CMS.create_article(community, :job, job_with_tags, user)
9190
{:ok, job} = ORM.find(Job, created.id, preload: :article_tags)
9291

9392
assert exist_in?(article_tag, job.article_tags)
9493
assert exist_in?(article_tag2, job.article_tags)
9594
end
9695

9796
test "can not create job with other community's article tags",
98-
~m(community user post_attrs article_tag_attrs article_tag_attrs2)a do
97+
~m(community user job_attrs article_tag_attrs article_tag_attrs2)a do
9998
{:ok, community2} = db_insert(:community)
10099
{:ok, article_tag} = CMS.create_article_tag(community, :job, article_tag_attrs, user)
101100
{:ok, article_tag2} = CMS.create_article_tag(community2, :job, article_tag_attrs2, user)
102101

103-
post_with_tags =
104-
Map.merge(post_attrs, %{article_tags: [%{id: article_tag.id}, %{id: article_tag2.id}]})
102+
job_with_tags =
103+
Map.merge(job_attrs, %{article_tags: [%{id: article_tag.id}, %{id: article_tag2.id}]})
105104

106-
{:error, reason} = CMS.create_article(community, :job, post_with_tags, user)
105+
{:error, reason} = CMS.create_article(community, :job, job_with_tags, user)
107106
is_error?(reason, :invalid_domain_tag)
108107
end
109108
end

test/groupher_server/cms/article_tags/post_tag_test.exs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ defmodule GroupherServer.Test.CMS.ArticleTag.PostTag do
8484
{:ok, article_tag} = CMS.create_article_tag(community, :post, article_tag_attrs, user)
8585
{:ok, article_tag2} = CMS.create_article_tag(community, :post, article_tag_attrs2, user)
8686

87-
post_with_tags =
88-
Map.merge(post_attrs, %{article_tags: [%{id: article_tag.id}, %{id: article_tag2.id}]})
87+
post_with_tags = Map.merge(post_attrs, %{article_tags: [article_tag.id, article_tag2.id]})
8988

9089
{:ok, created} = CMS.create_article(community, :post, post_with_tags, user)
9190
{:ok, post} = ORM.find(Post, created.id, preload: :article_tags)

test/groupher_server/cms/article_tags/repo_tag_test.exs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ defmodule GroupherServer.Test.CMS.ArticleTag.RepoTag do
1212
article_tag_attrs = mock_attrs(:article_tag)
1313
article_tag_attrs2 = mock_attrs(:article_tag)
1414

15-
post_attrs = mock_attrs(:repo)
15+
repo_attrs = mock_attrs(:repo)
1616

17-
{:ok, ~m(user community repo post_attrs article_tag_attrs article_tag_attrs2)a}
17+
{:ok, ~m(user community repo repo_attrs article_tag_attrs article_tag_attrs2)a}
1818
end
1919

2020
describe "[repo tag CURD]" do
@@ -80,30 +80,29 @@ defmodule GroupherServer.Test.CMS.ArticleTag.RepoTag do
8080

8181
describe "[create/update repo with tags]" do
8282
test "can create repo with exsited article tags",
83-
~m(community user post_attrs article_tag_attrs article_tag_attrs2)a do
83+
~m(community user repo_attrs article_tag_attrs article_tag_attrs2)a do
8484
{:ok, article_tag} = CMS.create_article_tag(community, :repo, article_tag_attrs, user)
8585
{:ok, article_tag2} = CMS.create_article_tag(community, :repo, article_tag_attrs2, user)
8686

87-
post_with_tags =
88-
Map.merge(post_attrs, %{article_tags: [%{id: article_tag.id}, %{id: article_tag2.id}]})
87+
repo_with_tags = Map.merge(repo_attrs, %{article_tags: [article_tag.id, article_tag2.id]})
8988

90-
{:ok, created} = CMS.create_article(community, :repo, post_with_tags, user)
89+
{:ok, created} = CMS.create_article(community, :repo, repo_with_tags, user)
9190
{:ok, repo} = ORM.find(Repo, created.id, preload: :article_tags)
9291

9392
assert exist_in?(article_tag, repo.article_tags)
9493
assert exist_in?(article_tag2, repo.article_tags)
9594
end
9695

9796
test "can not create repo with other community's article tags",
98-
~m(community user post_attrs article_tag_attrs article_tag_attrs2)a do
97+
~m(community user repo_attrs article_tag_attrs article_tag_attrs2)a do
9998
{:ok, community2} = db_insert(:community)
10099
{:ok, article_tag} = CMS.create_article_tag(community, :repo, article_tag_attrs, user)
101100
{:ok, article_tag2} = CMS.create_article_tag(community2, :repo, article_tag_attrs2, user)
102101

103-
post_with_tags =
104-
Map.merge(post_attrs, %{article_tags: [%{id: article_tag.id}, %{id: article_tag2.id}]})
102+
repo_with_tags =
103+
Map.merge(repo_attrs, %{article_tags: [%{id: article_tag.id}, %{id: article_tag2.id}]})
105104

106-
{:error, reason} = CMS.create_article(community, :repo, post_with_tags, user)
105+
{:error, reason} = CMS.create_article(community, :repo, repo_with_tags, user)
107106
is_error?(reason, :invalid_domain_tag)
108107
end
109108
end

0 commit comments

Comments
 (0)