From 90a19af2526d8b478c8bdfbcdb40592bb941a8a5 Mon Sep 17 00:00:00 2001 From: Patryk Date: Fri, 23 Oct 2020 09:48:53 +0200 Subject: [PATCH] Revert "Add space force and coast guard to military (#2136)" This reverts commit b4a9fb054af4514ef8877b631e255432f112cac1. --- doc/default/military.md | 4 - lib/faker/default/military.rb | 26 --- lib/locales/en/military.yml | 184 +--------------------- test/faker/default/test_faker_military.rb | 8 - 4 files changed, 5 insertions(+), 217 deletions(-) diff --git a/doc/default/military.md b/doc/default/military.md index 5fdbc57bdd..d38352234e 100644 --- a/doc/default/military.md +++ b/doc/default/military.md @@ -9,9 +9,5 @@ Faker::Military.navy_rank #=> "Seaman" Faker::Military.air_force_rank #=> "Captain" -Faker::Military.space_force_rank #=> "Senior Enlisted Advisor of the Space Force" - -Faker::Military.coast_guard_rank #=> "Master Chief Petty Officer of the Coast Guard" - Faker::Military.dod_paygrade #=> "E-6" ``` diff --git a/lib/faker/default/military.rb b/lib/faker/default/military.rb index cea829dc85..ecdf44cc9a 100644 --- a/lib/faker/default/military.rb +++ b/lib/faker/default/military.rb @@ -55,32 +55,6 @@ def air_force_rank fetch('military.air_force_rank') end - ## - # Produces a rank in the U.S. Space Force. - # - # @return [String] - # - # @example - # Faker::Military.space_force_rank #=> "Senior Enlisted Advisor of the Space Force" - # - # @faker.version next - def space_force_rank - fetch('military.space_force_rank') - end - - ## - # Produces a rank in the U.S. Coast Guard - # - # @return [String] - # - # @example - # Faker::Military.coast_guard_rank #=> "Master Chief Petty Officer of the Coast Guard" - # - # @faker.version next - def coast_guard_rank - fetch('military.coast_guard_rank') - end - ## # Produces a U.S. Department of Defense Paygrade. # diff --git a/lib/locales/en/military.yml b/lib/locales/en/military.yml index 5f3795389c..ac0a6cfc57 100644 --- a/lib/locales/en/military.yml +++ b/lib/locales/en/military.yml @@ -1,182 +1,8 @@ en: faker: military: - army_rank: - - Private - - Private First Class - - Specialist - - Corporal - - Sergeant - - Staff Sergeant - - Sergeant First Class - - Master Sergeant - - First Sergeant - - Sergeant Major - - Command Sergeant Major - - Sergeant Major of the Army - - Second Lieutenant - - First Lieutenant - - Captain - - Major - - Lieutenant Colonel - - Colonel - - Brigadier General - - Major General - - Lieutenant General - - General - - General of the Army - - General of the Armies - marines_rank: - - Private - - Private First Class - - Lance Corporal - - Corporal - - Sergeant - - Staff Sergeant - - Gunnery Sergeant - - Master Sergeant - - First Sergeant - - Master Gunnery Sergeant - - Sergeant Major - - Sergeant Major of the Marine Corps - - Second Lieutenant - - First Lieutenant - - Captain - - Major - - Lieutenant Colonel - - Colonel - - Brigadier General - - Major General - - Lieutenant General - - General - navy_rank: - - Seaman Recruit - - Fireman Recruit - - Airman Recruit - - Constructionman Recruit - - Seaman Apprentice - - Fireman Apprentice - - Airman Apprentice - - Constructionman Apprentice - - Seaman - - Fireman - - Airman - - Constructionman - - Petty Officer Third Class - - Petty Officer Second Class - - Petty Officer First Class - - Chief Petty Officer - - Senior Chief Petty Officer - - Command Senior Chief Petty Officer - - Master Chief Petty Officer - - Command Master Chief Petty Officer - - Fleet Master Chief Petty Officer - - Force Master Chief Petty Officer - - Master Chief Petty Officer of the Navy - - Ensign - - Lieutenant - - Lieutenant Commander - - Commander - - Captain - - Rear Admiral - - Vice Admiral - - Admiral - - Fleet Admiral - - Admiral of the Navy - coast_guard_rank: - - Seaman Recruit - - Seaman Apprentice - - Seaman - - Petty Officer Third Class - - Petty Officer Second Class - - Petty Officer First Class - - Chief Petty Officer - - Senior Chief Petty Officer - - Master Chief Petty Officer - - Command Master Chief Petty Officer - - Area Command Master Chief Petty Officer - - Coast Guard Reserve Force Master Chief Petty Officer - - Master Chief Petty Officer of the Coast Guard - - Ensign - - Lieutenant - - Lieutenant Commander - - Commander - - Captain - - Rear Admiral - - Vice Admiral - - Admiral - - Fleet Admiral - - Admiral of the Navy - air_force_rank: - - Airman Basic - - Airman First Class - - Senior Airman - - Staff Sergeant - - Technical Sergeant - - Master Sergeant - - Senior Master Sergeant - - Chief Master Sergeant - - Command Chief Master Sergeant - - Chief Master Sergeant of the Air Force - - Second Lieutenant - - First Lieutenant - - Captain - - Major - - Lieutenant Colonel - - Colonel - - Brigadier General - - Major General - - Lieutenant General - - General - - General of the Air Force - space_force_rank: - - Airman Basic - - Airman First Class - - Senior Airman - - Staff Sergeant - - Technical Sergeant - - Master Sergeant - - Senior Master Sergeant - - Chief Master Sergeant - - Command Chief Master Sergeant - - Senior Enlisted Advisor of the Space Force - - Senior Enlisted Advisor to the Chairman - - Second Lieutenant - - First Lieutenant - - Captain - - Major - - Lieutenant Colonel - - Colonel - - Brigadier General - - Major General - - Lieutenant General - - General - dod_paygrade: - - E-1 - - E-2 - - E-3 - - E-4 - - E-5 - - E-6 - - E-7 - - E-8 - - E-9 - - O-1 - - O-1E - - O-2 - - O-2E - - O-3 - - O-3E - - O-4 - - O-5 - - O-6 - - O-7 - - O-8 - - O-9 - - O-10 - - W-1 - - W-2 - - W-3 - - W-4 - - W-5 - - Special + army_rank: ["Private","Private First Class","Specialist","Corporal","Sergeant","Staff Sergeant","Sergeant First Class","Master Sergeant","First Sergeant","Sergeant Major","Command Sergeant Major","Sergeant Major of the Army","Second Lieutenant","First Lieutenant","Captain","Major","Lieutenant Colonel","Colonel","Brigadier General","Major General","Lieutenant General","General","General of the Army","General of the Armies"] + marines_rank: ["Private","Private First Class","Lance Corporal","Corporal","Sergeant","Staff Sergeant","Gunnery Sergeant","Master Sergeant","First Sergeant","Master Gunnery Sergeant","Sergeant Major","Sergeant Major of the Marine Corps","Second Lieutenant","First Lieutenant","Captain","Major","Lieutenant Colonel","Colonel","Brigadier General","Major General","Lieutenant General","General"] + navy_rank: ["Seaman Recruit","Fireman Recruit","Airman Recruit","Constructionman Recruit","Seaman Apprentice","Fireman Apprentice","Airman Apprentice","Constructionman Apprentice","Seaman","Fireman","Airman","Constructionman","Petty Officer Third Class","Petty Officer Second Class","Petty Officer First Class","Chief Petty Officer","Senior Petty Officer","Master Chief Petty Officer","Command Senior Chief Petty Officer","Command Master Chief Petty Officer","Fleet Master Chief Petty Officer","Master Chief Petty Officer of the Navy","Ensign","Lieutenant","Lieutenant Commander","Commander","Captain","Rear Admiral","Vice Admiral","Admiral","Fleet Admiral","Admiral of the Navy"] + air_force_rank: ["Airman Basic","Airman First Class","Senior Airman","Staff Sergeant","Technical Sergeant","Master Sergeant","Senior Master Sergeant","Chief Master Sergeant","Command Chief Master Sergeant","Chief Master Sergeant of the Air Force","Second Lieutenant","First Lieutenant","Captain","Major","Lieutenant Colonel","Colonel","Brigadier General","Major General","Lieutenant General","General","General of the Air Force"] + dod_paygrade: ["E-1","E-2","E-3","E-4","E-5","E-6","E-7","E-8","E-9","O-1","O-2","O-3","O-4","O-5","O-6","O-7","O-8","O-9","O-10","Special"] diff --git a/test/faker/default/test_faker_military.rb b/test/faker/default/test_faker_military.rb index cdfce43aac..60301a4b95 100644 --- a/test/faker/default/test_faker_military.rb +++ b/test/faker/default/test_faker_military.rb @@ -23,14 +23,6 @@ def test_air_force_rank assert @tester.air_force_rank.match(/\w/) end - def test_space_force_rank - assert @tester.space_force_rank.match(/\w/) - end - - def test_coast_guard_rank - assert @tester.coast_guard_rank.match(/\w/) - end - def test_dod_paygrade assert @tester.dod_paygrade.match(/\w/) end