keycloak-admin 1.2.0 → 2.0.0

data/spec/client/group_client_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe KeycloakAdmin::GroupClient do
       @group_client = KeycloakAdmin.realm(realm_name).groups
 
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '{"id":"test_group_id","name":"test_group_name"}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '{"id":"test_group_id","name":"test_group_name"}'
     end
 
     it "get a group" do
@@ -39,11 +39,11 @@ RSpec.describe KeycloakAdmin::GroupClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm/groups/test_group_id", rest_client_options).and_call_original
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm/groups/test_group_id", faraday_options).and_call_original
 
       group = @group_client.get("test_group_id")
       expect(group.id).to eq "test_group_id"
@@ -58,7 +58,7 @@ RSpec.describe KeycloakAdmin::GroupClient do
       @group_client = KeycloakAdmin.realm(realm_name).groups
 
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"id":"test_group_id","name":"test_group_name"}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"id":"test_group_id","name":"test_group_name"}]'
     end
 
     it "lists groups" do
@@ -68,11 +68,11 @@ RSpec.describe KeycloakAdmin::GroupClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm/groups", rest_client_options).and_call_original
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm/groups", faraday_options).and_call_original
 
       groups = @group_client.list
       expect(groups.length).to eq 1
@@ -88,7 +88,7 @@ RSpec.describe KeycloakAdmin::GroupClient do
       @group_client = KeycloakAdmin.realm(realm_name).groups
 
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"id":"test_group_id","name":"test_group_name"}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"id":"test_group_id","name":"test_group_name"}]'
     end
 
     it "lists children groups" do
@@ -98,11 +98,11 @@ RSpec.describe KeycloakAdmin::GroupClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm/groups/parent_group_id/children", rest_client_options).and_call_original
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm/groups/parent_group_id/children", faraday_options).and_call_original
 
       groups = @group_client.children("parent_group_id")
       expect(groups.length).to eq 1
@@ -130,7 +130,7 @@ RSpec.describe KeycloakAdmin::GroupClient do
           { location: 'http://auth.service.io/auth/admin/realms/valid-realm/groups/be061c48-6edd-4783-a726-1a57d4bfa22b' }
         )
 
-        expect_any_instance_of(RestClient::Resource).to receive(:post).with(group.to_json, anything).and_return response
+        expect_any_instance_of(KeycloakAdmin::Resource).to receive(:post).with(group.to_json, anything).and_return response
       end
 
       it "saves a group" do
@@ -138,11 +138,11 @@ RSpec.describe KeycloakAdmin::GroupClient do
       end
 
       it "passes rest client options" do
-        rest_client_options = {timeout: 10}
-        allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+        faraday_options = {timeout: 10}
+        allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-        expect(RestClient::Resource).to receive(:new).with(
-          "http://auth.service.io/auth/admin/realms/valid-realm/groups", rest_client_options).and_call_original
+        expect(KeycloakAdmin::Resource).to receive(:new).with(
+          "http://auth.service.io/auth/admin/realms/valid-realm/groups", faraday_options).and_call_original
 
         @group_client.save(group)
       end
@@ -160,7 +160,7 @@ RSpec.describe KeycloakAdmin::GroupClient do
           { location: 'http://auth.service.io/auth/admin/realms/valid-realm/groups/be061c48-6edd-4783-a726-1a57d4bfa22b' }
         )
 
-        expect_any_instance_of(RestClient::Resource).to receive(:put).with(group.to_json, anything).and_return response
+        expect_any_instance_of(KeycloakAdmin::Resource).to receive(:put).with(group.to_json, anything).and_return response
       end
 
       it "saves a group" do
@@ -168,11 +168,11 @@ RSpec.describe KeycloakAdmin::GroupClient do
       end
 
       it "passes rest client options" do
-        rest_client_options = {timeout: 10}
-        allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+        faraday_options = {timeout: 10}
+        allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-        expect(RestClient::Resource).to receive(:new).with(
-          "http://auth.service.io/auth/admin/realms/valid-realm/groups/test_group_id", rest_client_options).and_call_original
+        expect(KeycloakAdmin::Resource).to receive(:new).with(
+          "http://auth.service.io/auth/admin/realms/valid-realm/groups/test_group_id", faraday_options).and_call_original
 
         @group_client.save(group)
       end
@@ -186,22 +186,22 @@ RSpec.describe KeycloakAdmin::GroupClient do
       @group_client = KeycloakAdmin.realm(realm_name).groups
 
       stub_token_client
-      @response = double
-      allow(@response).to receive(:headers).and_return(
-        { location: 'http://auth.service.io/auth/admin/realms/valid-realm/groups/be061c48-6edd-4783-a726-1a57d4bfa22b' }
+      @response = double(
+        headers: { location: 'http://auth.service.io/auth/admin/realms/valid-realm/groups/be061c48-6edd-4783-a726-1a57d4bfa22b' },
+        status: 201,
+        reason_phrase: 'Created'
       )
-      allow_any_instance_of(RestClient::Resource).to receive(:post).and_return @response
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:post).and_return @response
     end
 
     it "creates a group" do
-      stub_net_http_res(Net::HTTPCreated, 201, 'Created')
-
       group_id = @group_client.create!("test_group_name")
       expect(group_id).to eq 'be061c48-6edd-4783-a726-1a57d4bfa22b'
     end
 
     it "detects unexpected response to create a group" do
-      stub_net_http_res(Net::HTTPOK, 200, 'OK')
+      allow(@response).to receive(:status).and_return 200
+      allow(@response).to receive(:reason_phrase).and_return 'OK'
 
       expect{ @group_client.create!("test_group_name") }.to raise_error(
         'Create method returned status OK (Code: 200); expected status: Created (201)'
@@ -216,15 +216,15 @@ RSpec.describe KeycloakAdmin::GroupClient do
       @group_client = KeycloakAdmin.realm(realm_name).groups
 
       stub_token_client
-      @response = double headers: {
-        location: 'http://auth.service.io/auth/admin/realms/valid-realm/groups/7686af34-204c-4515-8122-78d19febbf6e'
-      }
-      allow_any_instance_of(RestClient::Resource).to receive(:post).and_return @response
+      @response = double(
+        headers: { location: 'http://auth.service.io/auth/admin/realms/valid-realm/groups/7686af34-204c-4515-8122-78d19febbf6e' },
+        status: 201,
+        reason_phrase: 'Created'
+      )
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:post).and_return @response
     end
 
     it "creates a subgroup" do
-      stub_net_http_res(Net::HTTPCreated, 201, 'Created')
-
       group_id = @group_client.create_subgroup!('be061c48-6edd-4783-a726-1a57d4bfa22b', 'subgroup-name')
       expect(group_id).to eq '7686af34-204c-4515-8122-78d19febbf6e'
     end
@@ -237,7 +237,7 @@ RSpec.describe KeycloakAdmin::GroupClient do
       @group_client = KeycloakAdmin.realm(realm_name).groups
 
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:delete).and_return ''
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:delete).and_return ''
     end
 
     it "deletes a group" do
@@ -246,11 +246,11 @@ RSpec.describe KeycloakAdmin::GroupClient do
     end
 
     it "raises a delete error" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm/groups/test_group_id", rest_client_options).and_raise("error")
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm/groups/test_group_id", faraday_options).and_raise("error")
 
       expect { @group_client.delete("test_group_id") }.to raise_error("error")
     end
@@ -261,7 +261,7 @@ RSpec.describe KeycloakAdmin::GroupClient do
     before(:each) do
       @group_client = KeycloakAdmin.realm(realm_name).groups
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"id":"role-id","name":"role-name"}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"id":"role-id","name":"role-name"}]'
     end
 
     it 'gets all realm-level roles for a group' do
@@ -279,7 +279,7 @@ RSpec.describe KeycloakAdmin::GroupClient do
       @group_client = KeycloakAdmin.realm(realm_name).groups
 
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:post).and_return ''
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:post).and_return ''
     end
 
     it 'adds a realm-level role to a group' do
@@ -302,7 +302,7 @@ RSpec.describe KeycloakAdmin::GroupClient do
       @group_client = KeycloakAdmin.realm(realm_name).groups
 
       stub_token_client
-      allow(RestClient::Request).to receive(:execute).and_return ''
+      allow(KeycloakAdmin::Resource).to receive(:execute).and_return ''
     end
 
     it 'deletes a realm-level role from a group' do
@@ -315,7 +315,7 @@ RSpec.describe KeycloakAdmin::GroupClient do
 
       result = @group_client.remove_realm_level_role_name!('test-group-id', 'test-role-name')
       expect(result).to be(true)
-      expect(RestClient::Request).to have_received(:execute).with(
+      expect(KeycloakAdmin::Resource).to have_received(:execute).with(
         hash_including(
           url: "http://auth.service.io/auth/admin/realms/valid-realm/groups/test-group-id/role-mappings/realm",
           method: :delete,

data/spec/client/identity_provider_client_spec.rb

@@ -68,7 +68,7 @@ RSpec.describe KeycloakAdmin::IdentityProviderClient do
       @identity_provider_client = KeycloakAdmin.realm(realm_name).identity_providers
 
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return json_response
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return json_response
     end
 
     it "lists identity providers" do
@@ -78,11 +78,11 @@ RSpec.describe KeycloakAdmin::IdentityProviderClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm/identity-provider/instances", rest_client_options).and_call_original
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm/identity-provider/instances", faraday_options).and_call_original
 
       identity_providers = @identity_provider_client.list
       expect(identity_providers.length).to eq 1

data/spec/client/organization_client_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
           }
         ]
       payload
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return json_payload
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return json_payload
     end
 
     it "lists organizations" do
@@ -53,11 +53,11 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm/organizations?briefRepresentation=true", rest_client_options).and_call_original
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm/organizations?briefRepresentation=true", faraday_options).and_call_original
 
       organizations = @organization_client.list
       expect(organizations.length).to eq 1
@@ -74,7 +74,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
       @organization_client = KeycloakAdmin.realm(realm_name).organizations
       stub_token_client
       json_payload = "2"
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return json_payload
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return json_payload
     end
 
     it "count organizations" do
@@ -163,7 +163,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
           }
         ]
       payload
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return json_payload
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return json_payload
     end
 
     it "list organizations of members organizations" do
@@ -180,7 +180,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
     before(:each) do
       @organization_client = KeycloakAdmin.realm(realm_name).organizations
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:delete).and_return ""
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:delete).and_return ""
     end
 
     it "deletes an organization" do
@@ -189,11 +189,11 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
     end
 
     it "raises a delete error" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm/organizations/2904e1a1-e5f4-4143-8725-003e54cc8b58", rest_client_options).and_raise("error")
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm/organizations/2904e1a1-e5f4-4143-8725-003e54cc8b58", faraday_options).and_raise("error")
 
       expect { @organization_client.delete("2904e1a1-e5f4-4143-8725-003e54cc8b58") }.to raise_error("error")
     end
@@ -230,7 +230,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
           }
         ]
       payload
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return json_payload
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return json_payload
     end
 
     it "get identity providers" do
@@ -248,7 +248,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
     before(:each) do
       @organization_client = KeycloakAdmin.realm(realm_name).organizations
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:post).and_return ""
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:post).and_return ""
     end
 
     it "adds one identity provider" do
@@ -285,7 +285,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
         }
       payload
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return json_payload
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return json_payload
     end
 
     it "get identity provider" do
@@ -320,7 +320,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
           ]
         }
       payload
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return json_payload
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return json_payload
     end
 
     it "get organization" do
@@ -332,11 +332,11 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm/organizations/8f6e474e-e688-4bec-99ba-5dc862594f4b", rest_client_options).and_call_original
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm/organizations/8f6e474e-e688-4bec-99ba-5dc862594f4b", faraday_options).and_call_original
 
       organization = @organization_client.get("8f6e474e-e688-4bec-99ba-5dc862594f4b")
       expect(organization).to be
@@ -351,7 +351,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
     before(:each) do
       @organization_client = KeycloakAdmin.realm(realm_name).organizations
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return "2"
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return "2"
     end
 
     it "get count of members" do
@@ -399,7 +399,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
       ]
       payload
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return json_payload
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return json_payload
     end
 
     it "get members" do
@@ -420,7 +420,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
     before(:each) do
       @organization_client = KeycloakAdmin.realm(realm_name).organizations
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:post).and_return ""
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:post).and_return ""
     end
 
     it "invites an existing user" do
@@ -434,7 +434,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
     before(:each) do
       @organization_client = KeycloakAdmin.realm(realm_name).organizations
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:post).and_return ""
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:post).and_return ""
     end
 
     it "invites an existing user" do
@@ -448,7 +448,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
     before(:each) do
       @organization_client = KeycloakAdmin.realm(realm_name).organizations
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:delete).and_return ""
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:delete).and_return ""
     end
 
     it "deletes a member" do
@@ -478,7 +478,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
         }  
       payload
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return json_payload
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return json_payload
     end
 
     it "gets a member" do
@@ -496,7 +496,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
     before(:each) do
       @organization_client = KeycloakAdmin.realm(realm_name).organizations
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:post).and_return ""
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:post).and_return ""
     end
 
     it "creates a member from an existing user" do
@@ -511,7 +511,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
     before(:each) do
       @organization_client = KeycloakAdmin.realm(realm_name).organizations
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:post).and_return ""
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:post).and_return ""
     end
 
     it "creates a member from an existing user" do
@@ -553,8 +553,8 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
     before(:each) do
       @organization_client = KeycloakAdmin.realm(realm_name).organizations
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:put).and_return ""
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return json_payload
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:put).and_return ""
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return json_payload
     end
 
     it "updates an organization" do
@@ -571,7 +571,7 @@ RSpec.describe KeycloakAdmin::OrganizationClient do
     before(:each) do
       @organization_client = KeycloakAdmin.realm(realm_name).organizations
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:post).and_return ""
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:post).and_return ""
     end
 
     it "creates an organization" do

data/spec/client/realm_client_spec.rb

@@ -50,7 +50,7 @@ RSpec.describe KeycloakAdmin::RealmClient do
       @realm_client = KeycloakAdmin.realm('master')
 
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"id":"test_realm","realm":"test_realm"}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"id":"test_realm","realm":"test_realm"}]'
     end
 
     it "lists realms" do
@@ -60,11 +60,11 @@ RSpec.describe KeycloakAdmin::RealmClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms", rest_client_options).and_call_original
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms", faraday_options).and_call_original
 
       realms = @realm_client.list
       expect(realms.length).to eq 1
@@ -79,7 +79,7 @@ RSpec.describe KeycloakAdmin::RealmClient do
       @realm_client = KeycloakAdmin.realm(realm_name)
 
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:delete)
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:delete)
     end
 
     it "delete realm" do
@@ -87,11 +87,11 @@ RSpec.describe KeycloakAdmin::RealmClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm", rest_client_options).and_call_original
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm", faraday_options).and_call_original
 
       expect(@realm_client.delete).to be_truthy
     end
@@ -109,7 +109,7 @@ RSpec.describe KeycloakAdmin::RealmClient do
 
       stub_token_client
 
-      expect_any_instance_of(RestClient::Resource).to receive(:post).with(realm.to_json, anything)
+      expect_any_instance_of(KeycloakAdmin::Resource).to receive(:post).with(realm.to_json, anything)
     end
 
     it "saves a realm" do
@@ -117,11 +117,11 @@ RSpec.describe KeycloakAdmin::RealmClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms", rest_client_options).and_call_original
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms", faraday_options).and_call_original
 
       @realm_client.save(realm)
     end
@@ -135,7 +135,7 @@ RSpec.describe KeycloakAdmin::RealmClient do
       @realm_client = KeycloakAdmin.realm(realm_name)
 
       stub_token_client
-      expect_any_instance_of(RestClient::Resource).to receive(:put).with(realm_json.to_json, anything)
+      expect_any_instance_of(KeycloakAdmin::Resource).to receive(:put).with(realm_json.to_json, anything)
     end
 
     it "updates a realm" do
@@ -143,11 +143,11 @@ RSpec.describe KeycloakAdmin::RealmClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm", rest_client_options).and_call_original
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm", faraday_options).and_call_original
 
       @realm_client.update(realm_json)
     end

data/spec/client/role_client_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe KeycloakAdmin::RoleClient do
       @role_client = KeycloakAdmin.realm(realm_name).roles
 
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"id":"test_role_id","name":"test_role_name"}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"id":"test_role_id","name":"test_role_name"}]'
     end
 
     it "lists roles" do
@@ -35,11 +35,11 @@ RSpec.describe KeycloakAdmin::RoleClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm/roles", rest_client_options).and_call_original
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm/roles", faraday_options).and_call_original
 
       roles = @role_client.list
       expect(roles.length).to eq 1
@@ -59,7 +59,7 @@ RSpec.describe KeycloakAdmin::RoleClient do
       @role_client = KeycloakAdmin.realm(realm_name).roles
 
       stub_token_client
-      expect_any_instance_of(RestClient::Resource).to receive(:post).with(role.to_json, anything)
+      expect_any_instance_of(KeycloakAdmin::Resource).to receive(:post).with(role.to_json, anything)
     end
 
     it "saves a role" do
@@ -67,11 +67,11 @@ RSpec.describe KeycloakAdmin::RoleClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm/roles", rest_client_options).and_call_original
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm/roles", faraday_options).and_call_original
 
       @role_client.save(role)
     end