diff --git a/app/controllers/api/requests_controller.rb b/app/controllers/api/requests_controller.rb index 3342197e434..b4618de313d 100644 --- a/app/controllers/api/requests_controller.rb +++ b/app/controllers/api/requests_controller.rb @@ -63,7 +63,7 @@ def find_requests(id) end def requests_search_conditions - return {} if User.current_user.admin? + return {} if User.current_user.admin_user? {:requester => User.current_user} end diff --git a/app/controllers/api/service_requests_controller.rb b/app/controllers/api/service_requests_controller.rb index edb9dcb08dc..d96c5f2133d 100644 --- a/app/controllers/api/service_requests_controller.rb +++ b/app/controllers/api/service_requests_controller.rb @@ -38,7 +38,7 @@ def find_service_requests(id) end def service_requests_search_conditions - return {} if User.current_user.admin? + return {} if User.current_user.admin_user? {:requester => User.current_user} end diff --git a/spec/requests/api/requests_spec.rb b/spec/requests/api/requests_spec.rb index 81b55f6dae3..cc3a92bb1ee 100644 --- a/spec/requests/api/requests_spec.rb +++ b/spec/requests/api/requests_spec.rb @@ -71,7 +71,7 @@ end it "lists all the service requests if you are admin" do - allow_any_instance_of(User).to receive(:admin?).and_return(true) + @group.miq_user_role = @role = FactoryGirl.create(:miq_user_role, :role => "administrator") other_user = FactoryGirl.create(:user) service_request_1 = FactoryGirl.create(:service_template_provision_request, :requester => other_user, diff --git a/spec/requests/api/service_requests_spec.rb b/spec/requests/api/service_requests_spec.rb index db26a6cdc17..2d69ea603af 100644 --- a/spec/requests/api/service_requests_spec.rb +++ b/spec/requests/api/service_requests_spec.rb @@ -234,7 +234,7 @@ def expect_result_to_have_user_email(email) end it "lists all the service requests if you are admin" do - allow_any_instance_of(User).to receive(:admin?).and_return(true) + @group.miq_user_role = @role = FactoryGirl.create(:miq_user_role, :role => "administrator") other_user = FactoryGirl.create(:user) service_request_1 = FactoryGirl.create(:service_template_provision_request, :requester => other_user,