3555 address skipped tests #3606
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
unused helper `after_sign_in_path_for`. It was supposed to override devise's method `after_sign_in_path_for`. However, to make it acutally wotk, it would need to be defined directly in ApplicationController or the AppliactionHelper would need to be directly included in the ApplicationController. So in that form, it was only available through `helpers.after_sign_in_path_for` and it was never invoked.
Haradd
commented
May 20, 2023
Comment on lines
-46
to
-55
| def after_sign_in_path_for(resource) | ||
| # default to the stored location | ||
| if resource.is_a?(User) && resource.organization.present? | ||
| # go to user's dashboard | ||
| dashboard_path(organization_id: resource.organization.id) | ||
| else | ||
| stored_location_for(resource) || new_organization_path | ||
| # send new users to organization creation page | ||
| end | ||
| end |
There was a problem hiding this comment.
It was the dead code. It didn't actually override devise's method since it was available in ApplicationController as helpers.after_sign_in_path_for and was never invoked. To make it be executed, we would need to either define the method directly in ApplicationController or just include the AppliactionHelper in the ApplicationController.
…into 3555_address_skipped_tests
…into 3555_address_skipped_tests
Haradd
commented
May 22, 2023
| @@ -54,9 +54,8 @@ | |||
| # These are scopes that are expressly to integrate with Filterable | |||
| context "filters >" do | |||
| it "->barcodeable_id shows only barcodes for a specific barcodeable_id" do | |||
| skip "TODO: this test can be intermittent see https://travis-ci.org/rubyforgood/diaper/builds/624661379?" | |||
| global_barcode_item # initial creation | |||
| create(:global_barcode_item) # create a null case | |||
There was a problem hiding this comment.
by default this factory takes BaseItem.all.sample as barcodeable, so that was the reason for the flakiness. It is enough to explicitly pass the base_item to fix it.
|
@Haradd this looks amazing! It seems like at least one test is failing though :) |
|
Thanks for the review! It should pass now. Let's see :) |
dorner
approved these changes
May 25, 2023
|
Looks good! Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #3555
Description
The PR adds missing tests and fixes broken ones.
Additionally, it removes some dead code:
after_sign_in_path_formethod in ApplicationHelperType of change