Fixes #22696 - Fix errors when --packages is used #563
Conversation
|
Issues: #22696 |
|
Thanks for contributing! :) This issue stems from the fact that the packages API uses Anyway, the easiest way to handle this is to use the |
| key_names = HammerCLI.option_accessor_name 'names' | ||
| key_organization_id = HammerCLI.option_accessor_name 'organization_id' | ||
| options[key_organization_id] ||= organization_id(scoped_options('organization', options)) | ||
| find_resources(:packages, options).select { |package| options[key_names].include? package['name'] }.map { |package| package['id'] } |
There was a problem hiding this comment.
This line is too long, according to rubocop (that's why the build is failing).
|
@akofink thanks :) please review again . |
shiramax
force-pushed
the
22696
branch
2 times, most recently
from
05622a2
to
f11e688
Compare
|
@akofink Done, please review again :) |
| @@ -88,4 +88,18 @@ | |||
| result = run_cmd(@cmd + params) | |||
| assert_equal(result.exit_code, 0) | |||
| end | |||
|
|
|||
| it "performs incremental update with packages" do | |||
| params = ['--content-view-version-id=5', '--package-ids=1', '--lifecycle-environment-ids=1'] | |||
There was a problem hiding this comment.
We want to test the --packages option specifically rather than --package-ids. This will create another request to packages#index.
|
@akofink, thanks. |
| ).at_least_once | ||
|
|
||
| ex = api_expects(:content_view_versions, :incremental_update, 'Incremental Update') do |par| | ||
| par[:content_view_version_environments][0][:content_view_version_id] == 5 |
There was a problem hiding this comment.
The package ids returned from the previous search should be passed in here.
|
|
||
| expect_generic_search( | ||
| :packages, params: {search: "name = \"bla\""}, returns: {'id' => 5} | ||
| ).at_least_once |
There was a problem hiding this comment.
at_least_once allows for multiple searches. It should work without it (thus expecting only one call).
shiramax
force-pushed
the
22696
branch
3 times, most recently
from
147c41c
to
e67c31d
Compare
|
@akofink thanks! |
| par[:content_view_version_environments][0][:content_view_version_id] == 5 && | ||
| par["add_content"]["package_ids"] == [5] | ||
| end | ||
| ex.returns(index_response([{'id' => 5}]), 'id' => '3', 'state' => 'stopped') |
There was a problem hiding this comment.
The index_reponse should be on line 96, not here. You only need the 'id' => '3' here.
| params = ['--content-view-version-id=5', '--packages=bla', '--lifecycle-environment-ids=1'] | ||
|
|
||
| expect_generic_search( | ||
| :packages, params: {search: "name = \"bla\""}, returns: {'id' => 5} |
There was a problem hiding this comment.
This test would be more clear if the package ID didn't match the content_view_version_id. Just pick a different number.
|
@akofink thanks ! done |
|
|
||
| expect_generic_search( | ||
| :packages, params: {search: "name = \"bla\""}, returns: {'id' => 15} | ||
| ).returns(index_response([{'id' => 15}])) |
There was a problem hiding this comment.
You can put the returns here or on line 96, but you don't need it in both places. I think the last one gets honored, so the returns: {'id' => 15} isn't doing anything.
|
@akofink done :) |
(cherry picked from commit f757628)
* Fixes #22696 - Fix errors when --packages is used (#563) (cherry picked from commit f757628) * fixes #23993 - fixes entity filtering by adding searchables (#574) (cherry picked from commit 31e2fb8) * Fixes #24523: s/smart_proxy/Content Source/ (#573) When users provide `--content-source foo`, they should receive back error messages talking about content source, not smart proxies. (cherry picked from commit 29a8570) * Bump version to 0.13.5
No description provided.