tests/openstack/requests/identity/role_tests.rb in fog-openstack-0.1.5 vs tests/openstack/requests/identity/role_tests.rb in fog-openstack-0.1.6

@@ -1,45 +1,48 @@
 Shindo.tests('Fog::Identity[:openstack] | role requests', ['openstack']) do
   @role_format = {
     'id'   => String,
     'name' => String
   }
-  @user   = Fog::Identity[:openstack].list_users.body['users'].first
-  @tenant = Fog::Identity[:openstack].list_tenants.body['tenants'].first
+
+  @identity = Fog::Identity::OpenStack.new(:openstack_auth_url => 'http://openstack:35357/v2.0/tokens')
+
+  @user   = @identity.list_users.body['users'].first
+  @tenant = @identity.list_tenants.body['tenants'].first
   tests('success') do
 
     tests('#create_role("Role Name")').formats(@role_format, false) do
-      @role = Fog::Identity[:openstack].create_role("Role Name").body['role']
+      @role = @identity.create_role("Role Name").body['role']
     end
 
     tests('#list_roles').formats({'roles' => [@role_format]}) do
-      Fog::Identity[:openstack].list_roles.body
+      @identity.list_roles.body
     end
 
     tests("#get_role('#{@role['id']}')").formats(@role_format) do
-      Fog::Identity[:openstack].get_role(@role['id']).body['role']
+      @identity.get_role(@role['id']).body['role']
     end
 
     tests('#create_user_role(@tenant["id"], @user["id"], @role["id"])').formats(@role_format) do
-      Fog::Identity[:openstack].create_user_role(@tenant['id'], @user['id'], @role['id']).body['role']
+      @identity.create_user_role(@tenant['id'], @user['id'], @role['id']).body['role']
     end
 
     tests("#list_roles_for_user_on_tenant('#{@tenant['id']}','#{@user['id']}')").formats([@role_format]) do
-      Fog::Identity[:openstack].list_roles_for_user_on_tenant(@tenant['id'], @user['id']).body['roles']
+      @identity.list_roles_for_user_on_tenant(@tenant['id'], @user['id']).body['roles']
     end
 
     tests("#delete_user_role with tenant").returns("") do
-      Fog::Identity[:openstack].delete_user_role(@tenant['id'], @user['id'], @role['id']).body
+      @identity.delete_user_role(@tenant['id'], @user['id'], @role['id']).body
     end
 
     tests("#delete_user_role with tenant").formats(@role_format) do
       # FIXME - Response (under mocks) is empty String which does not match schema
       pending
-      Fog::Identity[:openstack].delete_user_role(@tenant['id'], @user['id'], @role['id']).body
+      @identity.delete_user_role(@tenant['id'], @user['id'], @role['id']).body
     end
 
     tests("#delete_role('#{@role['id']}')").succeeds do
-      Fog::Identity[:openstack].delete_role(@role['id']).body
+      @identity.delete_role(@role['id']).body
     end
 
   end
 end