Fix a force ssl redirection bug that occur when session store disabled. #27140

Merged
merged 2 commits into from Nov 25, 2016

Projects

None yet

5 participants

@supercaracal
Contributor
supercaracal commented Nov 22, 2016 edited
@supercaracal supercaracal Fix a force ssl redirection bug that occur when session store disabled.
28f8914
@rails-bot

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @rafaelfranca (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

@supercaracal
Contributor

PG::TRDeadlockDetected: ERROR: deadlock detected
SQLite3::BusyException: database is locked: DELETE FROM "delayed_jobs"

They're not seem to be related. Can I rerun this CI?

@prathamesh-sonpatki

Restarted the build, we can ignore that failure if it happens again.

@@ -92,6 +92,22 @@ def cheeseburger
end
end
+class RedirectToSSLIfSessionStoreDisabled < ForceSSLController
@rafaelfranca
rafaelfranca Nov 24, 2016 Member

This is testing an implementation detail. Can we test it at integration level so we don't need to mock the request object?

@supercaracal
supercaracal Nov 24, 2016 Contributor

Build failed. But we can ignore that.

PG::TRDeadlockDetected: ERROR: deadlock detected

@supercaracal supercaracal Remove aggressive unit test with mock. And add integration level test.
da1453e
@rafaelfranca rafaelfranca merged commit 6c87323 into rails:master Nov 25, 2016

0 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
codeclimate Code Climate is analyzing this code.
Details
@rafaelfranca
Member

Backported in c1f990c

@supercaracal supercaracal deleted the supercaracal:fix-force-ssl-if-session-store-disabled branch Nov 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment