Merge pull request #15151 from imtayadeway/api/bug/request-admin-access

Requests should allow access to users with admin role

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
 

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
 

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,

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,