Create custom button events for each object in target list #18042
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
|
@miq-bot add_label bug |
bdunne
reviewed
Oct 1, 2018
app/models/custom_button.rb
Outdated
| @@ -131,7 +135,6 @@ def invoke_async(target, source = nil) | |||
| :action => "Calling automate for user #{userid}", | |||
| :userid => User.current_user | |||
| } | |||
|
|
|||
d-m-u
force-pushed
the
custom_button_event_fix_for_bz1628224
branch
from
e9b586a to
458c268
Compare
bdunne
reviewed
Oct 1, 2018
spec/models/custom_button_spec.rb
Outdated
| :event_type => 'button.trigger.start', | ||
| :user_id => user.id | ||
| ) | ||
| expect(CustomButtonEvent.first[:full_data]).to include( |
There was a problem hiding this comment.
Can this be merged into the expectation above?
:full_data => a_hash_including(:automate_entry_point => "/SYSTEM/PROCESS/Request")
spec/models/custom_button_spec.rb
Outdated
| %i(invoke invoke_async).each do |method| | ||
| describe "##{method}" do | ||
| it "publishes CustomButtonEvents with multiple vms" do | ||
| Timecop.freeze(Time.now.utc) do |
There was a problem hiding this comment.
Because custom button events have timestamps.
app/models/custom_button.rb
Outdated
|
|
||
| def create_event(source, target, args) | ||
| CustomButtonEvent.create!( | ||
| :event_type => 'button.trigger.start', |
There was a problem hiding this comment.
This appears to be indented more than 2 spaces
d-m-u
force-pushed
the
custom_button_event_fix_for_bz1628224
branch
from
458c268 to
f305d9a
Compare
bdunne
reviewed
Oct 1, 2018
spec/models/custom_button_spec.rb
Outdated
| @@ -326,5 +328,29 @@ | |||
| end | |||
| end | |||
| end | |||
|
|
|||
| %i(invoke invoke_async).each do |method| | |||
| describe "##{method}" do | |||
There was a problem hiding this comment.
Also, shouldn't this be merged into the describe above?
d-m-u
force-pushed
the
custom_button_event_fix_for_bz1628224
branch
2 times, most recently
from
debb360 to
783f8b1
Compare
bdunne
reviewed
Oct 1, 2018
spec/models/custom_button_spec.rb
Outdated
| @@ -303,8 +305,8 @@ | |||
| EvmSpecHelper.local_miq_server(:is_master => true, :zone => Zone.seed) | |||
| end | |||
|
|
|||
| %i(invoke invoke_async).each do |method| | |||
| describe "##{method}" do | |||
| context "with only one VM" do | |||
There was a problem hiding this comment.
What do you think of this?
%i(invoke invoke_async).each do |method|
describe "##{method}", "publishes CustomButtonEvent(s)" do
it "with a single VM" do
Timecop.freeze(Time.now.utc) do
User.with_user(user) { custom_button.send(method, vm, 'UI') }
expect(CustomButtonEvent.first.timestamp).to be_within(0.01).of(Time.now.utc)
end
expect(CustomButtonEvent.count).to eq(1)
expect(CustomButtonEvent.first).to have_attributes(
:source => 'UI',
:target_id => vm.id,
:target_type => 'VmOrTemplate',
:type => 'CustomButtonEvent',
:event_type => 'button.trigger.start',
:user_id => user.id,
:full_data => a_hash_including(:automate_entry_point => "/SYSTEM/PROCESS/Request")
)
end
it "with multiple vms" do
Timecop.freeze(Time.now.utc) do
User.with_user(user) { custom_button.send(method, [vm, vm2, vm3], 'UI') }
expect(CustomButtonEvent.first.timestamp).to be_within(0.01).of(Time.now.utc)
end
expect(CustomButtonEvent.count).to eq(3)
expect(CustomButtonEvent.first).to have_attributes(
:source => 'UI',
:target_id => vm.id,
:target_type => 'VmOrTemplate',
:type => 'CustomButtonEvent',
:event_type => 'button.trigger.start',
:user_id => user.id,
:full_data => a_hash_including(:automate_entry_point => "/SYSTEM/PROCESS/Request")
)
end
end
end
d-m-u
force-pushed
the
custom_button_event_fix_for_bz1628224
branch
from
783f8b1 to
f5dcc96
Compare
|
Checked commit d-m-u@f5dcc96 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 |
bdunne
approved these changes
Oct 1, 2018
simaishi
pushed a commit
that referenced
this pull request
Oct 2, 2018
…28224 Create custom button events for each object in target list (cherry picked from commit 4b78ead) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1628224
|
Hammer 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.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1628224
When we originally added CustomButtonEvents we didn't account for CustomButtons being run on multiple objects at once. I think we should be creating events for all the objects a custom button runs on.