Refactoring provision method to use new rbac call #3890
Closed
Conversation
This file contains hidden or 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
|
OK |
romanblanco
suggested changes
May 4, 2018
| end | ||
|
|
||
| it "tests method change" do | ||
| controller.send(:host_button_operation, 'refresh_ems', _('Refresh')) |
There was a problem hiding this comment.
@Cboosa The expected behaviour is missing here.
Cboosa
force-pushed
the
misc_pref_method_change
branch
from
92b8385 to
ac15381
Compare
romanblanco
suggested changes
May 10, 2018
| end | ||
|
|
||
| it "tests that find_records_with_rbac is called and does not fail" do | ||
| expect(controller).to receive(:find_records_with_rbac).with(Host, Host.all).and_return(Host.all) |
| login_as admin_user | ||
| allow(User).to receive(:current_user).and_return(admin_user) | ||
| allow(controller).to receive(:process_hosts).with([host.id], 'refresh_ems', 'Refresh') | ||
| controller.instance_variable_set(:@_params, {}) |
There was a problem hiding this comment.
You can set the instance variable @params correctly
controller.instance_variable_set(:@_params, :id=> Host.all.id)
and remove
allow(controller).to receive(:find_checked_items).and_return(Host.all)
added test to check function
Cboosa
force-pushed
the
misc_pref_method_change
branch
from
ac15381 to
f474aa7
Compare
|
Checked commit Cboosa@f474aa7 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 |
romanblanco
reviewed
May 11, 2018
| @@ -222,7 +222,7 @@ def host_button_operation(method, display_name) | |||
|
|
|||
| # Either a list or coming from a different controller (eg from ems screen, go to its hosts) | |||
| if @lastaction == "show_list" || @layout != "host" | |||
| hosts = find_checked_ids_with_rbac(Host) | |||
| hosts = find_records_with_rbac(Host, checked_or_params).ids | |||
| if hosts.empty? | |||
There was a problem hiding this comment.
The test for hosts presence is not necessary
|
@romanblanco: can we merge this? Or will you update it? |
|
@martinpovolny updated in #4241 |
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.
Replaced provision method, added test.
Parent issue: #1134
@miq-bot add_label rbac
@miq-bot add_label refactoring
@lpichler @romanblanco
Please review @terezapliskova :].