Skip to content

Commit b4781d3

Browse files
committed
Cleanup tests
1 parent 135358f commit b4781d3

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

spec/factories/pets.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
FactoryBot.define do
22
factory :pet do
3+
pet_type { Pet.pet_types.keys.sample }
34
name { Faker::Creature::Dog.name }
45
breed { Faker::Creature::Dog.breed }
56
age { Faker::Number.between(from: 1, to: 20) }

spec/models/pet_spec.rb

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -68,51 +68,51 @@
6868

6969
describe "scopes" do
7070
it "returns recent pets" do
71-
pet1 = create(:pet, name: "Fido", age: 5, breed: "Golden Retriever", created_at: 1.day.ago)
72-
pet2 = create(:pet, name: "Fido", age: 5, breed: "Golden Retriever")
71+
pet1 = create(:pet, name: "Fido", created_at: 1.day.ago)
72+
pet2 = create(:pet, name: "Fido")
7373
expect(Pet.recent).to eq([pet2, pet1])
7474
end
7575

7676
it "returns available pets" do
77-
_pet1 = create(:pet, name: "Fido", age: 5, breed: "Golden Retriever", adoption_date: 1.day.ago)
78-
pet2 = create(:pet, name: "Fido", age: 5, breed: "Golden Retriever")
77+
_pet1 = create(:pet, name: "Fido", adoption_date: 1.day.ago)
78+
pet2 = create(:pet, name: "Fido")
7979
expect(Pet.available).to eq([pet2])
8080
end
8181

8282
it "returns pets that match a search" do
83-
pet1 = create(:pet, name: "Fido", age: 5, breed: "Golden Retriever")
84-
_pet2 = create(:pet, name: "Spot", age: 5, breed: "Golden Retriever")
83+
pet1 = create(:pet, name: "Fido")
84+
_pet2 = create(:pet, name: "Spot")
8585
expect(Pet.search("Fido")).to eq([pet1])
8686
end
8787

8888
it "returns dogs" do
89-
pet1 = create(:pet, name: "Fido", age: 5, breed: "Golden Retriever", pet_type: "dog")
90-
_pet2 = create(:pet, name: "Spot", age: 5, breed: "Golden Retriever", pet_type: "cat")
89+
pet1 = create(:pet, name: "Fido", pet_type: "dog")
90+
_pet2 = create(:pet, name: "Spot", pet_type: "cat")
9191
expect(Pet.dogs).to eq([pet1])
9292
end
9393

9494
it "returns cats" do
95-
_pet1 = create(:pet, name: "Fido", age: 5, breed: "Golden Retriever", pet_type: "dog")
96-
pet2 = create(:pet, name: "Spot", age: 5, breed: "Golden Retriever", pet_type: "cat")
95+
_pet1 = create(:pet, name: "Fido", pet_type: "dog")
96+
pet2 = create(:pet, name: "Spot", pet_type: "cat")
9797
expect(Pet.cats).to eq([pet2])
9898
end
9999

100100
it "returns pets similar to the current pet" do
101-
pet1 = create(:pet, name: "Fido", age: 5, breed: "Golden Retriever", pet_type: "dog")
102-
pet2 = create(:pet, name: "Spot", age: 5, breed: "Golden Retriever", pet_type: "dog")
101+
pet1 = create(:pet, name: "Fido", pet_type: "dog")
102+
pet2 = create(:pet, name: "Spot", pet_type: "dog")
103103
expect(pet1.similar_type_pets).to eq([pet2])
104104
end
105105

106106
it "returns pets with similar names to the current pet" do
107-
pet1 = create(:pet, name: "Fido", age: 5, breed: "Golden Retriever", pet_type: "dog")
108-
pet2 = create(:pet, name: "Fido", age: 5, breed: "Labrador", pet_type: "cat")
107+
pet1 = create(:pet, name: "Fido", breed: "Golden Retriever", pet_type: "dog")
108+
pet2 = create(:pet, name: "Fido", breed: "Labrador", pet_type: "cat")
109109
expect(pet1.similiar_name_pets).to eq([pet2])
110110
end
111111

112112
it "returns most viewed pets" do
113-
pet1 = create(:pet, name: "Fido", age: 5, breed: "Golden Retriever", pet_type: "dog")
114-
pet2 = create(:pet, name: "Spot", age: 5, breed: "Golden Retriever", pet_type: "dog")
115-
pet3 = create(:pet, name: "Rover", age: 5, breed: "Golden Retriever", pet_type: "dog")
113+
pet1 = create(:pet, name: "Fido")
114+
pet2 = create(:pet, name: "Spot")
115+
pet3 = create(:pet, name: "Rover")
116116
PetView.create!(pet: pet1)
117117
PetView.create!(pet: pet1)
118118
PetView.create!(pet: pet2)

0 commit comments

Comments
 (0)