Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move dashboard application property merge into FakeSlogger, to make tests more reliable #18164

Merged
merged 1 commit into from Oct 5, 2017
Merged

Move dashboard application property merge into FakeSlogger, to make tests more reliable #18164

merged 1 commit into from Oct 5, 2017

Conversation

aoby
Copy link
Contributor

@aoby aoby commented Oct 5, 2017 •
edited

This should fix the issue we encountered here and have several other times.

I tested this locally by adding the line

require_relative '../../../pegasus/src/env'

just before the ApiControllerTest and ActivitiesControllerTest class declarations (the only 2 places FakeSlogger is used. With the old slog monkey-patch, it failed as in the above example (expected application: :dashboard, actual application: :pegasus), but with this change all tests passed.

CC @asherkach

@aoby aoby requested a review from wjordan October 5, 2017 04:44
Move dashboard application property merge into FakeSlogger, from
d06cdb4 
a global monkey-patch in ApiControllerTest that has been unreliable.
@aoby aoby changed the title Override FakeSlogger within the ApiControllerTest to more cleanly and… Move dashboard application property merge into FakeSlogger, to make tests more reliable Oct 5, 2017
wjordan
wjordan approved these changes Oct 5, 2017
View reviewed changes
Copy link
Contributor

@wjordan wjordan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds good, thanks for digging into this further! hooray for removing a painful global-method redefinition from our tests 🎉

@aoby aoby merged commit 3a4be93 into staging Oct 5, 2017
@aoby aoby deleted the fix-fake-slogger branch October 5, 2017 18:56
@aoby aoby mentioned this pull request Oct 5, 2017
Merged
@aoby aoby mentioned this pull request May 23, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjordan wjordan wjordan approved these changes

Assignees
No one assigned
Labels
code-hygiene
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@aoby @wjordan