Skip to content

Commit

Permalink
The user object is the real AR object not svc model
Browse files Browse the repository at this point in the history
  • Loading branch information
mkanoor committed Feb 22, 2017
1 parent 74c3fc9 commit 06fdddd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def instantiate(uri)
end

def create_service_provision_request(svc_template, options = nil)
result = ar_object(svc_template).provision_request(ar_object(@workspace.ae_user), options)
result = ar_object(svc_template).provision_request(@workspace.ae_user, options)
MiqAeServiceModelBase.wrap_results(result)
end

Expand Down
6 changes: 1 addition & 5 deletions spec/lib/miq_automation_engine/miq_ae_service_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,6 @@ module MiqAeServiceSpec
let(:options) { {:fred => :flintstone} }
let(:svc_options) { {:dialog_style => "medium"} }
let(:user) { FactoryGirl.create(:user_with_group) }
let(:svc_user) do
MiqAeMethodService::MiqAeServiceUser.find(user.id)
end
let(:template) { FactoryGirl.create(:service_template_ansible_playbook) }
let(:miq_request) { FactoryGirl.create(:service_template_provision_request) }
let(:svc_template) do
Expand All @@ -265,13 +262,12 @@ module MiqAeServiceSpec
double("MiqAeEngine::MiqAeWorkspaceRuntime",
:root => options,
:persist_state_hash => {},
:ae_user => svc_user)
:ae_user => user)
end
let(:miq_ae_service) { MiqAeService.new(workspace) }

it "create service request" do
allow(workspace).to receive(:disable_rbac)
expect(svc_user).to receive(:instance_variable_get).with('@object').and_return(user)
expect(svc_template).to receive(:instance_variable_get).with('@object').and_return(template)
expect(template).to receive(:provision_request).with(user, svc_options).and_return(miq_request)

Expand Down

0 comments on commit 06fdddd

Please sign in to comment.