-
Notifications
You must be signed in to change notification settings - Fork 161
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.
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
fixed tests and bug when not signed in and accessing displayqr and resource_params without strong params #35
Open
ThunderKey
wants to merge
18
commits into
AsteriskLabs:master
Choose a base branch
from
citrininfo:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
…essing displayqr when not logged in
…on on specific conditions
…e_authenticator Conflicts: test/integration/gauth_test.rb test/integration_tests_helper.rb test/rails_app/app/views/devise/displayqr/show.html.erb
change parent_name method call to module_parent_name because parent_name is deprecated
change method call
…pdate-attributes Replace calls to deprecated method update_attributes with update
….3 and didn't seem to be needed
Correct deprecated method call
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.
Some Tests failed because of a change from "Sign in" to "Log in" in devise. One Test failed, because the name of the field user_token is user_gauth_token, the attribute gauth_enable gets set to true in another test and the display_qr_path got called without being logged in, which lead to a problem that was solved in the DisplayqrController with adding ":force => true" to the authenticate_#{resource_name}! call. Without the force it would not redirect to the login page because devise only redirects if it is not a DeviceController or force is true. The test also failed, because the user_gauth_token was not added in the own show.html.erb file. The last fix is a simple one to prevent resource_params to fail if you do not use strong params.