diff --git a/app/controllers/billboards_controller.rb b/app/controllers/billboards_controller.rb index 56942dbe3..0bd51ff1c 100644 --- a/app/controllers/billboards_controller.rb +++ b/app/controllers/billboards_controller.rb @@ -1,6 +1,6 @@ class BillboardsController < ApplicationController before_action :set_cache_control_headers, only: %i[show], unless: -> { current_user } - include DisplayAdHelper + include BillboardHelper CACHE_EXPIRY_FOR_DISPLAY_ADS = 15.minutes.to_i.freeze def show diff --git a/app/helpers/display_ad_helper.rb b/app/helpers/billboard_helper.rb similarity index 93% rename from app/helpers/display_ad_helper.rb rename to app/helpers/billboard_helper.rb index c5662b09e..9560808ec 100644 --- a/app/helpers/display_ad_helper.rb +++ b/app/helpers/billboard_helper.rb @@ -1,5 +1,5 @@ -module DisplayAdHelper - def display_ads_placement_area_options_array +module BillboardHelper + def billboards_placement_area_options_array DisplayAd::ALLOWED_PLACEMENT_AREAS_HUMAN_READABLE.zip(DisplayAd::ALLOWED_PLACEMENT_AREAS) end diff --git a/app/queries/display_ads/filtered_ads_query.rb b/app/queries/display_ads/filtered_ads_query.rb index 9d6159ede..e65a233b6 100644 --- a/app/queries/display_ads/filtered_ads_query.rb +++ b/app/queries/display_ads/filtered_ads_query.rb @@ -1,6 +1,6 @@ module DisplayAds class FilteredAdsQuery - include DisplayAdHelper + include BillboardHelper def self.call(...) new(...).call end diff --git a/app/views/admin/billboards/_form.html.erb b/app/views/admin/billboards/_form.html.erb index aa2baf250..b7fa884aa 100644 --- a/app/views/admin/billboards/_form.html.erb +++ b/app/views/admin/billboards/_form.html.erb @@ -24,7 +24,7 @@
<%= label_tag :placement_area, "Placement Area:", class: "crayons-field__label" %> - <%= select_tag :placement_area, options_for_select(display_ads_placement_area_options_array, selected: @display_ad.placement_area), include_blank: "Select...", class: "crayons-select js-placement-area" %> + <%= select_tag :placement_area, options_for_select(billboards_placement_area_options_array, selected: @display_ad.placement_area), include_blank: "Select...", class: "crayons-select js-placement-area" %>
diff --git a/spec/helpers/display_ad_helper_spec.rb b/spec/helpers/billboard_helper_spec.rb similarity index 89% rename from spec/helpers/display_ad_helper_spec.rb rename to spec/helpers/billboard_helper_spec.rb index 958d47317..2f7f16b7f 100644 --- a/spec/helpers/display_ad_helper_spec.rb +++ b/spec/helpers/billboard_helper_spec.rb @@ -1,10 +1,10 @@ require "rails_helper" -describe DisplayAdHelper do - describe ".display_ads_placement_area_options_array" do +describe BillboardHelper do + describe ".billboards_placement_area_options_array" do it "returns proper human value" do - expect(helper.display_ads_placement_area_options_array[1]).to eq ["Sidebar Left (Second Position)", - "sidebar_left_2"] + expect(helper.billboards_placement_area_options_array[1]).to eq ["Sidebar Left (Second Position)", + "sidebar_left_2"] end end