Skip to content

Commit 27040b8

Browse files
FryguyFryguy
authored
Merge pull request #9358 from kbrock/async_params
Use params[:name] over session[:async][:params][:name]
2 parents 5ced471 + e256d3e commit 27040b8

9 files changed

+41
-47
lines changed

‎app/controllers/cloud_network_controller.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ def create
6666
end
6767

6868
def create_finished
69-
task_id = session[:async][:params][:task_id]
70-
network_name = session[:async][:params][:name]
69+
task_id = params[:task_id]
70+
network_name = params[:name]
7171
task = MiqTask.find(task_id)
7272
if MiqTask.status_ok?(task.status)
7373
add_flash(_("Cloud Network \"%{name}\" created") % {:name => network_name })
@@ -164,8 +164,8 @@ def update
164164
end
165165

166166
def update_finished
167-
task_id = session[:async][:params][:task_id]
168-
cloud_network_name = session[:async][:params][:name]
167+
task_id = params[:task_id]
168+
cloud_network_name = params[:name]
169169
task = MiqTask.find(task_id)
170170
if MiqTask.status_ok?(task.status)
171171
flash_and_redirect(_("Cloud Network \"%{name}\" updated") % {:name => cloud_network_name})

‎app/controllers/cloud_volume_controller.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ def create
146146
end
147147

148148
def create_finished
149-
task_id = session[:async][:params][:task_id]
150-
volume_name = session[:async][:params][:name]
149+
task_id = params[:task_id]
150+
volume_name = params[:name]
151151
task = MiqTask.find(task_id)
152152
if MiqTask.status_ok?(task.status)
153153
add_flash(_("Cloud Volume \"%{name}\" created") % {
@@ -211,9 +211,9 @@ def update
211211
end
212212

213213
def update_finished
214-
task_id = session[:async][:params][:task_id]
215-
volume_id = session[:async][:params][:id]
216-
volume_name = session[:async][:params][:name]
214+
task_id = params[:task_id]
215+
volume_id = params[:id]
216+
volume_name = params[:name]
217217
task = MiqTask.find(task_id)
218218
if MiqTask.status_ok?(task.status)
219219
add_flash(_("Cloud Volume \"%{name}\" updated") % {

‎app/controllers/floating_ip_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ def create
6767
end
6868

6969
def create_finished
70-
task_id = session[:async][:params][:task_id]
71-
floating_ip_address = session[:async][:params][:address]
70+
task_id = params[:task_id]
71+
floating_ip_address = params[:address]
7272
task = MiqTask.find(task_id)
7373
if MiqTask.status_ok?(task.status)
7474
add_flash(_("Floating IP \"%{address}\" created") % { :address => floating_ip_address })

‎app/controllers/host_aggregate_controller.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ def add_host
161161
end
162162

163163
def add_host_finished
164-
task_id = session[:async][:params][:task_id]
165-
host_aggregate_name = session[:async][:params][:name]
166-
host_id = session[:async][:params][:host_id]
164+
task_id = params[:task_id]
165+
host_aggregate_name = params[:name]
166+
host_id = params[:host_id]
167167

168168
task = MiqTask.find(task_id)
169169
host = Host.find(host_id)
@@ -244,9 +244,9 @@ def remove_host
244244
end
245245

246246
def remove_host_finished
247-
task_id = session[:async][:params][:task_id]
248-
host_aggregate_name = session[:async][:params][:name]
249-
host_id = session[:async][:params][:host_id]
247+
task_id = params[:task_id]
248+
host_aggregate_name = params[:name]
249+
host_id = params[:host_id]
250250

251251
task = MiqTask.find(task_id)
252252
host = Host.find(host_id)

‎app/controllers/network_router_controller.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ def add_interface
129129
end
130130

131131
def add_interface_finished
132-
task_id = session[:async][:params][:task_id]
133-
router_id = session[:async][:params][:id]
134-
router_name = session[:async][:params][:name]
135-
cloud_subnet_id = session[:async][:params][:cloud_subnet_id]
132+
task_id = params[:task_id]
133+
router_id = params[:id]
134+
router_name = params[:name]
135+
cloud_subnet_id = params[:cloud_subnet_id]
136136

137137
task = MiqTask.find(task_id)
138138
cloud_subnet = CloudSubnet.find(cloud_subnet_id)
@@ -222,10 +222,10 @@ def remove_interface
222222
end
223223

224224
def remove_interface_finished
225-
task_id = session[:async][:params][:task_id]
226-
router_id = session[:async][:params][:id]
227-
router_name = session[:async][:params][:name]
228-
cloud_subnet_id = session[:async][:params][:cloud_subnet_id]
225+
task_id = params[:task_id]
226+
router_id = params[:id]
227+
router_name = params[:name]
228+
cloud_subnet_id = params[:cloud_subnet_id]
229229

230230
task = MiqTask.find(task_id)
231231
cloud_subnet = CloudSubnet.find(cloud_subnet_id)

‎app/controllers/security_group_controller.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ def create
7676
end
7777

7878
def create_finished
79-
task_id = session[:async][:params][:task_id]
80-
security_group_name = session[:async][:params][:name]
79+
task_id = params[:task_id]
80+
security_group_name = params[:name]
8181
task = MiqTask.find(task_id)
8282
if MiqTask.status_ok?(task.status)
8383
flash_and_redirect(_("Security Group \"%{name}\" created") % {:name => security_group_name})
@@ -181,7 +181,7 @@ def update
181181
end
182182

183183
def update_finished
184-
security_group_id = session[:async][:params][:id]
184+
security_group_id = params[:id]
185185

186186
td = session[:security_group][:task]
187187
task = MiqTask.find(td[:id])

‎spec/controllers/cloud_network_controller_spec.rb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,10 @@
197197
end
198198

199199
describe '#update_finished' do
200-
let(:miq_task) { double("MiqTask", :state => 'Finished', :status => 'ok', :message => 'some message') }
200+
let(:miq_task) { MiqTask.create(:state => 'Finished', :status => 'ok', :message => 'some message') }
201201

202202
before do
203-
allow(MiqTask).to receive(:find).with(123).and_return(miq_task)
204-
allow(controller).to receive(:session).and_return(:async => {:params => {:task_id => 123, :name => network.name}})
203+
allow(controller).to receive(:params).and_return({:task_id => miq_task.id, :name => network.name})
205204
end
206205

207206
it 'calls flash_and_redirect with appropriate arguments for succesful updating of a Cloud Network' do
@@ -210,7 +209,7 @@
210209
end
211210

212211
context 'unsuccesful updating of a Cloud Network' do
213-
let(:miq_task) { double("MiqTask", :state => 'Finished', :status => 'Error', :message => 'some message') }
212+
let(:miq_task) { MiqTask.create(:state => 'Finished', :status => 'Error', :message => 'some message') }
214213

215214
it 'calls flash_and_redirect with appropriate arguments' do
216215
expect(controller).to receive(:flash_and_redirect).with(_("Unable to update Cloud Network \"%{name}\": %{details}") % {

‎spec/controllers/host_aggregate_controller_spec.rb

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,11 @@
4444
end
4545

4646
describe '#create_finished' do
47-
let(:miq_task) { double("MiqTask", :state => 'Finished', :status => status, :message => 'some message') }
47+
let(:miq_task) { MiqTask.create(:state => 'Finished', :status => status, :message => 'some message') }
4848
let(:status) { 'Error' }
4949

5050
before do
51-
allow(MiqTask).to receive(:find).with(123).and_return(miq_task)
52-
allow(controller).to receive(:session).and_return(:async => {:params => {:task_id => 123, :name => aggregate.name}})
51+
allow(controller).to receive(:params).and_return({:task_id => miq_task.id, :name => aggregate.name})
5352
end
5453
end
5554

@@ -76,12 +75,11 @@
7675
end
7776

7877
describe '#update_finished' do
79-
let(:miq_task) { double("MiqTask", :state => 'Finished', :status => status, :message => 'some message') }
78+
let(:miq_task) { MiqTask.create(:state => 'Finished', :status => status, :message => 'some message') }
8079
let(:status) { 'Error' }
8180

8281
before do
83-
allow(MiqTask).to receive(:find).with(123).and_return(miq_task)
84-
allow(controller).to receive(:session).and_return(:async => {:params => {:task_id => 123, :id => aggregate.id, :name => aggregate.name}})
82+
allow(controller).to receive(:params).and_return({:task_id => miq_task.id, :id => aggregate.id, :name => aggregate.name})
8583
end
8684
end
8785

@@ -184,12 +182,11 @@
184182
end
185183

186184
describe '#add_host_finished' do
187-
let(:miq_task) { double("MiqTask", :state => 'Finished', :status => status, :message => 'some message') }
185+
let(:miq_task) { MiqTask.create(:state => 'Finished', :status => status, :message => 'some message') }
188186
let(:status) { 'Error' }
189187

190188
before do
191-
allow(MiqTask).to receive(:find).with(123).and_return(miq_task)
192-
allow(controller).to receive(:session).and_return(:async => {:params => {:task_id => 123, :id => aggregate.id, :name => aggregate.name, :host_id => host.id}})
189+
allow(controller).to receive(:params).and_return({:task_id => miq_task.id, :id => aggregate.id, :name => aggregate.name, :host_id => host.id})
193190
end
194191

195192
it 'calls flash_and_redirect with appropriate arguments' do
@@ -267,12 +264,11 @@
267264
end
268265

269266
describe '#remove_host_finished' do
270-
let(:miq_task) { double("MiqTask", :state => 'Finished', :status => status, :message => 'some message') }
267+
let(:miq_task) { MiqTask.create(:state => 'Finished', :status => status, :message => 'some message') }
271268
let(:status) { 'Error' }
272269

273270
before do
274-
allow(MiqTask).to receive(:find).with(123).and_return(miq_task)
275-
allow(controller).to receive(:session).and_return(:async => {:params => {:task_id => 123, :id => aggregate.id, :name => aggregate.name, :host_id => host.id}})
271+
allow(controller).to receive(:params).and_return({:task_id => miq_task.id, :id => aggregate.id, :name => aggregate.name, :host_id => host.id})
276272
end
277273

278274
it 'calls flash_and_redirect with appropriate arguments' do

‎spec/controllers/security_group_controller_spec.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,12 +406,11 @@
406406

407407
describe '#create_finished' do
408408
let(:group) { FactoryBot.create(:security_group) }
409-
let(:miq_task) { double("MiqTask", :state => 'Finished', :status => status, :message => 'some message') }
409+
let(:miq_task) { MiqTask.create(:state => 'Finished', :status => status, :message => 'some message') }
410410
let(:status) { 'Error' }
411411

412412
before do
413-
allow(MiqTask).to receive(:find).with(123).and_return(miq_task)
414-
allow(controller).to receive(:session).and_return(:async => {:params => {:task_id => 123, :name => group.name}})
413+
allow(controller).to receive(:params).and_return({:task_id => miq_task.id, :name => group.name})
415414
end
416415

417416
it 'calls flash_and_redirect with appropriate arguments for unsuccesful creating of a Security Group' do

0 commit comments

Comments
 (0)