From 1154a3a6574102cc34a3de3395a3907f679b2b48 Mon Sep 17 00:00:00 2001 From: Jimmy Li Date: Tue, 16 Jul 2024 20:44:57 +0000 Subject: [PATCH 1/6] Rename factories so annotate gem will pick them up --- spec/factories/{donation_site.rb => donation_sites.rb} | 0 spec/factories/partners/{child.rb => children.rb} | 0 spec/factories/partners/{family.rb => families.rb} | 0 spec/factories/partners/{item_request.rb => item_requests.rb} | 0 spec/factories/partners/{profile.rb => profiles.rb} | 0 spec/factories/{product_drive.rb => product_drives.rb} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename spec/factories/{donation_site.rb => donation_sites.rb} (100%) rename spec/factories/partners/{child.rb => children.rb} (100%) rename spec/factories/partners/{family.rb => families.rb} (100%) rename spec/factories/partners/{item_request.rb => item_requests.rb} (100%) rename spec/factories/partners/{profile.rb => profiles.rb} (100%) rename spec/factories/{product_drive.rb => product_drives.rb} (100%) diff --git a/spec/factories/donation_site.rb b/spec/factories/donation_sites.rb similarity index 100% rename from spec/factories/donation_site.rb rename to spec/factories/donation_sites.rb diff --git a/spec/factories/partners/child.rb b/spec/factories/partners/children.rb similarity index 100% rename from spec/factories/partners/child.rb rename to spec/factories/partners/children.rb diff --git a/spec/factories/partners/family.rb b/spec/factories/partners/families.rb similarity index 100% rename from spec/factories/partners/family.rb rename to spec/factories/partners/families.rb diff --git a/spec/factories/partners/item_request.rb b/spec/factories/partners/item_requests.rb similarity index 100% rename from spec/factories/partners/item_request.rb rename to spec/factories/partners/item_requests.rb diff --git a/spec/factories/partners/profile.rb b/spec/factories/partners/profiles.rb similarity index 100% rename from spec/factories/partners/profile.rb rename to spec/factories/partners/profiles.rb diff --git a/spec/factories/product_drive.rb b/spec/factories/product_drives.rb similarity index 100% rename from spec/factories/product_drive.rb rename to spec/factories/product_drives.rb From e3993c639246f9950f278a8da6583cb6e301c7ec Mon Sep 17 00:00:00 2001 From: Jimmy Li Date: Tue, 16 Jul 2024 20:54:08 +0000 Subject: [PATCH 2/6] Lint and annotate factories --- spec/factories/donation_sites.rb | 17 +++++ spec/factories/partners/children.rb | 35 ++++++++-- spec/factories/partners/families.rb | 55 ++++++++++++---- spec/factories/partners/item_requests.rb | 15 +++++ spec/factories/partners/profiles.rb | 81 ++++++++++++++++++++++++ spec/factories/product_drives.rb | 13 ++++ 6 files changed, 195 insertions(+), 21 deletions(-) diff --git a/spec/factories/donation_sites.rb b/spec/factories/donation_sites.rb index 017bfc10d7..3470a4f487 100644 --- a/spec/factories/donation_sites.rb +++ b/spec/factories/donation_sites.rb @@ -1,3 +1,20 @@ +# == Schema Information +# +# Table name: donation_sites +# +# id :integer not null, primary key +# active :boolean default(TRUE) +# address :string +# contact_name :string +# email :string +# latitude :float +# longitude :float +# name :string +# phone :string +# created_at :datetime not null +# updated_at :datetime not null +# organization_id :integer +# FactoryBot.define do factory :donation_site do organization { Organization.try(:first) || create(:organization) } diff --git a/spec/factories/partners/children.rb b/spec/factories/partners/children.rb index ea035bf620..76329c7226 100644 --- a/spec/factories/partners/children.rb +++ b/spec/factories/partners/children.rb @@ -1,14 +1,35 @@ +# == Schema Information +# +# Table name: children +# +# id :bigint not null, primary key +# active :boolean default(TRUE) +# archived :boolean +# child_lives_with :jsonb +# comments :text +# date_of_birth :date +# first_name :string +# gender :string +# health_insurance :jsonb +# item_needed_diaperid :integer +# last_name :string +# race :jsonb +# created_at :datetime not null +# updated_at :datetime not null +# agency_child_id :string +# family_id :bigint +# FactoryBot.define do factory :partners_child, class: Partners::Child do association :family, factory: :partners_family - active { true } - archived { false } - comments { 'Comments ' } - date_of_birth { Time.zone.today - 5.years } - first_name { Faker::Name.first_name } - last_name { Faker::Name.last_name } - gender { Faker::Gender.binary_type } + active { true } + archived { false } + comments { "Comments " } + date_of_birth { Time.zone.today - 5.years } + first_name { Faker::Name.first_name } + last_name { Faker::Name.last_name } + gender { Faker::Gender.binary_type } requested_item_ids { [create(:item, organization: family.partner.organization).id] } end end diff --git a/spec/factories/partners/families.rb b/spec/factories/partners/families.rb index 2b2df19662..a565f642a1 100644 --- a/spec/factories/partners/families.rb +++ b/spec/factories/partners/families.rb @@ -1,22 +1,49 @@ +# == Schema Information +# +# Table name: families +# +# id :bigint not null, primary key +# archived :boolean default(FALSE) +# case_manager :string +# comments :text +# guardian_county :string +# guardian_employed :boolean +# guardian_employment_type :jsonb +# guardian_first_name :string +# guardian_health_insurance :jsonb +# guardian_last_name :string +# guardian_monthly_pay :decimal(, ) +# guardian_phone :string +# guardian_zip_code :string +# home_adult_count :integer +# home_child_count :integer +# home_young_child_count :integer +# military :boolean default(FALSE) +# sources_of_income :jsonb +# created_at :datetime not null +# updated_at :datetime not null +# old_partner_id :bigint +# partner_id :bigint +# FactoryBot.define do factory :partners_family, class: Partners::Family do association :partner - comments { Faker::Lorem.paragraph } + comments { Faker::Lorem.paragraph } # Faker doesn't have county, community is same flavour, we don't use it, and it is not country. - guardian_county { Faker::Address.community } - guardian_employed { false } - guardian_employment_type { nil } - guardian_first_name { Faker::Name.first_name } + guardian_county { Faker::Address.community } + guardian_employed { false } + guardian_employment_type { nil } + guardian_first_name { Faker::Name.first_name } guardian_health_insurance { nil } - guardian_last_name { Faker::Name.last_name } - guardian_monthly_pay { rand(500.0..2000.0).round(2) } - guardian_phone { Faker::PhoneNumber.phone_number_with_country_code } - guardian_zip_code { Faker::Address.zip } - home_adult_count { rand(1..5) } - home_child_count { rand(0..5) } - home_young_child_count { rand(0..5) } - military { false } - archived { false } + guardian_last_name { Faker::Name.last_name } + guardian_monthly_pay { rand(500.0..2000.0).round(2) } + guardian_phone { Faker::PhoneNumber.phone_number_with_country_code } + guardian_zip_code { Faker::Address.zip } + home_adult_count { rand(1..5) } + home_child_count { rand(0..5) } + home_young_child_count { rand(0..5) } + military { false } + archived { false } end end diff --git a/spec/factories/partners/item_requests.rb b/spec/factories/partners/item_requests.rb index 9c5ebbe393..df61db4d2e 100644 --- a/spec/factories/partners/item_requests.rb +++ b/spec/factories/partners/item_requests.rb @@ -1,3 +1,18 @@ +# == Schema Information +# +# Table name: item_requests +# +# id :bigint not null, primary key +# name :string +# partner_key :string +# quantity :string +# request_unit :string +# created_at :datetime not null +# updated_at :datetime not null +# item_id :integer +# old_partner_request_id :integer +# partner_request_id :bigint +# FactoryBot.define do factory :item_request, class: Partners::ItemRequest do item diff --git a/spec/factories/partners/profiles.rb b/spec/factories/partners/profiles.rb index 292100cb50..7b2e3f3500 100644 --- a/spec/factories/partners/profiles.rb +++ b/spec/factories/partners/profiles.rb @@ -1,3 +1,84 @@ +# == Schema Information +# +# Table name: partner_profiles +# +# id :bigint not null, primary key +# above_1_2_times_fpl :integer +# address1 :string +# address2 :string +# agency_mission :text +# agency_type :string +# application_data :text +# at_fpl_or_below :integer +# case_management :boolean +# city :string +# client_capacity :string +# currently_provide_diapers :boolean +# describe_storage_space :text +# distribution_times :string +# distributor_type :string +# enable_child_based_requests :boolean default(TRUE), not null +# enable_individual_requests :boolean default(TRUE), not null +# enable_quantity_based_requests :boolean default(TRUE), not null +# essentials_budget :string +# essentials_funding_source :string +# essentials_use :string +# evidence_based :boolean +# executive_director_email :string +# executive_director_name :string +# executive_director_phone :string +# facebook :string +# form_990 :boolean +# founded :integer +# greater_2_times_fpl :integer +# income_requirement_desc :boolean +# income_verification :boolean +# instagram :string +# more_docs_required :string +# name :string +# new_client_times :string +# no_social_media_presence :boolean +# other_agency_type :string +# partner_status :string default("pending") +# pick_up_email :string +# pick_up_name :string +# pick_up_phone :string +# population_american_indian :integer +# population_asian :integer +# population_black :integer +# population_hispanic :integer +# population_island :integer +# population_multi_racial :integer +# population_other :integer +# population_white :integer +# poverty_unknown :integer +# primary_contact_email :string +# primary_contact_mobile :string +# primary_contact_name :string +# primary_contact_phone :string +# program_address1 :string +# program_address2 :string +# program_age :string +# program_city :string +# program_description :text +# program_name :string +# program_state :string +# program_zip_code :integer +# receives_essentials_from_other :string +# sources_of_diapers :string +# sources_of_funding :string +# state :string +# status_in_diaper_base :string +# storage_space :boolean +# twitter :string +# website :string +# zip_code :string +# zips_served :string +# created_at :datetime not null +# updated_at :datetime not null +# essentials_bank_id :bigint +# partner_id :integer +# FactoryBot.define do factory :partner_profile, class: Partners::Profile do partner { Partner.first || create(:partner) } diff --git a/spec/factories/product_drives.rb b/spec/factories/product_drives.rb index fe89886e48..95b16c65d1 100644 --- a/spec/factories/product_drives.rb +++ b/spec/factories/product_drives.rb @@ -1,3 +1,16 @@ +# == Schema Information +# +# Table name: product_drives +# +# id :bigint not null, primary key +# end_date :date +# name :string +# start_date :date +# virtual :boolean default(FALSE), not null +# created_at :datetime not null +# updated_at :datetime not null +# organization_id :bigint +# FactoryBot.define do factory :product_drive do name { "Test Drive" } From a78ec75662128fb97e637963b2a5b1aebd318c7c Mon Sep 17 00:00:00 2001 From: Jimmy Li Date: Tue, 16 Jul 2024 20:38:07 +0000 Subject: [PATCH 3/6] Merge partner user factories into one --- spec/factories/partner_user.rb | 16 ---------------- spec/factories/partners/user.rb | 16 ---------------- spec/factories/users.rb | 16 ++++++++++++++++ spec/mailers/custom_devise_mailer_spec.rb | 6 +++--- spec/models/distribution_spec.rb | 2 +- spec/models/users_role_spec.rb | 8 ++++---- spec/requests/sessions_requests_spec.rb | 2 +- spec/requests/users_requests_spec.rb | 2 +- 8 files changed, 26 insertions(+), 42 deletions(-) delete mode 100644 spec/factories/partner_user.rb delete mode 100644 spec/factories/partners/user.rb diff --git a/spec/factories/partner_user.rb b/spec/factories/partner_user.rb deleted file mode 100644 index 7c719c7088..0000000000 --- a/spec/factories/partner_user.rb +++ /dev/null @@ -1,16 +0,0 @@ -FactoryBot.define do - factory :partner_user, class: ::User do - name { "Partner User" } - sequence(:email) { |n| "partner___user_#{n}@example.com" } - password { "password!" } - password_confirmation { "password!" } - invitation_sent_at { Time.current - 1.day } - last_sign_in_at { Time.current } - transient do - partner { Partner.first || create(:partner) } - end - after(:create) do |user, evaluator| - user.add_role(Role::PARTNER, evaluator.partner) - end - end -end diff --git a/spec/factories/partners/user.rb b/spec/factories/partners/user.rb deleted file mode 100644 index 26cd34591c..0000000000 --- a/spec/factories/partners/user.rb +++ /dev/null @@ -1,16 +0,0 @@ -FactoryBot.define do - factory :partners_user, class: ::User do - name { "Partner User" } - sequence(:email) { |n| "partner_user_#{n}@example.com" } - password { "password!" } - password_confirmation { "password!" } - invitation_sent_at { Time.current - 1.day } - last_sign_in_at { Time.current } - transient do - partner { Partner.first || create(:partner) } - end - after(:create) do |instance, evaluator| - instance.add_role(Role::PARTNER, evaluator.partner) - end - end -end diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 5da60b25ce..6fd0a28ac2 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -51,6 +51,22 @@ end end + factory :partners_user do + name { "Partner User" } + sequence(:email) { |n| "partner_user_#{n}@example.com" } + password { "password!" } + password_confirmation { "password!" } + invitation_sent_at { Time.current - 1.day } + last_sign_in_at { Time.current } + organization { nil } + transient do + partner { Partner.first || create(:partner) } + end + after(:create) do |instance, evaluator| + instance.add_role(Role::PARTNER, evaluator.partner) + end + end + factory :organization_admin do name { "Very Organized Admin" } after(:create) do |user, evaluator| diff --git a/spec/mailers/custom_devise_mailer_spec.rb b/spec/mailers/custom_devise_mailer_spec.rb index cf497921c2..3aa6848039 100644 --- a/spec/mailers/custom_devise_mailer_spec.rb +++ b/spec/mailers/custom_devise_mailer_spec.rb @@ -1,6 +1,6 @@ RSpec.describe CustomDeviseMailer, type: :mailer do describe "#invitation_instructions" do - let(:user) { create(:partner_user) } + let(:user) { create(:partners_user) } let(:mail) { described_class.invitation_instructions(user, SecureRandom.uuid) } context "when partner is invited" do @@ -12,7 +12,7 @@ end let(:user) do - create(:partner_user, partner: partner) + create(:partners_user, partner: partner) end it "invites to primary user" do @@ -23,7 +23,7 @@ context "when other partner users invited" do let(:partner) { create(:partner) } - let(:user) { create(:partner_user, partner: partner) } + let(:user) { create(:partners_user, partner: partner) } it "invites to partner user" do expect(mail.subject).to eq("You've been invited to #{user.partner.name}'s Human Essentials account") diff --git a/spec/models/distribution_spec.rb b/spec/models/distribution_spec.rb index bd47938136..025c07fc74 100644 --- a/spec/models/distribution_spec.rb +++ b/spec/models/distribution_spec.rb @@ -250,7 +250,7 @@ item2 = create(:item, name: "Item2", organization: organization) request = create(:request, organization: organization, - partner_user: create(:partner_user), + partner_user: create(:partners_user), request_items: [ { item_id: item1.id, quantity: 15 }, { item_id: item2.id, quantity: 18 } diff --git a/spec/models/users_role_spec.rb b/spec/models/users_role_spec.rb index af0a6add7c..f9b3b07eb0 100644 --- a/spec/models/users_role_spec.rb +++ b/spec/models/users_role_spec.rb @@ -32,14 +32,14 @@ context "for partner user" do it "should return partner user" do - user = create(:partner_user) + user = create(:partners_user) expect(UsersRole.current_role_for(user).name).to eq("partner") end end end context "when last_role is not nil" do it "should return last role" do - user = create(:partner_user) + user = create(:partners_user) UsersRole.set_last_role_for(user, user.roles.last) @@ -52,7 +52,7 @@ describe "#set_last_role_for" do context "when user has the role" do it "should set last role" do - user = create(:partner_user) + user = create(:partners_user) role = user.roles.first UsersRole.set_last_role_for(user, role) @@ -63,7 +63,7 @@ context "when user does not have the role" do it "should not set last role" do - user = create(:partner_user) + user = create(:partners_user) role = Role.find_by(name: "org_user") UsersRole.set_last_role_for(user, role) diff --git a/spec/requests/sessions_requests_spec.rb b/spec/requests/sessions_requests_spec.rb index b3688c29a2..e65661820c 100644 --- a/spec/requests/sessions_requests_spec.rb +++ b/spec/requests/sessions_requests_spec.rb @@ -23,7 +23,7 @@ end describe "POST #create" do - let(:partner_user) { create(:partner_user) } + let(:partner_user) { create(:partners_user) } let(:partner_role) { partner_user.roles.first } let(:organization) { create(:organization) } diff --git a/spec/requests/users_requests_spec.rb b/spec/requests/users_requests_spec.rb index cf5bd3aeed..fa622ddbfa 100644 --- a/spec/requests/users_requests_spec.rb +++ b/spec/requests/users_requests_spec.rb @@ -25,7 +25,7 @@ describe "POST #send_partner_user_reset_password" do let(:partner) { create(:partner, organization: organization) } - let!(:user) { create(:partner_user, partner: partner, email: "me@partner.com") } + let!(:user) { create(:partners_user, partner: partner, email: "me@partner.com") } let(:params) { { organization_name: organization.short_name, partner_id: partner.id, email: "me@partner.com" } } it "should send a password" do From a3316f2252e1e2b1f43f1cb6cbc8006542b4b34e Mon Sep 17 00:00:00 2001 From: Jimmy Li Date: Thu, 18 Jul 2024 01:15:24 +0000 Subject: [PATCH 4/6] Drop partner_users table * Commit [838d511](https://github.com/rubyforgood/human-essentials/commit/838d511f010e514f1f0bd6ea370e65c7c41949ae) merged partner users into user table, this table can be dropped --- ...20240718010905_drop_partner_users_table.rb | 9 +++++ db/schema.rb | 34 +------------------ 2 files changed, 10 insertions(+), 33 deletions(-) create mode 100644 db/migrate/20240718010905_drop_partner_users_table.rb diff --git a/db/migrate/20240718010905_drop_partner_users_table.rb b/db/migrate/20240718010905_drop_partner_users_table.rb new file mode 100644 index 0000000000..4cfba2a386 --- /dev/null +++ b/db/migrate/20240718010905_drop_partner_users_table.rb @@ -0,0 +1,9 @@ +class DropPartnerUsersTable < ActiveRecord::Migration[7.1] + def up + drop_table :partner_users + + end + def down + fail ActiveRecord::IrreversibleMigration + end +end diff --git a/db/schema.rb b/db/schema.rb index 8cf2594a08..6a53060939 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.1].define(version: 2024_07_04_214509) do +ActiveRecord::Schema[7.1].define(version: 2024_07_18_010905) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -630,38 +630,6 @@ t.index ["partner_profile_id"], name: "index_partner_served_areas_on_partner_profile_id" end - create_table "partner_users", force: :cascade do |t| - t.string "email", default: "", null: false - t.string "encrypted_password", default: "", null: false - t.string "reset_password_token" - t.datetime "reset_password_sent_at", precision: nil - t.datetime "remember_created_at", precision: nil - t.integer "sign_in_count", default: 0, null: false - t.datetime "current_sign_in_at", precision: nil - t.datetime "last_sign_in_at", precision: nil - t.inet "current_sign_in_ip" - t.inet "last_sign_in_ip" - t.datetime "created_at", precision: nil, null: false - t.datetime "updated_at", precision: nil, null: false - t.string "invitation_token" - t.datetime "invitation_created_at", precision: nil - t.datetime "invitation_sent_at", precision: nil - t.datetime "invitation_accepted_at", precision: nil - t.integer "invitation_limit" - t.string "invited_by_type" - t.bigint "invited_by_id" - t.integer "invitations_count", default: 0 - t.bigint "partner_id" - t.string "name" - t.index ["email"], name: "index_partner_users_on_email", unique: true - t.index ["invitation_token"], name: "index_partner_users_on_invitation_token", unique: true - t.index ["invitations_count"], name: "index_partner_users_on_invitations_count" - t.index ["invited_by_id"], name: "index_partner_users_on_invited_by_id" - t.index ["invited_by_type", "invited_by_id"], name: "index_partner_users_on_invited_by" - t.index ["partner_id"], name: "index_partner_users_on_partner_id" - t.index ["reset_password_token"], name: "index_partner_users_on_reset_password_token", unique: true - end - create_table "partners", id: :serial, force: :cascade do |t| t.string "name" t.string "email" From 1d686be01b9d12ba682259a9dd6a99b525fa9c5f Mon Sep 17 00:00:00 2001 From: Jimmy Li Date: Thu, 18 Jul 2024 01:19:21 +0000 Subject: [PATCH 5/6] update bundler version --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index facf9953d0..7f56e1600b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -781,4 +781,4 @@ DEPENDENCIES webmock (~> 3.23) BUNDLED WITH - 2.5.14 + 2.5.15 From 7fb4bd64e7ffc66dc3aea3d9b23c008d46d62d7f Mon Sep 17 00:00:00 2001 From: Jimmy Li Date: Wed, 31 Jul 2024 02:51:29 +0000 Subject: [PATCH 6/6] Rename partners_user to partner_user --- spec/controllers/application_controller_spec.rb | 4 ++-- spec/factories/partners.rb | 2 +- spec/factories/requests.rb | 2 +- spec/factories/users.rb | 2 +- spec/mailers/custom_devise_mailer_spec.rb | 6 +++--- spec/models/distribution_spec.rb | 2 +- spec/models/partner_spec.rb | 2 +- spec/models/users_role_spec.rb | 8 ++++---- spec/requests/sessions_requests_spec.rb | 2 +- spec/requests/users_requests_spec.rb | 2 +- spec/system/sign_in_system_spec.rb | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index 54775e99d9..3ff2f7af64 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -8,7 +8,7 @@ end context "As a partner user" do - let(:user) { create(:partners_user) } + let(:user) { create(:partner_user) } it "should return nil" do expect(controller.current_organization).to eq(nil) end @@ -52,7 +52,7 @@ context "As a partner user" do let(:partner) { create(:partner, organization: organization) } let(:partner2) { create(:partner, organization: organization) } - let(:user) { create(:partners_user, partner: partner) } + let(:user) { create(:partner_user, partner: partner) } before(:each) do user.add_role(Role::PARTNER, partner2) # add a second role end diff --git a/spec/factories/partners.rb b/spec/factories/partners.rb index 64812a6762..ba34f27bbe 100644 --- a/spec/factories/partners.rb +++ b/spec/factories/partners.rb @@ -45,7 +45,7 @@ # Create associated records create(:partner_profile, partner_id: partner.id) - create(:partners_user, email: partner.email, name: partner.name, partner: partner) + create(:partner_user, email: partner.email, name: partner.name, partner: partner) end end end diff --git a/spec/factories/requests.rb b/spec/factories/requests.rb index e8a28128d8..da52db3f6d 100644 --- a/spec/factories/requests.rb +++ b/spec/factories/requests.rb @@ -27,7 +27,7 @@ def random_request_items organization { Organization.try(:first) || create(:organization, :with_items) } request_items { random_request_items } comments { "Urgent" } - partner_user { ::User.partner_users.first || create(:partners_user) } + partner_user { ::User.partner_users.first || create(:partner_user) } end trait :started do diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 6fd0a28ac2..2438dcfcec 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -51,7 +51,7 @@ end end - factory :partners_user do + factory :partner_user do name { "Partner User" } sequence(:email) { |n| "partner_user_#{n}@example.com" } password { "password!" } diff --git a/spec/mailers/custom_devise_mailer_spec.rb b/spec/mailers/custom_devise_mailer_spec.rb index 3aa6848039..cf497921c2 100644 --- a/spec/mailers/custom_devise_mailer_spec.rb +++ b/spec/mailers/custom_devise_mailer_spec.rb @@ -1,6 +1,6 @@ RSpec.describe CustomDeviseMailer, type: :mailer do describe "#invitation_instructions" do - let(:user) { create(:partners_user) } + let(:user) { create(:partner_user) } let(:mail) { described_class.invitation_instructions(user, SecureRandom.uuid) } context "when partner is invited" do @@ -12,7 +12,7 @@ end let(:user) do - create(:partners_user, partner: partner) + create(:partner_user, partner: partner) end it "invites to primary user" do @@ -23,7 +23,7 @@ context "when other partner users invited" do let(:partner) { create(:partner) } - let(:user) { create(:partners_user, partner: partner) } + let(:user) { create(:partner_user, partner: partner) } it "invites to partner user" do expect(mail.subject).to eq("You've been invited to #{user.partner.name}'s Human Essentials account") diff --git a/spec/models/distribution_spec.rb b/spec/models/distribution_spec.rb index 025c07fc74..bd47938136 100644 --- a/spec/models/distribution_spec.rb +++ b/spec/models/distribution_spec.rb @@ -250,7 +250,7 @@ item2 = create(:item, name: "Item2", organization: organization) request = create(:request, organization: organization, - partner_user: create(:partners_user), + partner_user: create(:partner_user), request_items: [ { item_id: item1.id, quantity: 15 }, { item_id: item2.id, quantity: 18 } diff --git a/spec/models/partner_spec.rb b/spec/models/partner_spec.rb index 4db7acd523..c16921d568 100644 --- a/spec/models/partner_spec.rb +++ b/spec/models/partner_spec.rb @@ -161,7 +161,7 @@ context 'when it has a profile and users' do it 'should return false' do create(:partner_profile, partner_id: partner.id) - create(:partners_user, email: partner.email, name: partner.name, partner: partner) + create(:partner_user, email: partner.email, name: partner.name, partner: partner) expect(partner.reload).not_to be_deletable end end diff --git a/spec/models/users_role_spec.rb b/spec/models/users_role_spec.rb index f9b3b07eb0..af0a6add7c 100644 --- a/spec/models/users_role_spec.rb +++ b/spec/models/users_role_spec.rb @@ -32,14 +32,14 @@ context "for partner user" do it "should return partner user" do - user = create(:partners_user) + user = create(:partner_user) expect(UsersRole.current_role_for(user).name).to eq("partner") end end end context "when last_role is not nil" do it "should return last role" do - user = create(:partners_user) + user = create(:partner_user) UsersRole.set_last_role_for(user, user.roles.last) @@ -52,7 +52,7 @@ describe "#set_last_role_for" do context "when user has the role" do it "should set last role" do - user = create(:partners_user) + user = create(:partner_user) role = user.roles.first UsersRole.set_last_role_for(user, role) @@ -63,7 +63,7 @@ context "when user does not have the role" do it "should not set last role" do - user = create(:partners_user) + user = create(:partner_user) role = Role.find_by(name: "org_user") UsersRole.set_last_role_for(user, role) diff --git a/spec/requests/sessions_requests_spec.rb b/spec/requests/sessions_requests_spec.rb index e65661820c..b3688c29a2 100644 --- a/spec/requests/sessions_requests_spec.rb +++ b/spec/requests/sessions_requests_spec.rb @@ -23,7 +23,7 @@ end describe "POST #create" do - let(:partner_user) { create(:partners_user) } + let(:partner_user) { create(:partner_user) } let(:partner_role) { partner_user.roles.first } let(:organization) { create(:organization) } diff --git a/spec/requests/users_requests_spec.rb b/spec/requests/users_requests_spec.rb index fa622ddbfa..cf5bd3aeed 100644 --- a/spec/requests/users_requests_spec.rb +++ b/spec/requests/users_requests_spec.rb @@ -25,7 +25,7 @@ describe "POST #send_partner_user_reset_password" do let(:partner) { create(:partner, organization: organization) } - let!(:user) { create(:partners_user, partner: partner, email: "me@partner.com") } + let!(:user) { create(:partner_user, partner: partner, email: "me@partner.com") } let(:params) { { organization_name: organization.short_name, partner_id: partner.id, email: "me@partner.com" } } it "should send a password" do diff --git a/spec/system/sign_in_system_spec.rb b/spec/system/sign_in_system_spec.rb index f76b9ed210..f6f64b9c95 100644 --- a/spec/system/sign_in_system_spec.rb +++ b/spec/system/sign_in_system_spec.rb @@ -31,7 +31,7 @@ context 'when a partner user logs in' do it 'redirects to the partner page' do partner = create(:partner) - partner_user = create(:partners_user, partner: partner) + partner_user = create(:partner_user, partner: partner) fill_in "Email", with: partner_user.email fill_in "user_password", with: partner_user.password click_button "Log in"