consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify testing array contents

Browse Source 
We were testing for the size and the content of the elements when we
could test for the array itself.
This commit is contained in:
Javi Martín
2019-09-24 21:01:32 +02:00
parent 4301937e85
commit f27beb1e47
17 changed files with 59 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/features/admin/emails/emails_download_spec.rb
View File

@@ -37,13 +37,7 @@ describe "Admin download user emails" do
expect(header).to match /filename="Administrators.csv"$/
file_contents = page.body.split(",")
expect(file_contents.count).to eq(2)
expect(file_contents).to include("admin_news1@consul.dev")
expect(file_contents).to include("admin_news2@consul.dev")
expect(file_contents).not_to include("admin@consul.dev")
expect(file_contents).not_to include("user@consul.dev")
expect(file_contents).not_to include("no_news@consul.dev")
expect(file_contents).not_to include("no_email@consul.dev")
expect(file_contents).to match_array ["admin_news1@consul.dev", "admin_news2@consul.dev"]
end
end
end

29
spec/models/activity_spec.rb
View File

@@ -43,10 +43,7 @@ describe Activity do
create(:activity, action: "hide", actionable: create(:comment))
create(:activity, action: "block", actionable: create(:user))
expect(Activity.on(proposal).size).to eq 3
[activity1, activity2, activity3].each do |a|
expect(Activity.on(proposal)).to include(a)
end
expect(Activity.on(proposal)).to match_array [activity1, activity2, activity3]
end
end
@@ -61,11 +58,9 @@ describe Activity do
activity6 = create(:activity, user: user1, action: "valuate", actionable: create(:budget_investment))
create_list(:activity, 3)
expect(Activity.by(user1).size).to eq 6
[activity1, activity2, activity3, activity4, activity5, activity6].each do |a|
expect(Activity.by(user1)).to include(a)
end
expect(Activity.by(user1)).to match_array(
[activity1, activity2, activity3, activity4, activity5, activity6]
)
end
end
@@ -77,17 +72,11 @@ describe Activity do
on_user = create(:activity, actionable: create(:user))
on_investment = create(:activity, actionable: create(:budget_investment))
expect(Activity.on_proposals.size).to eq 1
expect(Activity.on_debates.size).to eq 1
expect(Activity.on_comments.size).to eq 1
expect(Activity.on_users.size).to eq 1
expect(Activity.on_budget_investments.size).to eq 1
expect(Activity.on_proposals.first).to eq on_proposal
expect(Activity.on_debates.first).to eq on_debate
expect(Activity.on_comments.first).to eq on_comment
expect(Activity.on_users.first).to eq on_user
expect(Activity.on_budget_investments.first).to eq on_investment
expect(Activity.on_proposals).to eq [on_proposal]
expect(Activity.on_debates).to eq [on_debate]
expect(Activity.on_comments).to eq [on_comment]
expect(Activity.on_users).to eq [on_user]
expect(Activity.on_budget_investments).to eq [on_investment]
end
end

8
spec/models/budget/heading_spec.rb
View File

@@ -301,9 +301,7 @@ describe Budget::Heading do
last_heading = create(:budget_heading, group: last_group, name: "Name")
first_heading = create(:budget_heading, group: first_group, name: "Name")
expect(Budget::Heading.sort_by_name.size).to be 2
expect(Budget::Heading.sort_by_name.first).to eq first_heading
expect(Budget::Heading.sort_by_name.last).to eq last_heading
expect(Budget::Heading.sort_by_name).to eq [first_heading, last_heading]
end
end
@@ -314,9 +312,7 @@ describe Budget::Heading do
last_heading = create(:budget_heading, allow_custom_content: true, name: "Name C")
first_heading = create(:budget_heading, allow_custom_content: true, name: "Name B")
expect(Budget::Heading.allow_custom_content.count).to be 2
expect(Budget::Heading.allow_custom_content.first).to eq first_heading
expect(Budget::Heading.allow_custom_content.last).to eq last_heading
expect(Budget::Heading.allow_custom_content).to eq [first_heading, last_heading]
end
it "returns headings with multiple translations only once" do

40
spec/models/budget/investment_spec.rb
View File

@@ -335,8 +335,7 @@ describe Budget::Investment do
by_admin = Budget::Investment.by_admin(33)
expect(by_admin.size).to eq(1)
expect(by_admin.first).to eq(investment1)
expect(by_admin).to eq [investment1]
end
end
@@ -383,13 +382,13 @@ describe Budget::Investment do
let!(:investment) { create(:budget_investment, :feasible, heading: heading) }
it "finds budget by id or slug" do
result = Budget::Investment.scoped_filter({ budget_id: budget.id }, nil)
expect(result.count).to be 1
expect(result.first.id).to be investment.id
results = Budget::Investment.scoped_filter({ budget_id: budget.id }, nil)
result = Budget::Investment.scoped_filter({ budget_id: "budget_slug" }, nil)
expect(result.count).to be 1
expect(result.first.id).to be investment.id
expect(results).to eq [investment]
results = Budget::Investment.scoped_filter({ budget_id: "budget_slug" }, nil)
expect(results).to eq [investment]
end
it "does not raise error if budget is not found" do
@@ -407,8 +406,7 @@ describe Budget::Investment do
valuation_open = Budget::Investment.valuation_open
expect(valuation_open.size).to eq(1)
expect(valuation_open.first).to eq(investment2)
expect(valuation_open).to eq [investment2]
end
end
@@ -420,8 +418,7 @@ describe Budget::Investment do
without_admin = Budget::Investment.without_admin
expect(without_admin.size).to eq(1)
expect(without_admin.first).to eq(investment3)
expect(without_admin).to eq [investment3]
end
end
@@ -434,8 +431,7 @@ describe Budget::Investment do
managed = Budget::Investment.managed
expect(managed.size).to eq(1)
expect(managed.first).to eq(investment3)
expect(managed).to eq [investment3]
end
end
@@ -450,8 +446,7 @@ describe Budget::Investment do
valuating = Budget::Investment.valuating
expect(valuating.size).to eq(1)
expect(valuating.first).to eq(investment2)
expect(valuating).to eq [investment2]
end
it "returns all investments with assigned valuator groups but valuation not finished" do
@@ -464,8 +459,7 @@ describe Budget::Investment do
valuating = Budget::Investment.valuating
expect(valuating.size).to eq(1)
expect(valuating.first).to eq(investment2)
expect(valuating).to eq [investment2]
end
end
@@ -480,8 +474,7 @@ describe Budget::Investment do
valuation_finished = Budget::Investment.valuation_finished
expect(valuation_finished.size).to eq(1)
expect(valuation_finished.first).to eq(investment3)
expect(valuation_finished).to eq [investment3]
end
end
@@ -933,10 +926,9 @@ describe Budget::Investment do
most_voted2 = create(:budget_investment, cached_votes_up: 10)
least_voted2 = create(:budget_investment, cached_votes_up: 1)
expect(Budget::Investment.sort_by_confidence_score.first).to eq most_voted2
expect(Budget::Investment.sort_by_confidence_score.second).to eq most_voted
expect(Budget::Investment.sort_by_confidence_score.third).to eq least_voted2
expect(Budget::Investment.sort_by_confidence_score.fourth).to eq least_voted
expect(Budget::Investment.sort_by_confidence_score).to eq [
most_voted2, most_voted, least_voted2, least_voted
]
end
end
end

3
spec/models/comment_spec.rb
View File

@@ -131,8 +131,7 @@ describe Comment do
create(:comment, administrator_id: create(:administrator).id)
create(:comment, moderator_id: create(:moderator).id)
expect(Comment.not_as_admin_or_moderator.size).to eq(1)
expect(Comment.not_as_admin_or_moderator.first).to eq(comment1)
expect(Comment.not_as_admin_or_moderator).to eq [comment1]
end
end

4
spec/models/community_spec.rb
View File

@@ -21,9 +21,7 @@ RSpec.describe Community, type: :model do
create(:comment, commentable: topic1, author: user2)
topic2 = create(:topic, community: community, author: user2)
expect(community.participants).to include(user1)
expect(community.participants).to include(user2)
expect(community.participants).to include(proposal.author)
expect(community.participants).to match_array [user1, user2, proposal.author]
end
end
end

3
spec/models/custom/verification/residence_spec.rb
View File

@@ -24,8 +24,7 @@ describe Verification::Residence do
residence.postal_code = "13280"
residence.valid?
expect(residence.errors[:postal_code].size).to eq(1)
expect(residence.errors[:postal_code]).to include("In order to be verified, you must be registered.")
expect(residence.errors[:postal_code]).to eq ["In order to be verified, you must be registered."]
end
end

6
spec/models/document_spec.rb
View File

@@ -15,11 +15,7 @@ describe Document do
admin_document2 = create(:document, :admin)
admin_document3 = create(:document, :admin)
expect(Document.admin.count).to eq(3)
expect(Document.admin).to include admin_document1
expect(Document.admin).to include admin_document2
expect(Document.admin).to include admin_document3
expect(Document.admin).not_to include user_document
expect(Document.admin).to match_array [admin_document1, admin_document2, admin_document3]
end
end

5
spec/models/newsletter_spec.rb
View File

@@ -57,10 +57,7 @@ describe Newsletter do
end
it "returns list of recipients excluding users with disabled newsletter" do
expect(newsletter.list_of_recipient_emails.count).to eq(1)
expect(newsletter.list_of_recipient_emails).to include("newsletter_user@consul.dev")
expect(newsletter.list_of_recipient_emails).not_to include("no_news_user@consul.dev")
expect(newsletter.list_of_recipient_emails).not_to include("erased_user@consul.dev")
expect(newsletter.list_of_recipient_emails).to eq ["newsletter_user@consul.dev"]
end
end

5
spec/models/notification_spec.rb
View File

@@ -48,10 +48,7 @@ describe Notification do
old_notification = create :notification
new_notification = create :notification
sorted_notifications = Notification.recent
expect(sorted_notifications.size).to be 2
expect(sorted_notifications.first).to eq new_notification
expect(sorted_notifications.last).to eq old_notification
expect(Notification.recent).to eq [new_notification, old_notification]
end
end

12
spec/models/organization_spec.rb
View File

@@ -53,21 +53,15 @@ describe Organization do
it "finds fuzzily by name" do
expect(Organization.search("Greenpeace")).to be_empty
search = Organization.search("Tershe")
expect(search.size).to eq 1
expect(search.first).to eq organization
expect(Organization.search("Tershe")).to eq [organization]
end
scenario "finds by users email" do
search = Organization.search(organization.user.email)
expect(search.size).to eq 1
expect(search.first).to eq organization
expect(Organization.search(organization.user.email)).to eq [organization]
end
scenario "finds by users phone number" do
search = Organization.search(organization.user.phone_number)
expect(search.size).to eq 1
expect(search.first).to eq organization
expect(Organization.search(organization.user.phone_number)).to eq [organization]
end
end
end

2
spec/models/poll/booth_spec.rb
View File

@@ -20,7 +20,7 @@ describe Poll::Booth do
expect(Poll::Booth.search("number")).to eq([booth1])
expect(Poll::Booth.search("hall")).to eq([booth2])
expect(Poll::Booth.search("cen").size).to eq 2
expect(Poll::Booth.search("cen")).to match_array [booth1, booth2]
end
end

22
spec/models/poll/officer_spec.rb
View File

@@ -47,10 +47,8 @@ describe Poll::Officer do
create(:poll_officer_assignment, booth_assignment: booth_assignment_2, officer: officer)
assigned_polls = officer.voting_days_assigned_polls
expect(assigned_polls.size).to eq 2
expect(assigned_polls.include?(poll_1)).to eq(true)
expect(assigned_polls.include?(poll_2)).to eq(true)
expect(assigned_polls.include?(poll_3)).to eq(false)
expect(assigned_polls).to match_array [poll_1, poll_2]
end
it "does not return polls with this officer assigned for final recount/results" do
@@ -66,9 +64,8 @@ describe Poll::Officer do
create(:poll_officer_assignment, booth_assignment: booth_assignment_2, officer: officer, final: true)
assigned_polls = officer.voting_days_assigned_polls
expect(assigned_polls.size).to eq 1
expect(assigned_polls.include?(poll_1)).to eq(true)
expect(assigned_polls.include?(poll_2)).to eq(false)
expect(assigned_polls).to eq [poll_1]
end
it "returns polls ordered by end date (desc)" do
@@ -107,10 +104,8 @@ describe Poll::Officer do
create(:poll_officer_assignment, booth_assignment: booth_assignment_2, officer: officer, final: true)
assigned_polls = officer.final_days_assigned_polls
expect(assigned_polls.size).to eq 2
expect(assigned_polls.include?(poll_1)).to eq(true)
expect(assigned_polls.include?(poll_2)).to eq(true)
expect(assigned_polls.include?(poll_3)).to eq(false)
expect(assigned_polls).to match_array [poll_1, poll_2]
end
it "does not return polls with this officer assigned for voting days" do
@@ -126,9 +121,8 @@ describe Poll::Officer do
create(:poll_officer_assignment, booth_assignment: booth_assignment_2, officer: officer, final: true)
assigned_polls = officer.final_days_assigned_polls
expect(assigned_polls.size).to eq 1
expect(assigned_polls.include?(poll_1)).to eq(false)
expect(assigned_polls.include?(poll_2)).to eq(true)
expect(assigned_polls).to eq [poll_2]
end
it "returns polls ordered by end date (desc)" do

10
spec/models/poll/voter_spec.rb
View File

@@ -141,10 +141,7 @@ describe Poll::Voter do
web_voters = Poll::Voter.web
expect(web_voters.count).to eq(2)
expect(web_voters).to include(voter1)
expect(web_voters).to include(voter2)
expect(web_voters).not_to include(voter3)
expect(web_voters).to match_array [voter1, voter2]
end
end
@@ -156,10 +153,7 @@ describe Poll::Voter do
booth_voters = Poll::Voter.booth
expect(booth_voters.count).to eq(2)
expect(booth_voters).to include(voter1)
expect(booth_voters).to include(voter2)
expect(booth_voters).not_to include(voter3)
expect(booth_voters).to match_array [voter1, voter2]
end
end

30
spec/models/proposal_spec.rb
View File

@@ -883,17 +883,11 @@ describe Proposal do
end
it "scope retired" do
retired = Proposal.retired
expect(retired.size).to eq(1)
expect(retired.first).to eq(proposal2)
expect(Proposal.retired).to eq [proposal2]
end
it "scope not_retired" do
not_retired = Proposal.not_retired
expect(not_retired.size).to eq(1)
expect(not_retired.first).to eq(proposal1)
expect(Proposal.not_retired).to eq [proposal1]
end
end
@@ -907,17 +901,11 @@ describe Proposal do
end
it "scope archived" do
archived = Proposal.archived
expect(archived.size).to eq(1)
expect(archived.first).to eq(archived_proposal)
expect(Proposal.archived).to eq [archived_proposal]
end
it "scope not archived" do
not_archived = Proposal.not_archived
expect(not_archived.size).to eq(1)
expect(not_archived.first).to eq(new_proposal)
expect(Proposal.not_archived).to eq [new_proposal]
end
end
@@ -931,17 +919,11 @@ describe Proposal do
end
it "scope selected" do
selected = Proposal.selected
expect(selected.size).to be 1
expect(selected.first).to eq selected_proposal
expect(Proposal.selected).to eq [selected_proposal]
end
it "scope not_selected" do
not_selected = Proposal.not_selected
expect(not_selected.size).to be 1
expect(not_selected.first).to eq not_selected_proposal
expect(Proposal.not_selected).to eq [not_selected_proposal]
end
end

4
spec/models/related_content_spec.rb
View File

@@ -53,9 +53,7 @@ describe RelatedContent do
end
it "returns not hidden by reports related contents" do
expect(parent_relationable.relationed_contents.count).to eq(1)
expect(parent_relationable.relationed_contents.first.class.name).to eq(child_relationable.class.name)
expect(parent_relationable.relationed_contents.first.id).to eq(child_relationable.id)
expect(parent_relationable.relationed_contents).to eq [child_relationable]
end
end

8
spec/models/user_spec.rb
View File

@@ -435,16 +435,16 @@ describe User do
user1 = create(:user, email: "larry@consul.dev")
create(:user, email: "bird@consul.dev")
search = User.search("larry@consul.dev")
expect(search.size).to eq(1)
expect(search.first).to eq(user1)
expect(search).to eq [user1]
end
it "find users by name" do
user1 = create(:user, username: "Larry Bird")
create(:user, username: "Robert Parish")
search = User.search("larry")
expect(search.size).to eq(1)
expect(search.first).to eq(user1)
expect(search).to eq [user1]
end
it "returns no results if no search term provided" do