Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename fixtures associated with org_dogs_test integration test file #156

Merged
merged 17 commits into from
Jun 4, 2023
Merged

Rename fixtures associated with org_dogs_test integration test file #156

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d1ac2db
rename user_one fixture to adopter_with_profile
Eduardo06sp May 25, 2023
7196915
rename user_two fixture to verified_staff_one
Eduardo06sp May 25, 2023
5147c98
rename user_three fixture to unverified_staff
Eduardo06sp May 26, 2023
b21ad0d
rename user_four fixture to adopter_without_profile
Eduardo06sp May 26, 2023
4f0083a
rename user_five fixture to verified_staff_two
Eduardo06sp May 26, 2023
296b332
rename dog_one fixture to pending_adoption_one
Eduardo06sp May 29, 2023
8a41062
rename dog_two fixture to adopted_dog
Eduardo06sp May 29, 2023
bec0a6a
rename dog_three fixture to one
Eduardo06sp May 29, 2023
a7f31e2
rename dog_four fixture to paused_application
Eduardo06sp May 29, 2023
93873cc
rename dog_five fixture to pending_adoption_two
Eduardo06sp May 29, 2023
2aa699b
remove irrelevant comments from dogs fixture file
Eduardo06sp May 29, 2023
5765dea
rename organization_three fixture to unverified_staff_default
Eduardo06sp May 29, 2023
f948dcc
remove organization_two fixture and add ID to unverified_staff_defaul…
Eduardo06sp May 29, 2023
630872b
rename organization_one fixture to one
Eduardo06sp May 29, 2023
115f952
remove unnecessary comment from organizations fixture file
Eduardo06sp May 29, 2023
6916efb
remove unused fixture files
Eduardo06sp May 29, 2023
cefd9b5
remove unnecessary comments from fixture files
Eduardo06sp May 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions test/fixtures/dogs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html

one:
organization: organization_one
organization: one
Eduardo06sp marked this conversation as resolved.
Show resolved Hide resolved
name: Applications
age: 4
breed: mix
application_paused: false

pending_adoption_one:
organization: organization_one
organization: one
name: Deleted
age: 5
breed: mix
application_paused: false

adopted_dog:
organization: organization_one
organization: one
name: Adopted
age: 4
breed: mix
application_paused: false

paused_application:
Eduardo06sp marked this conversation as resolved.
Show resolved Hide resolved
organization: organization_one
organization: one
name: Paused
age: 4
breed: mix
application_paused: true

pending_adoption_two:
Eduardo06sp marked this conversation as resolved.
Show resolved Hide resolved
organization: organization_one
organization: one
name: AppTest
age: 4
breed: mix
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/organizations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html

organization_one:
one:
name: test
city: testville
country: testistan
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/staff_accounts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
staff_account_one:
user: verified_staff_one
Eduardo06sp marked this conversation as resolved.
Show resolved Hide resolved
organization: organization_one
organization: one
verified: true

staff_account_two:
Expand All @@ -16,7 +16,7 @@ staff_account_two:

staff_account_three:
user: verified_staff_two
organization: organization_one
organization: one
verified: true

# two: {}
Expand Down
4 changes: 2 additions & 2 deletions test/integration/adoptable_dog_show_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class AdoptableDogShowTest < ActionDispatch::IntegrationTest
put "/dogs/#{@dog_id}",
params: { dog:
{
organization_id: "#{organizations(:organization_one).id}",
organization_id: "#{organizations(:one).id}",
name: 'TestDog',
age: '7',
sex: 'Female',
Expand All @@ -73,7 +73,7 @@ class AdoptableDogShowTest < ActionDispatch::IntegrationTest
put "/dogs/#{@dog_id}",
params: { dog:
{
organization_id: "#{organizations(:organization_one).id}",
organization_id: "#{organizations(:one).id}",
name: 'TestDog',
age: '7',
sex: 'Female',
Expand Down
16 changes: 8 additions & 8 deletions test/integration/org_dogs_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class OrgDogsTest < ActionDispatch::IntegrationTest
post "/dogs",
params: { dog:
{
organization_id: "#{organizations(:organization_one).id}",
organization_id: "#{organizations(:one).id}",
name: 'TestDog',
age: '3',
sex: 'Female',
Expand Down Expand Up @@ -69,7 +69,7 @@ class OrgDogsTest < ActionDispatch::IntegrationTest
post "/dogs",
params: { dog:
{
organization_id: "#{organizations(:organization_one).id}",
organization_id: "#{organizations(:one).id}",
name: 'TestDog',
age: '3',
sex: 'Female',
Expand All @@ -92,7 +92,7 @@ class OrgDogsTest < ActionDispatch::IntegrationTest
patch "/dogs/#{@dog.id}",
params: { dog:
{
organization_id: "#{organizations(:organization_one).id}",
organization_id: "#{organizations(:one).id}",
name: 'TestDog',
age: '7',
sex: 'Female',
Expand All @@ -115,7 +115,7 @@ class OrgDogsTest < ActionDispatch::IntegrationTest
patch "/dogs/#{@dog.id}",
params: { dog:
{
organization_id: "#{organizations(:organization_one).id}",
organization_id: "#{organizations(:one).id}",
name: 'TestDog',
age: '7',
sex: 'Female',
Expand Down Expand Up @@ -144,7 +144,7 @@ class OrgDogsTest < ActionDispatch::IntegrationTest
patch "/dogs/#{@dog.id}",
params: { dog:
{
organization_id: "#{organizations(:organization_one).id}",
organization_id: "#{organizations(:one).id}",
name: 'TestDog',
age: '7',
sex: 'Female',
Expand All @@ -166,7 +166,7 @@ class OrgDogsTest < ActionDispatch::IntegrationTest
patch "/dogs/#{@dog.id}",
params: { dog:
{
organization_id: "#{organizations(:organization_one).id}",
organization_id: "#{organizations(:one).id}",
name: 'TestDog',
age: '7',
sex: 'Female',
Expand All @@ -192,7 +192,7 @@ class OrgDogsTest < ActionDispatch::IntegrationTest
patch "/dogs/#{@dog.id}",
params: { dog:
{
organization_id: "#{organizations(:organization_one).id}",
organization_id: "#{organizations(:one).id}",
name: 'TestDog',
age: '7',
sex: 'Female',
Expand Down Expand Up @@ -228,7 +228,7 @@ class OrgDogsTest < ActionDispatch::IntegrationTest
patch "/dogs/#{@dog.id}",
params: { dog:
{
organization_id: "#{organizations(:organization_one).id}",
organization_id: "#{organizations(:one).id}",
name: 'TestDog',
age: '7',
sex: 'Female',
Expand Down