Fix expand of custom_actions when they are nil #305
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
chrisarcand
suggested changes
Jan 29, 2018
spec/requests/custom_actions_spec.rb
Outdated
| @@ -77,6 +77,15 @@ def expect_result_to_have_custom_actions_hash | |||
| expect_result_to_have_keys(%w(id href actions)) | |||
| expect(response.parsed_body["actions"].select { |a| a["method"] == "post" }.pluck("name")).to match_array(%w(edit add_resource remove_resource remove_all_resources add_provider_vms)) | |||
| end | |||
|
|
|||
| it "allows expanding of custom actions" do | |||
| FactoryGirl.create(:service) | |||
There was a problem hiding this comment.
Move as a memoized helper after line 70 (let(:service)....), this is test setup that can be reused in this block and kept out of the spec itself.
|
Checked commit jntullo@5054ff2 with ruby 2.3.3, rubocop 0.52.0, haml-lint 0.20.0, and yamllint 1.10.0 |
chrisarcand
approved these changes
Jan 29, 2018
gtanzillo
approved these changes
Jan 29, 2018
simaishi
pushed a commit
that referenced
this pull request
Jan 29, 2018
Fix expand of custom_actions when they are nil (cherry picked from commit cb4331a) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1539943
|
Gaprindashvili backport details: |
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.
When a resource has no
custom_actionsbut is requested to have them expanded (ie/api/services?expand=resources&attributes=custom_actions), it is failing because we attempt to add custom action hrefs to a nil value.Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1539741