stormpath-sdk 1.6.0 → 1.7.0

data/spec/resource/base_spec.rb

@@ -6,13 +6,7 @@ describe Stormpath::Resource::Base do
       class TestResource < Stormpath::Resource::Base
         prop_accessor :username, :given_name
       end
-
-      let(:resource) do
-        TestResource.new({
-          'username' => 'bar',
-          'givenName' => 'foo'
-        }, nil)
-      end
+      let(:resource) { TestResource.new({ 'username' => 'bar', 'givenName' => 'foo' }, nil) }
 
       it 'generates a getter method for each property' do
         expect(resource.username).to eq('bar')
@@ -33,13 +27,7 @@ describe Stormpath::Resource::Base do
       class TestResource < Stormpath::Resource::Base
         prop_non_printable :password
       end
-
-      let(:resource) do
-        TestResource.new({
-          'username' => 'bar',
-          'password' => 'P@$$w0rd'
-        }, nil)
-      end
+      let(:resource) { TestResource.new({ 'username' => 'bar', 'password' => 'P@$$w0rd' }, nil) }
 
       it 'marks that property as not being printable' do
         expect(resource.inspect).to include('username')
@@ -70,14 +58,10 @@ describe Stormpath::Resource::Base do
     class TestResource < Stormpath::Resource::Base; end
 
     context 'compared against an object of the same class' do
-      let(:resource) do
-        TestResource.new('http://foo.com/test/123')
-      end
+      let(:resource) { TestResource.new('http://foo.com/test/123') }
 
       context 'href matches' do
-        let(:other) do
-          TestResource.new('http://foo.com/test/123')
-        end
+        let(:other) { TestResource.new('http://foo.com/test/123') }
 
         it 'passes' do
           expect(resource).to eq(other)
@@ -85,9 +69,7 @@ describe Stormpath::Resource::Base do
       end
 
       context 'href does not match' do
-        let(:other) do
-          TestResource.new('http://foo.com/test/456')
-        end
+        let(:other) { TestResource.new('http://foo.com/test/456') }
 
         it 'fails' do
           expect(resource).to_not eq(other)
@@ -97,14 +79,8 @@ describe Stormpath::Resource::Base do
 
     context 'compared against an object of another class' do
       class NotAResource; end
-
-      let(:resource) do
-        TestResource.new('http://foo.com/test/123')
-      end
-
-      let(:other) do
-        NotAResource.new
-      end
+      let(:resource) { TestResource.new('http://foo.com/test/123') }
+      let(:other) { NotAResource.new }
 
       it 'fails' do
         expect(resource).to_not eq(other)

data/spec/resource/collection_spec.rb

@@ -1,23 +1,13 @@
 require 'spec_helper'
 
 describe Stormpath::Resource::Collection, :vcr do
-  let(:href) do
-    'http://example.com'
-  end
-
-  let(:item_class) do
-    Stormpath::Resource::Application
-  end
-
-  let(:client) do
-    Stormpath::Client
-  end
+  let(:href) { 'http://example.com' }
+  let(:item_class) { Stormpath::Resource::Application }
+  let(:client) { Stormpath::Client }
 
   describe '#collection_href' do
     context 'by default' do
-      let(:collection) do
-        Stormpath::Resource::Collection.new href, item_class, client
-      end
+      let(:collection) { Stormpath::Resource::Collection.new href, item_class, client }
 
       it 'defaults to href' do
         expect(collection.collection_href).to eq href
@@ -25,9 +15,7 @@ describe Stormpath::Resource::Collection, :vcr do
     end
 
     context 'when specified' do
-      let(:collection_href) do
-        'http://fakie.com'
-      end
+      let(:collection_href) { 'http://fakie.com' }
 
       let(:collection) do
         Stormpath::Resource::Collection.new(
@@ -43,13 +31,8 @@ describe Stormpath::Resource::Collection, :vcr do
   end
 
   describe '#offset' do
-    let(:collection) do
-      Stormpath::Resource::Collection.new href, item_class, client
-    end
-
-    let!(:offset) do
-      collection.offset 5
-    end
+    let(:collection) { Stormpath::Resource::Collection.new href, item_class, client }
+    let!(:offset) { collection.offset 5 }
 
     it 'returns the collection' do
       expect(offset.class).to eq Stormpath::Resource::Collection
@@ -61,13 +44,9 @@ describe Stormpath::Resource::Collection, :vcr do
   end
 
   describe '#limit' do
-    let(:collection) do
-      Stormpath::Resource::Collection.new href, item_class, client
-    end
+    let(:collection) { Stormpath::Resource::Collection.new href, item_class, client }
 
-    let!(:limit) do
-      collection.limit 100
-    end
+    let!(:limit) { collection.limit 100 }
 
     it 'returns the collection' do
       expect(limit.class).to eq Stormpath::Resource::Collection
@@ -79,17 +58,11 @@ describe Stormpath::Resource::Collection, :vcr do
   end
 
   describe '#order' do
-    let(:collection) do
-      Stormpath::Resource::Collection.new href, item_class, client
-    end
+    let(:collection) { Stormpath::Resource::Collection.new href, item_class, client }
 
-    let(:order_statement) do
-      'lastName asc,age desc'
-    end
+    let(:order_statement) { 'lastName asc,age desc' }
 
-    let!(:order) do
-      collection.order order_statement
-    end
+    let!(:order) { collection.order order_statement }
 
     it 'returns the collection' do
       expect(order.class).to eq Stormpath::Resource::Collection
@@ -101,18 +74,12 @@ describe Stormpath::Resource::Collection, :vcr do
   end
 
   describe '#search' do
-    let(:collection) do
-      Stormpath::Resource::Collection.new href, item_class, client
-    end
+    let(:collection) { Stormpath::Resource::Collection.new href, item_class, client }
 
     context 'when passed a string' do
-      let(:query) do
-        'dagnabbit'
-      end
+      let(:query) { 'dagnabbit' }
 
-      let!(:search) do
-        collection.search query
-      end
+      let!(:search) { collection.search query }
 
       it 'returns the collection' do
         expect(search.class).to eq Stormpath::Resource::Collection
@@ -124,13 +91,8 @@ describe Stormpath::Resource::Collection, :vcr do
     end
 
     context 'when passed a hash of attributes' do
-      let(:query_hash) do
-        { name: 'Stanley Kubrick', description: 'That dude was a sick maniac' }
-      end
-
-      let!(:search) do
-        collection.search query_hash
-      end
+      let(:query_hash) { { name: 'Stanley Kubrick', description: 'That dude was a sick maniac' } }
+      let!(:search) { collection.search query_hash }
 
       it 'returns the collection' do
         expect(search.class).to eq Stormpath::Resource::Collection
@@ -143,9 +105,7 @@ describe Stormpath::Resource::Collection, :vcr do
   end
 
   describe '#criteria' do
-    let(:collection) do
-      Stormpath::Resource::Collection.new href, item_class, client
-    end
+    let(:collection) { Stormpath::Resource::Collection.new href, item_class, client }
 
     context 'when no fetch criteria present' do
       it 'returns an empty hash for criteria' do
@@ -173,13 +133,11 @@ describe Stormpath::Resource::Collection, :vcr do
 
       let(:groups) do
         ('A'..'Z').map do |letter|
-          directory.groups.create name: "#{letter}. pagination testing group "
+          directory.groups.create(name: "#{letter}. pagination testing group ")
         end
       end
 
-      after do
-        directory.delete
-      end
+      after { directory.delete }
 
       it 'should respond as expected with or without limits' do
         expect(groups.count).to eq(26)
@@ -212,21 +170,14 @@ describe Stormpath::Resource::Collection, :vcr do
 
     context 'testing limits and offsets with name checking' do
       let(:directory) { test_api_client.directories.create(directory_attrs) }
+      let!(:groups) { ('1'..'100').map { |number| directory.groups.create(name: number) } }
 
-      let!(:groups) do
-        ('1'..'100').map do |number|
-          directory.groups.create name: number
-        end
-      end
-
-      after do
-        directory.delete
-      end
+      after { directory.delete }
 
       it 'should paginate properly' do
         expect(directory.groups.count).to eq(100)
 
-        expect(directory.groups.map {|group| group.name }).to eq(('1'..'100').to_a.sort)
+        expect(directory.groups.map(&:name)).to eq(('1'..'100').to_a.sort)
 
         expect(directory.groups.limit(30).count).to eq(100)
 
@@ -244,23 +195,23 @@ describe Stormpath::Resource::Collection, :vcr do
 
         expect(directory.groups.limit(30).offset(90).current_page.size).to eq(100)
 
-        expect(directory.groups.limit(30).map {|group| group.name }).to eq(('1'..'100').to_a.sort)
+        expect(directory.groups.limit(30).map(&:name)).to eq(('1'..'100').to_a.sort)
 
-        expect(directory.groups.limit(30).current_page.items.map {|group| group.name }).to eq(('1'..'100').to_a.sort.first(30))
+        expect(directory.groups.limit(30).current_page.items.map(&:name)).to eq(('1'..'100').to_a.sort.first(30))
 
-        expect(directory.groups.limit(30).offset(30).map {|group| group.name }).to eq(('1'..'100').to_a.sort.drop(30))
+        expect(directory.groups.limit(30).offset(30).map(&:name)).to eq(('1'..'100').to_a.sort.drop(30))
 
-        expect(directory.groups.limit(30).offset(30).current_page.items.map {|group| group.name }).to eq(('1'..'100').to_a.sort.drop(30).first(30))
+        expect(directory.groups.limit(30).offset(30).current_page.items.map(&:name)).to eq(('1'..'100').to_a.sort.drop(30).first(30))
 
-        expect(directory.groups.limit(30).offset(60).map {|group| group.name }).to eq(('1'..'100').to_a.sort.drop(60))
+        expect(directory.groups.limit(30).offset(60).map(&:name)).to eq(('1'..'100').to_a.sort.drop(60))
 
-        expect(directory.groups.limit(30).offset(60).current_page.items.map {|group| group.name }).to eq(('1'..'100').to_a.sort.drop(60).first(30))
+        expect(directory.groups.limit(30).offset(60).current_page.items.map(&:name)).to eq(('1'..'100').to_a.sort.drop(60).first(30))
 
-        expect(directory.groups.limit(30).offset(90).map {|group| group.name }).to eq(('1'..'100').to_a.sort.drop(90))
+        expect(directory.groups.limit(30).offset(90).map(&:name)).to eq(('1'..'100').to_a.sort.drop(90))
 
-        expect(directory.groups.limit(30).offset(90).current_page.items.map {|group| group.name }).to eq(('1'..'100').to_a.sort.drop(90).first(30))
+        expect(directory.groups.limit(30).offset(90).current_page.items.map(&:name)).to eq(('1'..'100').to_a.sort.drop(90).first(30))
 
-        expect(directory.groups.limit(30).offset(90).current_page.items.map {|group| group.name }).to eq(('1'..'100').to_a.sort.drop(90).first(10))
+        expect(directory.groups.limit(30).offset(90).current_page.items.map(&:name)).to eq(('1'..'100').to_a.sort.drop(90).first(10))
 
         group_count = 0
         directory.groups.each do |group|
@@ -280,16 +231,16 @@ describe Stormpath::Resource::Collection, :vcr do
       let(:username) { 'jlpicard/!@$%^ *()_-+=?><]}[{' }
 
       let!(:account) do
-        directory.accounts.create username: username,
-           email: "captain#{default_domain}",
-           givenName: "Jean-Luc",
-           surname: "Picard",
-           password: "hakunaMatata179Enterprise"
+        directory.accounts.create(
+          username: username,
+          email: "captain#{default_domain}",
+          givenName: 'Jean-Luc',
+          surname: 'Picard',
+          password: 'hakunaMatata179Enterprise'
+        )
       end
 
-      after do
-        directory.delete
-      end
+      after { directory.delete }
 
       it 'should search accounts by username' do
         expect(directory.accounts.search(username: username).count).to eq(1)
@@ -312,27 +263,27 @@ describe Stormpath::Resource::Collection, :vcr do
       let(:directory) { test_api_client.directories.create(directory_attrs) }
 
       let!(:account) do
-        directory.accounts.create username: "jlpicard",
-           email: "captain#{default_domain}",
-           givenName: "Jean-Luc",
-           surname: "Picard",
-           password: "hakunaMatata179Enterprise"
+        directory.accounts.create(
+          username: 'jlpicard',
+          email: "captain#{default_domain}",
+          givenName: 'Jean-Luc',
+          surname: 'Picard',
+          password: 'hakunaMatata179Enterprise'
+        )
       end
 
-      after do
-        directory.delete
-      end
+      after { directory.delete }
 
       it 'should search accounts by username with asterisk at the beginning' do
-        expect(directory.accounts.search(username: "*card").count).to eq(1)
+        expect(directory.accounts.search(username: '*card').count).to eq(1)
       end
 
       it 'should search accounts by username with asterisk at the end' do
-        expect(directory.accounts.search(username: "jl*").count).to eq(1)
+        expect(directory.accounts.search(username: 'jl*').count).to eq(1)
       end
 
       it 'should search accounts by username with asterisk at the beginning and the end' do
-        expect(directory.accounts.search(username: "*pic*").count).to eq(1)
+        expect(directory.accounts.search(username: '*pic*').count).to eq(1)
       end
     end
 
@@ -340,27 +291,27 @@ describe Stormpath::Resource::Collection, :vcr do
       let(:directory) { test_api_client.directories.create(directory_attrs) }
 
       let!(:account) do
-        directory.accounts.create username: "jlpicard",
-           email: "captain#{default_domain}",
-           givenName: "Jean-Luc",
-           surname: "Picard",
-           password: "hakunaMatata179Enterprise"
+        directory.accounts.create(
+          username: 'jlpicard',
+          email: "captain#{default_domain}",
+          givenName: 'Jean-Luc',
+          surname: 'Picard',
+          password: 'hakunaMatata179Enterprise'
+        )
       end
 
-      after do
-        directory.delete
-      end
+      after { directory.delete }
 
       it 'should search accounts by username with asterisk at the beginning' do
-        expect(directory.accounts.search(username: "*card", email: "*stormpath.com").count).to eq(1)
+        expect(directory.accounts.search(username: '*card', email: '*stormpath.com').count).to eq(1)
       end
 
       it 'should search accounts by username with asterisk at the end' do
-        expect(directory.accounts.search(username: "jl*", email: "capt*").count).to eq(1)
+        expect(directory.accounts.search(username: 'jl*', email: 'capt*').count).to eq(1)
       end
 
       it 'should search accounts by username with asterisk at the beginning and the end' do
-        expect(directory.accounts.search(username: "*pic*", email: "*stormpath*").count).to eq(1)
+        expect(directory.accounts.search(username: '*pic*', email: '*stormpath*').count).to eq(1)
       end
     end
 
@@ -387,9 +338,7 @@ describe Stormpath::Resource::Collection, :vcr do
         )
       end
 
-      after do
-        directory.delete
-      end
+      after { directory.delete }
 
       context 'camelCase' do
         before do

data/spec/resource/custom_data_spec.rb

@@ -14,7 +14,7 @@ describe Stormpath::Resource::CustomData, :vcr do
 
   context 'without caching regions' do
     let(:disabled_cache_client) do
-      @disabled_cache_client ||= Stormpath::Client.new({api_key: test_api_key, cache: { store: Stormpath::Cache::DisabledCacheStore }})
+      @disabled_cache_client ||= Stormpath::Client.new(api_key: test_api_key, cache: { store: Stormpath::Cache::DisabledCacheStore })
     end
 
     let(:directory) { disabled_cache_client.directories.create(directory_attrs) }

data/spec/resource/directory_spec.rb

@@ -220,7 +220,7 @@ describe Stormpath::Resource::Directory, :vcr do
       end
 
       it 'can authenticate with the account credentials' do
-        auth_request = Stormpath::Authentication::UsernamePasswordRequest.new 'jlucpicard', 'qwerty'
+        auth_request = Stormpath::Authentication::UsernamePasswordRequest.new('jlucpicard', 'qwerty')
         auth_result = application.authenticate_account auth_request
 
         expect(auth_result).to be_a Stormpath::Authentication::AuthenticationResult
@@ -253,7 +253,7 @@ describe Stormpath::Resource::Directory, :vcr do
       end
 
       it 'can authenticate with the account credentials' do
-        auth_request = Stormpath::Authentication::UsernamePasswordRequest.new 'jlucpicard', 'testing12'
+        auth_request = Stormpath::Authentication::UsernamePasswordRequest.new('jlucpicard', 'testing12')
         auth_result = application.authenticate_account auth_request
 
         expect(auth_result).to be_a Stormpath::Authentication::AuthenticationResult
@@ -286,7 +286,7 @@ describe Stormpath::Resource::Directory, :vcr do
       end
 
       it 'can authenticate with the account credentials' do
-        auth_request = Stormpath::Authentication::UsernamePasswordRequest.new 'jlucpicard', 'NotSecure'
+        auth_request = Stormpath::Authentication::UsernamePasswordRequest.new('jlucpicard', 'NotSecure')
         auth_result = application.authenticate_account auth_request
 
         expect(auth_result).to be_a Stormpath::Authentication::AuthenticationResult
@@ -311,9 +311,14 @@ describe Stormpath::Resource::Directory, :vcr do
   end
 
   describe '#create_directory_with_custom_data' do
+    let(:directory_name) { "rubysdkdir-#{random_number}" }
     let(:directory) do
-      test_api_client.directories.create(directory_attrs(name: 'rubysdkdir',
-                                                         description: 'rubysdkdir desc'))
+      test_api_client.directories.create(
+        directory_attrs(
+          name: directory_name,
+          description: directory_name
+        )
+      )
     end
 
     after { directory.delete }
@@ -322,24 +327,26 @@ describe Stormpath::Resource::Directory, :vcr do
       directory.custom_data['category'] = 'classified'
 
       directory.save
-      expect(directory.name).to eq('rubysdkdir')
-      expect(directory.description).to eq('rubysdkdir desc')
+      expect(directory.name).to eq(directory_name)
+      expect(directory.description).to eq(directory_name)
       expect(directory.custom_data['category']).to eq('classified')
     end
   end
 
   describe 'create directory with provider data' do
+    let(:directory_name) { "rubysdkdirprovider-#{random_number}" }
+
     context 'valida data' do
       let(:directory) do
         test_api_client.directories.create(
-          name: 'rubysdkdir',
-          description: 'description_for_some_test_directory',
+          name: directory_name,
+          description: directory_name,
           provider: {
-            provider_id: "saml",
-            sso_login_url:"https://yourIdp.com/saml2/sso/login",
-            sso_logout_url:"https://yourIdp.com/saml2/sso/logout",
-            encoded_x509_signing_cert:"-----BEGIN CERTIFICATE-----\n...Certificate goes here...\n-----END CERTIFICATE-----",
-            request_signature_algorithm:"RSA-SHA256"
+            provider_id: 'saml',
+            sso_login_url: 'https://yourIdp.com/saml2/sso/login',
+            sso_logout_url: 'https://yourIdp.com/saml2/sso/logout',
+            encoded_x509_signing_cert: "-----BEGIN CERTIFICATE-----\n...Certificate goes here...\n-----END CERTIFICATE-----",
+            request_signature_algorithm: 'RSA-SHA256'
           }
         )
       end
@@ -349,17 +356,17 @@ describe Stormpath::Resource::Directory, :vcr do
       end
 
       it 'creates the directory with provider data' do
-        stub_request(:post, "https://api.stormpath.com/v1/directories").
-          to_return(status:200, body:  fixture('create_saml_directory.json'), headers:{})
+        stub_request(:post, 'https://api.stormpath.com/v1/directories')
+          .to_return(status: 200, body: Stormpath::Test.mocked_create_saml_directory)
 
-        stub_request(:get, directory.href + "/provider").
-          to_return(status: 200, body: fixture('get_saml_directory_provider.json'), headers:{})
+        stub_request(:get, directory.href + '/provider')
+          .to_return(status: 200, body: Stormpath::Test.mocked_saml_directory_provider_response)
 
         directory
-        expect(directory.provider.provider_id).to eq("saml")
-        expect(directory.provider.sso_login_url).to eq("https://yourIdp.com/saml2/sso/login")
-        expect(directory.provider.sso_logout_url).to eq("https://yourIdp.com/saml2/sso/logout")
-        expect(directory.provider.request_signature_algorithm).to eq("RSA-SHA256")
+        expect(directory.provider.provider_id).to eq('saml')
+        expect(directory.provider.sso_login_url).to eq('https://yourIdp.com/saml2/sso/login')
+        expect(directory.provider.sso_logout_url).to eq('https://yourIdp.com/saml2/sso/logout')
+        expect(directory.provider.request_signature_algorithm).to eq('RSA-SHA256')
       end
     end
 
@@ -367,14 +374,14 @@ describe Stormpath::Resource::Directory, :vcr do
       it 'raises Stormpath::Error' do
         expect do
           test_api_client.directories.create(
-            name: 'rubysdkdir',
-            description: 'description_for_some_test_directory',
+            name: directory_name,
+            description: directory_name,
             provider: {
-              provider_id: "saml",
-              sso_login_url:"",
-              sso_logout_url:"",
-              encoded_x509_signing_cert:"",
-              request_signature_algorithm:"RSA-SHA256"
+              provider_id: 'saml',
+              sso_login_url: '',
+              sso_logout_url: '',
+              encoded_x509_signing_cert: '',
+              request_signature_algorithm: 'RSA-SHA256'
             }
           )
         end.to raise_error Stormpath::Error
@@ -383,16 +390,17 @@ describe Stormpath::Resource::Directory, :vcr do
   end
 
   describe 'saml #provider' do
+    let(:directory_name) { "rubysdkdirsaml-#{random_number}" }
     let(:directory) do
       test_api_client.directories.create(
-        name: 'rubysdkdir',
-        description: 'description_for_some_test_directory',
+        name: directory_name,
+        description: directory_name,
         provider: {
-          provider_id: "saml",
-          sso_login_url:"https://yourIdp.com/saml2/sso/login",
-          sso_logout_url:"https://yourIdp.com/saml2/sso/logout",
-          encoded_x509_signing_cert:"-----BEGIN CERTIFICATE-----\n...Certificate goes here...\n-----END CERTIFICATE-----",
-          request_signature_algorithm:"RSA-SHA256"
+          provider_id: 'saml',
+          sso_login_url: 'https://yourIdp.com/saml2/sso/login',
+          sso_logout_url: 'https://yourIdp.com/saml2/sso/logout',
+          encoded_x509_signing_cert: "-----BEGIN CERTIFICATE-----\n...Certificate goes here...\n-----END CERTIFICATE-----",
+          request_signature_algorithm: 'RSA-SHA256'
         }
       )
     end
@@ -402,33 +410,34 @@ describe Stormpath::Resource::Directory, :vcr do
     end
 
     it 'returnes provider data' do
-      stub_request(:post, "https://api.stormpath.com/v1/directories").
-        to_return(status:200, body: fixture('create_saml_directory.json'), headers:{})
+      stub_request(:post, 'https://api.stormpath.com/v1/directories')
+        .to_return(status: 200, body: Stormpath::Test.mocked_create_saml_directory)
 
-      stub_request(:get, directory.href + "/provider").
-        to_return(status: 200, body: fixture('get_saml_directory_provider.json'), headers:{})
+      stub_request(:get, directory.href + '/provider')
+        .to_return(status: 200, body: Stormpath::Test.mocked_saml_directory_provider_response)
 
       directory
       expect(directory.provider.href).not_to be_empty
-      expect(directory.provider.provider_id).to eq("saml")
-      expect(directory.provider.sso_login_url).to eq("https://yourIdp.com/saml2/sso/login")
-      expect(directory.provider.sso_logout_url).to eq("https://yourIdp.com/saml2/sso/logout")
+      expect(directory.provider.provider_id).to eq('saml')
+      expect(directory.provider.sso_login_url).to eq('https://yourIdp.com/saml2/sso/login')
+      expect(directory.provider.sso_logout_url).to eq('https://yourIdp.com/saml2/sso/logout')
       expect(directory.provider.encoded_x509_signing_cert).not_to be_empty
-      expect(directory.provider.request_signature_algorithm).to eq("RSA-SHA256")
+      expect(directory.provider.request_signature_algorithm).to eq('RSA-SHA256')
     end
   end
 
-  describe 'saml #provider_metadata' do
+  describe 'saml #service_provider_metadata' do
+    let(:directory_name) { "rubysdkdirsaml-#{random_number}" }
     let(:directory) do
       test_api_client.directories.create(
-        name: 'rubysdkdir',
+        name: directory_name,
         description: 'description_for_some_test_directory',
         provider: {
-          provider_id: "saml",
-          sso_login_url:"https://yourIdp.com/saml2/sso/login",
-          sso_logout_url:"https://yourIdp.com/saml2/sso/logout",
-          encoded_x509_signing_cert:"-----BEGIN CERTIFICATE-----\n...Certificate goes here...\n-----END CERTIFICATE-----",
-          request_signature_algorithm:"RSA-SHA256"
+          provider_id: 'saml',
+          sso_login_url: 'https://yourIdp.com/saml2/sso/login',
+          sso_logout_url: 'https://yourIdp.com/saml2/sso/logout',
+          encoded_x509_signing_cert: "-----BEGIN CERTIFICATE-----\n...Certificate goes here...\n-----END CERTIFICATE-----",
+          request_signature_algorithm: 'RSA-SHA256'
         }
       )
     end
@@ -437,34 +446,35 @@ describe Stormpath::Resource::Directory, :vcr do
       directory.delete if directory
     end
 
-    it 'returnes provider metadata' do
-      stub_request(:post, "https://api.stormpath.com/v1/directories").
-        to_return(status:200, body: fixture('create_saml_directory.json'), headers:{})
+    it 'returnes service provider metadata' do
+      stub_request(:post, 'https://api.stormpath.com/v1/directories')
+        .to_return(status: 200, body: Stormpath::Test.mocked_create_saml_directory)
 
-      stub_request(:get, directory.href + "/provider").
-        to_return(status: 200, body: fixture('get_saml_directory_provider.json'), headers:{})
+      stub_request(:get, directory.href + '/provider')
+        .to_return(status: 200, body: Stormpath::Test.mocked_saml_directory_provider_response)
+      stub_request(:get, directory.service_provider_metadata.href)
+        .to_return(body: Stormpath::Test.mocked_saml_directory_provider_metadata_response, status: 200)
 
-      stub_request(:get, directory.provider.service_provider_metadata["href"]).
-        to_return(status: 200, body: fixture('get_saml_directory_provider_metadata.json'), headers: {})
-
-      expect(directory.provider_metadata.href).not_to be_empty
-      expect(directory.provider_metadata.entity_id).not_to be_empty
-      expect(directory.provider_metadata.assertion_consumer_service_post_endpoint).not_to be_empty
-      expect(directory.provider_metadata.x509_signing_cert).not_to be_empty
+      expect(directory.service_provider_metadata.href).not_to be_empty
+      expect(directory.service_provider_metadata.entity_id).not_to be_empty
+      expect(directory.service_provider_metadata.assertion_consumer_service_post_endpoint).not_to be_empty
+      expect(directory.service_provider_metadata.x509_signing_cert).not_to be_empty
     end
   end
 
   describe 'saml mapping rules' do
+    let(:directory_name) { "rubysdkdirsaml-#{random_number}" }
+    let(:rule) { { 'name' => 'email', 'accountAttributes' => ['email'] } }
     let(:directory) do
       test_api_client.directories.create(
-        name: 'rubysdkdir',
+        name: directory_name,
         description: 'description_for_some_test_directory',
         provider: {
-          provider_id: "saml",
-          sso_login_url:"https://yourIdp.com/saml2/sso/login",
-          sso_logout_url:"https://yourIdp.com/saml2/sso/logout",
-          encoded_x509_signing_cert:"-----BEGIN CERTIFICATE-----\n...Certificate goes here...\n-----END CERTIFICATE-----",
-          request_signature_algorithm:"RSA-SHA256"
+          provider_id: 'saml',
+          sso_login_url: 'https://yourIdp.com/saml2/sso/login',
+          sso_logout_url: 'https://yourIdp.com/saml2/sso/logout',
+          encoded_x509_signing_cert: Stormpath::Test.mocked_encoded_x509_signing_cert,
+          request_signature_algorithm: 'RSA-SHA256'
         }
       )
     end
@@ -474,26 +484,19 @@ describe Stormpath::Resource::Directory, :vcr do
     end
 
     it 'updates the directory mappings' do
-      mappings = Stormpath::Provider::SamlMappingRules.new(items: [
-        {
-          name: "uid",
-          account_attributes: ["username"]
-        }
-      ])
+      stub_request(:post, 'https://api.stormpath.com/v1/directories')
+        .to_return(status: 200, body: Stormpath::Test.mocked_create_saml_directory)
 
-      stub_request(:post, "https://api.stormpath.com/v1/directories").
-        to_return(status:200, body: fixture('create_saml_directory.json'), headers:{})
+      stub_request(:get, directory.href + '/provider')
+        .to_return(status: 200, body: Stormpath::Test.mocked_saml_directory_provider_response)
 
-      stub_request(:get, directory.href + "/provider").
-        to_return(status: 200, body: fixture('get_saml_directory_provider.json'), headers:{})
+      stub_request(:post, directory.provider.attribute_statement_mapping_rules.href)
+        .to_return(status: 200, body: Stormpath::Test.mocked_create_saml_directory_rules)
 
-      stub_request(:post, directory.provider.attribute_statement_mapping_rules["href"]).
-        to_return(status:200, body: fixture('create_saml_directory_mapping_rules.json'), headers:{})
-
-      response = directory.create_attribute_mappings(mappings)
-      expect(response.items).to eq( [ { "name" => "uid4", "name_format" => "nil", "account_attributes" => ["username"] } ] )
+      directory.attribute_statement_mapping_rules.items = [rule]
+      response = directory.attribute_statement_mapping_rules.save
+      expect(response.items).to eq([{ 'name' => 'uid4', 'name_format' => 'nil', 'account_attributes' => ['username'] }])
     end
-
   end
 
   describe '#create_account_with_custom_data' do
@@ -522,13 +525,14 @@ describe Stormpath::Resource::Directory, :vcr do
     after { directory.delete }
 
     context 'given a valid group' do
-      let(:created_group) { directory.groups.create(group_attrs(name: 'rubysdkgroup')) }
+      let(:group_name) { "rubysdkgroup#{random_number}" }
+      let(:created_group) { directory.groups.create(group_attrs(name: group_name)) }
 
       after { created_group.delete }
 
       it 'creates a group' do
         expect(created_group).to be
-        expect(created_group.name).to eq('rubysdkgroup')
+        expect(created_group.name).to eq(group_name)
       end
     end
   end