diff --git a/app/assets/javascripts/initializers/initializeDisplayAdVisibility.js b/app/assets/javascripts/initializers/initializeDisplayAdVisibility.js index 6462334a4..103a80e04 100644 --- a/app/assets/javascripts/initializers/initializeDisplayAdVisibility.js +++ b/app/assets/javascripts/initializers/initializeDisplayAdVisibility.js @@ -37,7 +37,7 @@ function trackAdImpression(adBox) { }; window - .fetch('/display_ad_events', { + .fetch('/billboard_events', { method: 'POST', headers: { 'X-CSRF-Token': csrfToken, @@ -70,7 +70,7 @@ function trackAdClick(adBox) { category: adBox.dataset.categoryClick, }, }; - window.fetch('/display_ad_events', { + window.fetch('/billboard_events', { method: 'POST', headers: { 'X-CSRF-Token': csrfToken, diff --git a/app/controllers/display_ad_events_controller.rb b/app/controllers/billboard_events_controller.rb similarity index 94% rename from app/controllers/display_ad_events_controller.rb rename to app/controllers/billboard_events_controller.rb index 229d786b1..041034714 100644 --- a/app/controllers/display_ad_events_controller.rb +++ b/app/controllers/billboard_events_controller.rb @@ -1,4 +1,4 @@ -class DisplayAdEventsController < ApplicationMetalController +class BillboardEventsController < ApplicationMetalController include ActionController::Head # No policy needed. All views are for all users diff --git a/app/javascript/packs/billboardAfterRenderActions.js b/app/javascript/packs/billboardAfterRenderActions.js index 4c6d73ef1..14a5478b9 100644 --- a/app/javascript/packs/billboardAfterRenderActions.js +++ b/app/javascript/packs/billboardAfterRenderActions.js @@ -68,7 +68,7 @@ function trackAdImpression(adBox) { }; window - .fetch('/display_ad_events', { + .fetch('/billboard_events', { method: 'POST', headers: { 'X-CSRF-Token': csrfToken, @@ -103,7 +103,7 @@ function trackAdClick(adBox) { }, }; - window.fetch('/display_ad_events', { + window.fetch('/billboard_events', { method: 'POST', headers: { 'X-CSRF-Token': csrfToken, diff --git a/config/routes.rb b/config/routes.rb index 7e898f004..3937f22ab 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -147,7 +147,9 @@ Rails.application.routes.draw do resources :poll_votes, only: %i[show create] resources :poll_skips, only: [:create] resources :profile_pins, only: %i[create update] - resources :display_ad_events, only: [:create] + # temporary keeping both routes while transitioning (renaming) display_ads => billboards + resources :display_ad_events, only: [:create], controller: :billboard_events + resources :billboard_events, only: [:create] resources :badges, only: [:index] resources :user_blocks, param: :blocked_id, only: %i[show create destroy] resources :podcasts, only: %i[new create] diff --git a/spec/requests/display_ad_events_spec.rb b/spec/requests/billboard_events_spec.rb similarity index 87% rename from spec/requests/display_ad_events_spec.rb rename to spec/requests/billboard_events_spec.rb index 3a90e0a8a..ef7930f61 100644 --- a/spec/requests/display_ad_events_spec.rb +++ b/spec/requests/billboard_events_spec.rb @@ -1,18 +1,18 @@ require "rails_helper" -RSpec.describe "DisplayAdEvents" do +RSpec.describe "BillboardEvents" do let(:user) { create(:user, :trusted) } let(:organization) { create(:organization) } let(:display_ad) { create(:display_ad, organization_id: organization.id) } - describe "POST /display_ad_events", throttled_call: true do + describe "POST /billboard_events", throttled_call: true do context "when user signed in" do before do sign_in user end it "creates a display ad click event" do - post "/display_ad_events", params: { + post "/billboard_events", params: { display_ad_event: { display_ad_id: display_ad.id, context_type: DisplayAdEvent::CONTEXT_TYPE_HOME, @@ -23,7 +23,7 @@ RSpec.describe "DisplayAdEvents" do end it "creates a display ad impression event" do - post "/display_ad_events", params: { + post "/billboard_events", params: { display_ad_event: { display_ad_id: display_ad.id, context_type: DisplayAdEvent::CONTEXT_TYPE_HOME, @@ -39,7 +39,7 @@ RSpec.describe "DisplayAdEvents" do create_list(:display_ad_event, 4, impression_params) post( - "/display_ad_events", + "/billboard_events", params: { display_ad_event: ad_event_params.merge(category: DisplayAdEvent::CATEGORY_CLICK) }, ) @@ -47,7 +47,7 @@ RSpec.describe "DisplayAdEvents" do end it "assigns event to current user" do - post "/display_ad_events", params: { + post "/billboard_events", params: { display_ad_event: { display_ad_id: display_ad.id, context_type: DisplayAdEvent::CONTEXT_TYPE_HOME, @@ -58,7 +58,7 @@ RSpec.describe "DisplayAdEvents" do end it "uses a ThrottledCall for data updates" do - post "/display_ad_events", params: { + post "/billboard_events", params: { display_ad_event: { display_ad_id: display_ad.id, context_type: DisplayAdEvent::CONTEXT_TYPE_HOME,