A platform for community discussion. Free, open, simple.
DEV: Fix a race-condition in request tracker specs (#39995)
Jarek Radoszfa428119be3b
diff --git a/spec/support/discourse_event_helper.rb b/spec/support/discourse_event_helper.rbindex 7c1e595f1a9..0f109e69b41 100644--- a/spec/support/discourse_event_helper.rb+++ b/spec/support/discourse_event_helper.rb@@ -12,7 +12,7 @@ module DiscourseEvent::TestHelperdef track_events(event_name = nil, args: nil)@events_trigger = events_trigger = []- yield+ yield events_trigger@events_trigger = nilif event_namediff --git a/spec/system/request_tracker_spec.rb b/spec/system/request_tracker_spec.rbindex 177ee0cd971..602510b6dbe 100644--- a/spec/system/request_tracker_spec.rb+++ b/spec/system/request_tracker_spec.rb@@ -354,7 +354,7 @@ describe "Request tracking" doit "tracks an anonymous visit correctly" doall_events =- DiscourseEvent.track_events do+ DiscourseEvent.track_events do |captured|visit "/"try_until_success doCachedCounting.flush@@ -373,17 +373,14 @@ describe "Request tracking" do"page_view_logged_in_total" => 0,"page_view_crawler_total" => 0,)+ expect(captured.count { |e| e[:event_name] == :beacon_browser_pageview }).to eq(1)+ expect(captured.count { |e| e[:event_name] == :browser_pageview }).to eq(1)endend- beacon_events = all_events.select { |e| e[:event_name] == :beacon_browser_pageview }- non_beacon_events = all_events.select { |e| e[:event_name] == :browser_pageview }-- expect(beacon_events.size).to eq(1)- expect(non_beacon_events.size).to eq(1)-- beacon_event = beacon_events[0][:params].last- non_beacon_event = non_beacon_events[0][:params].last+ beacon_event =+ all_events.find { |e| e[:event_name] == :beacon_browser_pageview }[:params].last+ non_beacon_event = all_events.find { |e| e[:event_name] == :browser_pageview }[:params].last[beacon_event, non_beacon_event].each do |event|expect(event[:user_id]).to be_nil@@ -440,7 +437,7 @@ describe "Request tracking" dosign_in userall_events =- DiscourseEvent.track_events do+ DiscourseEvent.track_events do |captured|visit "/"try_until_success do@@ -462,17 +459,14 @@ describe "Request tracking" do"page_view_logged_in_browser_beacon_total" => 1,"page_view_crawler_total" => 0,)+ expect(captured.count { |e| e[:event_name] == :beacon_browser_pageview }).to eq(1)+ expect(captured.count { |e| e[:event_name] == :browser_pageview }).to eq(1)endend- beacon_events = all_events.select { |e| e[:event_name] == :beacon_browser_pageview }- non_beacon_events = all_events.select { |e| e[:event_name] == :browser_pageview }-- expect(beacon_events.size).to eq(1)- expect(non_beacon_events.size).to eq(1)-- beacon_event = beacon_events[0][:params].last- non_beacon_event = non_beacon_events[0][:params].last+ beacon_event =+ all_events.find { |e| e[:event_name] == :beacon_browser_pageview }[:params].last+ non_beacon_event = all_events.find { |e| e[:event_name] == :browser_pageview }[:params].last[beacon_event, non_beacon_event].each do |event|expect(event[:user_id]).to eq(user.id)