From df5769145bb985e2544ed46cb34ca81e75d3fc1e Mon Sep 17 00:00:00 2001 From: Christopher Zega Date: Fri, 28 Apr 2017 16:23:26 -0400 Subject: [PATCH] update naming --- app/models/test_track/session.rb | 2 +- app/models/test_track/visitor.rb | 6 +++--- spec/models/test_track/session_spec.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/test_track/session.rb b/app/models/test_track/session.rb index ce85914a..7d97dbad 100644 --- a/app/models/test_track/session.rb +++ b/app/models/test_track/session.rb @@ -122,7 +122,7 @@ def response_headers end def manage_response_headers! - response_headers[visitor_response_header_name] = visitor.id if visitor.id_changed? + response_headers[visitor_response_header_name] = visitor.id if visitor.id_overridden_by_existing_visitor? end def notify_unsynced_assignments! diff --git a/app/models/test_track/visitor.rb b/app/models/test_track/visitor.rb index a6149e60..43be867c 100644 --- a/app/models/test_track/visitor.rb +++ b/app/models/test_track/visitor.rb @@ -98,8 +98,8 @@ def loaded? !offline? && @remote_visitor.present? end - def id_changed? - @id_changed || false + def id_overridden_by_existing_visitor? + @id_overridden_by_existing_visitor || false end private @@ -117,7 +117,7 @@ def remote_visitor end def merge!(other) - @id_changed = id != other.id + @id_overridden_by_existing_visitor = id != other.id @id = other.id @assignment_registry = assignment_registry.merge(other.assignment_registry) @unsynced_assignments = nil diff --git a/spec/models/test_track/session_spec.rb b/spec/models/test_track/session_spec.rb index f53e8993..d22ed103 100644 --- a/spec/models/test_track/session_spec.rb +++ b/spec/models/test_track/session_spec.rb @@ -73,7 +73,7 @@ subject.log_in!("identifier_type", "value") end - expect(controller.response.headers['X-Set-TT-Visitor-ID']).to eq(nil) + expect(controller.response.headers).not_to have_key('X-Set-TT-Visitor-ID') end end