Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix 'Save' button state in Edit Management Engine Relationship for VM/Instance #1055

Merged
merged 2 commits into from
Apr 18, 2017
Merged

Fix 'Save' button state in Edit Management Engine Relationship for VM/Instance #1055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7cdbda
Spec tests
bmclaughlin Apr 18, 2017
4799824
Fix 'Save' button state in Edit Management Engine Relationship for VM…
bmclaughlin Apr 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/vm_common.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ def evm_relationship_field_changed

def evm_relationship_get_form_vars
@record = VmOrTemplate.find_by_id(@edit[:vm_id])
@edit[:new][:server] = params[:server_id] if params[:server_id]
@edit[:new][:server] = params[:server_id] == "" ? nil : params[:server_id] if params[:server_id]
end

def evm_relationship_update
Expand Down
20 changes: 20 additions & 0 deletions spec/controllers/vm_common_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,26 @@
end
end

context '#evm_relationship_get_form_vars' do
before :each do
@vm = FactoryGirl.create(:vm_vmware)
edit = {:vm_id => @vm.id, :new => {:server => nil}}
controller.instance_variable_set(:@edit, edit)
end

it 'does not set new server when params[:server_id] is not set' do
controller.instance_variable_set(:@_params, :server_id => '')
controller.send(:evm_relationship_get_form_vars)
expect(assigns(:edit)[:new][:server]).to be(nil)
end

it 'sets new server when params[:server_id] is set' do
controller.instance_variable_set(:@_params, :server_id => '42')
controller.send(:evm_relationship_get_form_vars)
expect(assigns(:edit)[:new][:server]).to eq(controller.params[:server_id])
end
end

include_examples '#download_summary_pdf', :vm_cloud
include_examples '#download_summary_pdf', :vm_infra
end