-
Notifications
You must be signed in to change notification settings - Fork 141
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
Fix Host verify_credentials_task password expectation #1271
Fix Host verify_credentials_task password expectation #1271
Conversation
The password is encrypted on the queue so we have to update our expectations in this test.
@agrare A conflict occurred during the backport of this pull request to If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the Conflict details: diff --cc spec/requests/hosts_spec.rb
index 26f1eec1,36fe4e23..00000000
--- a/spec/requests/hosts_spec.rb
+++ b/spec/requests/hosts_spec.rb
@@@ -174,10 -125,9 +174,16 @@@ RSpec.describe "hosts API" d
api_basic_authorize action_identifier(:hosts, :edit)
verify_options = {
++<<<<<<< HEAD
+ :credentials => {
+ "default" => {:userid => "root", :password => "abc123"}
+ },
+ :remember_host => true
++=======
+ "authentications" => {
+ "default" => {"userid" => "root", "password" => ManageIQ::Password.encrypt("abc123")}
+ }
++>>>>>>> e83ac860 (Merge pull request #1271 from agrare/fix_hosts_verify_credentials_task)
}
api_options = { |
@agrare The |
…ials_task Fix Host verify_credentials_task password expectation (cherry picked from commit e83ac86)
Backported to
|
Fix Host verify_credentials_task password expectation (cherry picked from commit e83ac86)
The password is encrypted on the queue so we have to update our expectations in this test.