Rename factories and traits

factories/passport_confirmations.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :passport_confirmation do
-    association :passport, factory: :passport_with_passport_map_and_image
+    association :passport, factory: :passport_with_map_and_image
     association :account,  factory: :usual_account
   end
 end

factories/passports.rb

@@ -6,7 +6,7 @@ FactoryBot.define do
 
     confirmed { false }
 
-    trait :with_passport_map do
+    trait :with_map do
       after :create do |passport, _evaluator|
         create :passport_map, passport: passport
       end
@@ -29,17 +29,17 @@ FactoryBot.define do
     end
   end
 
-  factory :passport_with_passport_map,
+  factory :passport_with_map,
           parent: :empty_passport,
-          traits: %i[with_passport_map]
+          traits: %i[with_map]
 
   factory :passport_with_image,
           parent: :empty_passport,
           traits: %i[with_image]
 
-  factory :passport_with_passport_map_and_image,
+  factory :passport_with_map_and_image,
           parent: :empty_passport,
-          traits: %i[with_passport_map with_image] do
+          traits: %i[with_map with_image] do
     trait :with_almost_enough_confirmations do
       after :create do |passport, _evaluator|
         create_list :passport_confirmation,
@@ -58,11 +58,11 @@ FactoryBot.define do
   end
 
   factory :passport_with_almost_enough_confirmations,
-          parent: :passport_with_passport_map_and_image,
+          parent: :passport_with_map_and_image,
           traits: %i[with_almost_enough_confirmations]
 
   factory :passport_with_enough_confirmations,
-          parent: :passport_with_passport_map_and_image,
+          parent: :passport_with_map_and_image,
           traits: %i[with_enough_confirmations]
 
   factory :confirmed_passport, parent: :passport_with_enough_confirmations do

spec/interactors/confirm_passport_spec.rb

@@ -5,7 +5,7 @@ require 'rails_helper'
 RSpec.describe ConfirmPassport do
   subject { described_class.call passport: passport, account: account }
 
-  let!(:passport) { create :passport_with_passport_map_and_image }
+  let!(:passport) { create :passport_with_map_and_image }
   let!(:account) { create :usual_account }
 
   specify do
@@ -51,7 +51,7 @@ RSpec.describe ConfirmPassport do
   end
 
   context 'when passport has a passport map' do
-    let!(:passport) { create :passport_with_passport_map }
+    let!(:passport) { create :passport_with_map }
 
     specify do
       expect(subject).to be_failure
@@ -83,7 +83,7 @@ RSpec.describe ConfirmPassport do
   end
 
   context 'when passport has a passport map and an image' do
-    let!(:passport) { create :passport_with_passport_map_and_image }
+    let!(:passport) { create :passport_with_map_and_image }
 
     specify do
       expect { subject }.to \

spec/models/passport_confirmation_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe PassportConfirmation do
 
   it do
     is_expected.not_to \
-      allow_value(create(:passport_with_passport_map)).for :passport
+      allow_value(create(:passport_with_map)).for :passport
   end
 
   it do
@@ -29,7 +29,7 @@ RSpec.describe PassportConfirmation do
 
   it do
     is_expected.to \
-      allow_value(create(:passport_with_passport_map_and_image)).for :passport
+      allow_value(create(:passport_with_map_and_image)).for :passport
   end
 
   it do

spec/models/passport_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe Passport do
     end
 
     context 'when passport has passport map' do
-      subject { create :passport_with_passport_map }
+      subject { create :passport_with_map }
 
       it { is_expected.to allow_value false }
       it { is_expected.not_to allow_value true }
@@ -51,7 +51,7 @@ RSpec.describe Passport do
     end
 
     context 'when passport has passport map and image' do
-      subject { create :passport_with_passport_map_and_image }
+      subject { create :passport_with_map_and_image }
 
       it { is_expected.to allow_value false }
       it { is_expected.not_to allow_value true }

spec/requests/staff/passports/index_spec.rb

@@ -5,9 +5,9 @@ require 'rails_helper'
 RSpec.describe 'GET /staff/passports' do
   before do
     create :empty_passport
-    create :passport_with_passport_map
+    create :passport_with_map
     create :passport_with_image
-    create :passport_with_passport_map_and_image
+    create :passport_with_map_and_image
     create :passport_with_almost_enough_confirmations
     create :passport_with_enough_confirmations
     create :confirmed_passport

spec/requests/staff/passports/passport_confirmations/create_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.xdescribe 'POST /staff/passports/:passport_id/passport_confirmations' do
-  let!(:passport) { create :passport_with_passport_map_and_image }
+  let!(:passport) { create :passport_with_map_and_image }
 
   def make_request
     post "/staff/passports/#{passport.id}/passport_confirmations"
@@ -83,7 +83,7 @@ RSpec.xdescribe 'POST /staff/passports/:passport_id/passport_confirmations' do
   end
 
   context 'when passport has passport map' do
-    let!(:passport) { create :passport_with_passport_map }
+    let!(:passport) { create :passport_with_map }
 
     let(:current_account) { create :usual_account }
 
@@ -141,7 +141,7 @@ RSpec.xdescribe 'POST /staff/passports/:passport_id/passport_confirmations' do
   end
 
   context 'when passport has passport map and image' do
-    let!(:passport) { create :passport_with_passport_map_and_image }
+    let!(:passport) { create :passport_with_map_and_image }
 
     let(:current_account) { create :usual_account }
 

spec/requests/staff/passports/passport_confirmations/index_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe 'GET /staff/passports/:passport_id/passport_confirmations' do
-  let!(:passport) { create :passport_with_passport_map_and_image }
+  let!(:passport) { create :passport_with_map_and_image }
   let(:current_account) { create :usual_account }
 
   def make_request
@@ -30,7 +30,7 @@ RSpec.describe 'GET /staff/passports/:passport_id/passport_confirmations' do
   end
 
   context 'when passport has passport map' do
-    let!(:passport) { create :passport_with_passport_map }
+    let!(:passport) { create :passport_with_map }
 
     specify do
       expect(response).to have_http_status :ok
@@ -46,7 +46,7 @@ RSpec.describe 'GET /staff/passports/:passport_id/passport_confirmations' do
   end
 
   context 'when passport has passport map and image' do
-    let!(:passport) { create :passport_with_passport_map_and_image }
+    let!(:passport) { create :passport_with_map_and_image }
 
     specify do
       expect(response).to have_http_status :ok

spec/requests/staff/passports/show_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'GET /staff/passports/:id' do
   end
 
   context 'when passport has a passport map' do
-    let!(:passport) { create :passport_with_passport_map }
+    let!(:passport) { create :passport_with_map }
 
     specify do
       expect(response).to have_http_status :ok
@@ -46,7 +46,7 @@ RSpec.describe 'GET /staff/passports/:id' do
   end
 
   context 'when passport has a passport map and an image' do
-    let!(:passport) { create :passport_with_passport_map_and_image }
+    let!(:passport) { create :passport_with_map_and_image }
 
     specify do
       expect(response).to have_http_status :ok

spec/requests/staff/people/passports/index_spec.rb

@@ -9,9 +9,9 @@ RSpec.describe 'GET /staff/people/:person_id/passports' do
     sign_in current_account.user if current_account&.user
 
     create :empty_passport,                            person: person
-    create :passport_with_passport_map,                person: person
+    create :passport_with_map,                         person: person
     create :passport_with_image,                       person: person
-    create :passport_with_passport_map_and_image,      person: person
+    create :passport_with_map_and_image,               person: person
     create :passport_with_almost_enough_confirmations, person: person
     create :passport_with_enough_confirmations,        person: person
     create :confirmed_passport,                        person: person