Cleanup/rubocop happiness

Author: cielf

app/controllers/distributions_by_county_controller.rb

@@ -27,10 +27,6 @@ def filter_params
 
     params
       .require(:filters)
-      .permit(:by_item_id,  :by_reporting_category,  :date_range)
+      .permit(:by_item_id, :by_reporting_category, :date_range)
   end
-
-
 end
-
-

spec/queries/distribution_summary_by_county_query_spec.rb

@@ -88,7 +88,7 @@
     end
     context "with kits  only" do
       let(:reporting_category) { :pads }
-     let(:params) { {organization_id:, start_date:, end_date:, reporting_category:} }
+      let(:params) { {organization_id:, start_date:, end_date:, reporting_category:} }
 
       it "divides the item numbers and values according to the partner profile" do
         create(:distribution, :with_items, item: kit_a.item, organization: user.organization, partner: partner_1)
@@ -97,7 +97,7 @@
         breakdown = DistributionSummaryByCountyQuery.call(**params)
         expect(breakdown.size).to eq(5)
         expect(breakdown[breakdown.size - 1].quantity).to eq(0)
-        expect(breakdown[breakdown.size-1].value).to be_within(0.01).of(0)
+        expect(breakdown[breakdown.size - 1].value).to be_within(0.01).of(0)
         4.times do |i|
           expect(breakdown[i].quantity).to eq(500)
           expect(breakdown[i].value).to be_within(0.01).of(37500.0)
@@ -116,7 +116,7 @@
         breakdown = DistributionSummaryByCountyQuery.call(**params)
         expect(breakdown.size).to eq(5)
         expect(breakdown[breakdown.size - 1].quantity).to eq(0)
-        expect(breakdown[breakdown.size-1].value).to be_within(0.01).of(0)
+        expect(breakdown[breakdown.size - 1].value).to be_within(0.01).of(0)
         4.times do |i|
           expect(breakdown[i].quantity).to eq(550)
           expect(breakdown[i].value).to be_within(0.01).of(40625.0)
@@ -126,9 +126,8 @@
   end
 
   describe "handling filtering by item" do
-
     context "with loose items only" do
-      let(:item_id) { item_1.id}
+      let(:item_id) { item_1.id }
       let(:params) { {organization_id:, start_date:, end_date:, reporting_category:, item_id:} }
 
       it "divides the item numbers and values according to the partner profile" do
@@ -157,7 +156,7 @@
         breakdown = DistributionSummaryByCountyQuery.call(**params)
         expect(breakdown.size).to eq(5)
         expect(breakdown[breakdown.size - 1].quantity).to eq(0)
-        expect(breakdown[breakdown.size-1].value).to be_within(0.01).of(0)
+        expect(breakdown[breakdown.size - 1].value).to be_within(0.01).of(0)
         4.times do |i|
           expect(breakdown[i].quantity).to eq(500)
           expect(breakdown[i].value).to be_within(0.01).of(37500.0)
@@ -166,7 +165,7 @@
     end
 
     context "with an item that is in a kit and loose, and another item that is in the reporting category" do
-      let(:item_id) {item_3.id}
+      let(:item_id) { item_3.id }
       let(:params) { {organization_id:, start_date:, end_date:, reporting_category:, item_id:} }
 
       it "divides the item numbers and values according to the partner profile" do
@@ -176,15 +175,12 @@
         breakdown = DistributionSummaryByCountyQuery.call(**params)
         expect(breakdown.size).to eq(5)
         expect(breakdown[breakdown.size - 1].quantity).to eq(0)
-        expect(breakdown[breakdown.size-1].value).to be_within(0.01).of(0)
+        expect(breakdown[breakdown.size - 1].value).to be_within(0.01).of(0)
         4.times do |i|
           expect(breakdown[i].quantity).to eq(525)
           expect(breakdown[i].value).to be_within(0.01).of(39375.0)
         end
       end
     end
-
   end
-
-
 end

spec/requests/distributions_by_county_spec.rb

@@ -22,9 +22,9 @@
     end
 
     it "includes loose items, but not kits in item dropdown" do
-      create(:distribution, :with_items, item: kit_a.item, organization: organization, partner: partner_1, issued_at: issued_at_present) #This is just to make sure the system creates the kit and items within it
+      create(:distribution, :with_items, item: kit_a.item, organization: organization, partner: partner_1, issued_at: issued_at_present) # This is just to make sure the system creates the kit and items within it
       get distributions_by_county_report_path
-      expect(response.body).to include (item_3.name)
+      expect(response.body).to include item_3.name
       expect(response.body).to_not include(kit_a.item.name)
     end
 
@@ -54,20 +54,19 @@
       end
     end
 
-
     context "filtration, kits" do
       before do
-        current_year =  Time.current.year
-        issued_at_last_year =  Time.current.change(year: current_year - 1).to_datetime
+        current_year = Time.current.year
+        issued_at_last_year = Time.current.change(year: current_year - 1).to_datetime
         @distribution_last_year = create(:distribution, :with_items, item: kit_a.item, organization: user.organization, partner: partner_1, issued_at: issued_at_last_year)
         @distribution_current_1 = create(:distribution, :with_items, item: kit_a.item, organization: user.organization, partner: partner_1, issued_at: issued_at_present)
         @distribution_current_2 = create(:distribution, :with_items, item: item_2, organization: user.organization, partner: partner_1, issued_at: issued_at_present)
         @distribution_current_3 = create(:distribution, :with_items, item: item_4, organization: user.organization, partner: partner_1, issued_at: issued_at_present)
         @all_time_string = "January 1,1909 - January 1,9999"
       end
       it("works for all time with a reporting category") do
-        reporting_category_params =  {filters: { date_range: @all_time_string, by_reporting_category: "pads", by_item_id: nil }}
-        get distributions_by_county_report_path,  params: reporting_category_params
+        reporting_category_params = {filters: {date_range: @all_time_string, by_reporting_category: "pads", by_item_id: nil}}
+        get distributions_by_county_report_path, params: reporting_category_params
 
         partner_1.profile.served_areas.each do |served_area|
           expect(response.body).to include(served_area.county.name)
@@ -77,8 +76,8 @@
         expect(response.body).to include("$762.50").exactly(4).times
       end
       it("works for all time with an item") do
-        params =  {filters: { date_range: @all_time_string, by_reporting_category: nil, by_item_id: item_3.id }}
-        get distributions_by_county_report_path,  params: params
+        params = {filters: {date_range: @all_time_string, by_reporting_category: nil, by_item_id: item_3.id}}
+        get distributions_by_county_report_path, params: params
 
         partner_1.profile.served_areas.each do |served_area|
           expect(response.body).to include(served_area.county.name)
@@ -87,10 +86,6 @@
         expect(response.body).to include("1,000").at_least(4).times
         expect(response.body).to include("$750.00").exactly(4).times
       end
-
-
     end
-
-
   end
 end

spec/requests/distributions_requests_spec.rb

@@ -118,7 +118,6 @@
       end
 
       context "with filters" do
-
         it "shows all active partners in dropdown filter unrestricted by current filter" do
           inactive_partner_name = create(:partner, :deactivated, organization:).name
           active_partner_name = distribution.partner.name

spec/support/distribution_by_county_shared_example.rb

@@ -4,27 +4,17 @@
   let(:organization) { create(:organization, name: "Some Unique Name") }
   let(:user) { create(:user, organization: organization) }
   let(:organization_admin) { create(:organization_admin, organization: organization) }
-
-
-
   let(:item_1) { create(:item, value_in_cents: 1050, organization: organization, reporting_category: :cloth_diapers) }
   let(:item_2) { create(:item, value_in_cents: 20, organization: organization, reporting_category: :tampons) }
-  let(:item_3) {create(:item, value_in_cents:75, organization: organization, reporting_category: :pads)}
-  let(:item_4) {create(:item, value_in_cents:50, organization: organization, reporting_category: :pads)}
+  let(:item_3) { create(:item, value_in_cents: 75, organization: organization, reporting_category: :pads) }
+  let(:item_4) { create(:item, value_in_cents: 50, organization: organization, reporting_category: :pads) }
 
   let(:kit_a) {
     kita = create_kit(name: "Kit A", organization: organization, line_items_attributes: [
       {item_id: item_2.id, quantity: 40},
       {item_id: item_3.id, quantity: 20}
     ])
 
-
-
-    #  kita = create(:kit, name: "Kit A")
-    # kita.item.line_items = [
-    #   create(:line_item, quantity: 40, item: item_2),
-    #   create(:line_item, quantity: 20, item: item_3)
-    # ]
     kita
   }
 

spec/system/distributions_by_county_system_spec.rb

@@ -12,16 +12,15 @@
 
   context "with only 'loose' items" do
     context "handles time ranges properly" do
-      context "all time"  do
+      context "all time" do
         before do
           @distribution_last_year = create(:distribution, :with_items, item: item_1, organization: user.organization, partner: partner_1, issued_at: issued_at_last_year)
           @distribution_current_1 = create(:distribution, :with_items, item: item_1, organization: user.organization, partner: partner_1, issued_at: issued_at_present)
           @distribution_current_2 = create(:distribution, :with_items, item: item_2, organization: user.organization, partner: partner_1, issued_at: issued_at_present)
         end
 
         it("works for all time with no reporting categories") do
-                 visit_distribution_by_county_with_specified_filters("All Time",nil, nil)
-          expect(page).to have_text("Reporting Category");
+          visit_distribution_by_county_with_specified_filters("All Time", nil, nil)
           partner_1.profile.served_areas.each do |served_area|
             expect(page).to have_text(served_area.county.name)
           end
@@ -35,7 +34,7 @@
         @distribution_current = create(:distribution, :with_items, item: item_1, organization: user.organization, partner: partner_1, issued_at: issued_at_present)
         @distribution_last_year = create(:distribution, :with_items, item: item_1, organization: user.organization, partner: partner_1, issued_at: issued_at_last_year)
 
-        visit_distribution_by_county_with_specified_filters("This Year",nil, nil)
+        visit_distribution_by_county_with_specified_filters("This Year", nil, nil)
 
         partner_1.profile.served_areas.each do |served_area|
           expect(page).to have_text(served_area.county.name)
@@ -45,14 +44,13 @@
         expect(page).to have_css("table tbody tr td", text: "$262.50", exact_text: true, count: 4)
       end
 
-
       it("works for this year with reporting categories") do
         @distribution_current_1 = create(:distribution, :with_items, item: item_1, organization: user.organization, partner: partner_1, issued_at: issued_at_present)
         @distribution_current_2 = create(:distribution, :with_items, item: item_2, organization: user.organization, partner: partner_1, issued_at: issued_at_present)
 
         @distribution_last_year = create(:distribution, :with_items, item: item_1, organization: user.organization, partner: partner_1, issued_at: issued_at_last_year)
 
-        visit_distribution_by_county_with_specified_filters("This Year","Cloth Diapers", nil)
+        visit_distribution_by_county_with_specified_filters("This Year", "Cloth Diapers", nil)
 
         partner_1.profile.served_areas.each do |served_area|
           expect(page).to have_text(served_area.county.name)
@@ -68,7 +66,7 @@
 
         @distribution_last_year = create(:distribution, :with_items, item: item_1, organization: user.organization, partner: partner_1, issued_at: issued_at_last_year)
 
-        visit_distribution_by_county_with_specified_filters("All Time","Cloth Diapers", nil)
+        visit_distribution_by_county_with_specified_filters("All Time", "Cloth Diapers", nil)
 
         partner_1.profile.served_areas.each do |served_area|
           expect(page).to have_text(served_area.county.name)
@@ -78,9 +76,6 @@
         expect(page).to have_css("table tbody tr td", text: "$525.00", exact_text: true, count: 4)
       end
 
-
-
-
       it("works for prior year") do
         # Should NOT return distribution issued before previous calendar year
         last_day_of_two_years_ago = Time.current.beginning_of_day.change(year: current_year - 2, month: 12, day: 31).to_datetime
@@ -94,7 +89,7 @@
         first_day_of_current_year = Time.current.end_of_day.change(year: current_year, month: 1, day: 1).to_datetime
         create(:distribution, :with_items, item: item_1, organization: user.organization, partner: partner_1, issued_at: first_day_of_current_year)
 
-        visit_distribution_by_county_with_specified_filters("Prior Year",nil, nil)
+        visit_distribution_by_county_with_specified_filters("Prior Year", nil, nil)
 
         partner_1.profile.served_areas.each do |served_area|
           expect(page).to have_text(served_area.county.name)
@@ -116,7 +111,7 @@
         tomorrow = 1.day.from_now.end_of_day.to_datetime
         create(:distribution, :with_items, item: item_1, organization: user.organization, partner: partner_1, issued_at: tomorrow)
 
-        visit_distribution_by_county_with_specified_filters("Last 12 Months",nil, nil)
+        visit_distribution_by_county_with_specified_filters("Last 12 Months", nil, nil)
 
         partner_1.profile.served_areas.each do |served_area|
           expect(page).to have_text(served_area.county.name)
@@ -127,15 +122,14 @@
     end
   end
 
-
   context "with kits" do
     context "with reporting category" do
       it "works for all time" do
         @distribution_current_1 = create(:distribution, :with_items, item: kit_a.item, organization: user.organization, partner: partner_1, issued_at: issued_at_present)
         @distribution_current_2 = create(:distribution, :with_items, item: item_2, organization: user.organization, partner: partner_1, issued_at: issued_at_present)
         @distribution_last_year_1 = create(:distribution, :with_items, item: kit_a.item, organization: user.organization, partner: partner_1, issued_at: issued_at_last_year)
         @distribution_last_year_2 = create(:distribution, :with_items, item: item_4, organization: user.organization, partner: partner_1, issued_at: issued_at_last_year)
-        visit_distribution_by_county_with_specified_filters("All Time","Pads", nil)
+        visit_distribution_by_county_with_specified_filters("All Time", "Pads", nil)
 
         partner_1.profile.served_areas.each do |served_area|
           expect(page).to have_text(served_area.county.name)
@@ -152,7 +146,7 @@
         @distribution_current_2 = create(:distribution, :with_items, item: item_2, organization: user.organization, partner: partner_1, issued_at: issued_at_present)
         @distribution_last_year_1 = create(:distribution, :with_items, item: kit_a.item, organization: user.organization, partner: partner_1, issued_at: issued_at_last_year)
         @distribution_last_year_2 = create(:distribution, :with_items, item: item_4, organization: user.organization, partner: partner_1, issued_at: issued_at_last_year)
-        visit_distribution_by_county_with_specified_filters("All Time",nil, item_3.name)
+        visit_distribution_by_county_with_specified_filters("All Time", nil, item_3.name)
 
         partner_1.profile.served_areas.each do |served_area|
           expect(page).to have_text(served_area.county.name)