stormpath-sdk 1.6.0 → 1.7.0

data/spec/cache/cache_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'timecop'
 
 describe Stormpath::Cache::Cache do
-  let(:cache) { Stormpath::Cache::Cache.new ttl_seconds: 7, tti_seconds: 3 }
+  let(:cache) { Stormpath::Cache::Cache.new(ttl_seconds: 7, tti_seconds: 3) }
   let(:now)   { Time.now }
 
   before do
@@ -23,7 +23,7 @@ describe Stormpath::Cache::Cache do
   describe '#get' do
     context 'miss' do
       before do
-        @foo = cache.get 'not-foo'
+        @foo = cache.get('not-foo')
       end
 
       it 'gets nil' do
@@ -35,7 +35,7 @@ describe Stormpath::Cache::Cache do
     context 'live before tti' do
       before do
         Timecop.freeze now + 2
-        @foo = cache.get 'foo'
+        @foo = cache.get('foo')
       end
 
       it 'gets bar' do
@@ -47,9 +47,9 @@ describe Stormpath::Cache::Cache do
     context 'live after tti' do
       before do
         Timecop.freeze now + 2
-        cache.get 'foo'
+        cache.get('foo')
         Timecop.freeze now + 5
-        @foo = cache.get 'foo'
+        @foo = cache.get('foo')
       end
 
       it 'gets bar' do
@@ -61,7 +61,7 @@ describe Stormpath::Cache::Cache do
     context 'expired by tti' do
       before do
         Timecop.freeze now + 4
-        @foo = cache.get 'foo'
+        @foo = cache.get('foo')
       end
 
       it 'gets nil' do
@@ -73,11 +73,11 @@ describe Stormpath::Cache::Cache do
     context 'expired by ttl' do
       before do
         Timecop.freeze now + 2
-        cache.get 'foo'
+        cache.get('foo')
         Timecop.freeze now + 5
-        cache.get 'foo'
+        cache.get('foo')
         Timecop.freeze now + 8
-        @foo = cache.get 'foo'
+        @foo = cache.get('foo')
       end
 
       it 'gets nil' do

data/spec/cache/cache_stats_spec.rb

@@ -103,4 +103,4 @@ describe Stormpath::Cache::CacheStats do
       end
     end
   end
-end
+end

data/spec/client_spec.rb

@@ -106,7 +106,7 @@ properties
           end
           let(:client) do
             Stormpath::Client.new(
-              api_key_file_location: api_key_file_location,
+              api_key_file_location: api_key_file_location
             )
           end
 
@@ -120,11 +120,13 @@ properties
           end
 
           it 'raises an error' do
-            expect { client }.to raise_error ArgumentError,
+            expect { client }.to raise_error(
+              ArgumentError,
               "No API id in properties. Please provide a 'apiKey.id' property in '" +
               api_key_file_location +
-              "' or pass in an 'api_key_id_property_name' to the Stormpath::Client " +
-              "constructor to specify an alternative property."
+              "' or pass in an 'api_key_id_property_name' to the Stormpath::Client " \
+              'constructor to specify an alternative property.'
+            )
           end
         end
 
@@ -232,8 +234,8 @@ properties
           stub_request(:any, api_key_file_location).to_return(body: api_key_and_secret_properties)
           data_store = client.instance_variable_get '@data_store'
           cache_manager = data_store.cache_manager
-          @directories_cache = cache_manager.get_cache 'directories'
-          @groups_cache = cache_manager.get_cache 'groups'
+          @directories_cache = cache_manager.get_cache('directories')
+          @groups_cache = cache_manager.get_cache('groups')
         end
 
         it 'passes those params down to the caches' do
@@ -257,7 +259,7 @@ properties
       end
 
       let(:api_key) do
-        Stormpath::ApiKey.new test_api_key_id, test_api_key_secret
+        Stormpath::ApiKey.new(test_api_key_id, test_api_key_secret)
       end
 
       it 'initializes the request executor with the proxy' do
@@ -266,7 +268,7 @@ properties
           .with(proxy: http_proxy)
           .and_return request_executor
 
-        Stormpath::Client.new api_key: api_key, proxy: http_proxy
+        Stormpath::Client.new(api_key: api_key, proxy: http_proxy)
       end
     end
   end
@@ -295,6 +297,7 @@ properties
       end
 
       it 'accepts offset and limit' do
+        wait_for_resource_creation
         expect(test_api_client.applications.limit(2).count).to be >= 3
         expect(test_api_client.applications.offset(1).limit(2).count).to be >= 2
       end
@@ -323,7 +326,7 @@ properties
 
       context 'expanding a nested single resource' do
         let(:cached_account) do
-          client.accounts.get account.href, Stormpath::Resource::Expansion.new('directory')
+          client.accounts.get(account.href, Stormpath::Resource::Expansion.new('directory'))
         end
 
         before { client.data_store.initialize_cache({}) }
@@ -336,7 +339,7 @@ properties
 
       context 'expanding a nested collection resource' do
         let(:cached_account) do
-          client.accounts.get account.href, Stormpath::Resource::Expansion.new('groups')
+          client.accounts.get(account.href, Stormpath::Resource::Expansion.new('groups'))
         end
         let(:group) { directory.groups.create(group_attrs) }
 
@@ -350,16 +353,18 @@ properties
     end
 
     context 'search' do
+      let(:app_name_1) { "ruby-test-app-#{random_number}" }
+      let(:app_name_2) { "ruby-test-app-#{random_number}" }
       let!(:applications) do
         [
-          test_api_client.applications.create(application_attrs(name: 'rubytestapp1')),
-          test_api_client.applications.create(application_attrs(name: 'rubytestapp2'))
+          test_api_client.applications.create(application_attrs(name: app_name_1)),
+          test_api_client.applications.create(application_attrs(name: app_name_2))
         ]
       end
 
       context 'by any attribute' do
         let(:search_results) do
-          test_api_client.applications.search('rubytestapp1')
+          test_api_client.applications.search(app_name_1)
         end
 
         it 'returns the application' do
@@ -369,7 +374,7 @@ properties
 
       context 'by an explicit attribute' do
         let(:search_results) do
-          test_api_client.applications.search(name: 'rubytestapp1')
+          test_api_client.applications.search(name: app_name_1)
         end
 
         it 'returns the application' do
@@ -381,7 +386,7 @@ properties
     end
 
     describe '.create' do
-      let(:application_name) { 'rubytestapp' }
+      let(:application_name) { "rubyclientcreatespec-#{random_number}" }
 
       let(:application_attributes) do
         {
@@ -391,7 +396,7 @@ properties
       end
 
       context do
-        let(:application) { test_api_client.applications.create application_attributes }
+        let(:application) { test_api_client.applications.create(application_attributes) }
 
         it 'creates that application' do
           expect(application).to be
@@ -403,21 +408,18 @@ properties
       end
 
       describe 'auto directory creation' do
-        let(:application) { test_api_client.applications.create application_attributes, options }
-
-        let(:directories) do
-          test_api_client.directories
-        end
+        let(:application) { test_api_client.applications.create(application_attributes, options) }
 
         context 'login source' do
+          let(:username) { "johnsmith-#{random_number}" }
           let(:options) { { createDirectory: true } }
           let!(:account) do
             application.accounts.create(
-              account_attrs(username: 'johnsmith2', password: '4P@$$w0rd!')
+              account_attrs(username: username, password: '4P@$$w0rd!')
             )
           end
           let(:auth_request) do
-            Stormpath::Authentication::UsernamePasswordRequest.new 'johnsmith2', '4P@$$w0rd!'
+            Stormpath::Authentication::UsernamePasswordRequest.new(username, '4P@$$w0rd!')
           end
           let(:auth_result) { application.authenticate_account(auth_request) }
 
@@ -433,7 +435,7 @@ properties
 
           it 'creates directory named by appending "Directory" to app name' do
             application
-            expect(directories.map(&:name)).to include("#{application_name} Directory")
+            expect(test_api_client.directories.map(&:name)).to include("#{application_name} Directory")
           end
 
           context 'and existing directory' do
@@ -441,7 +443,7 @@ properties
               test_api_client.directories.each { |d| d.delete if "#{application_name} Directory" == d.name }
               test_api_client.directories.create(name: "#{application_name} Directory")
               application
-              expect(directories.map(&:name)).to include("#{application_name} Directory (2)")
+              expect(test_api_client.directories.map(&:name)).to include("#{application_name} Directory (2)")
             end
           end
         end
@@ -451,12 +453,9 @@ properties
 
           before { application }
 
-          #fails with Stormpath::Error: Authentication required.
           it 'creates directory named "Client Application Create Test Directory"' do
-            expect(directories.map(&:name)).to include("#{application_name} Directory")
+            expect(test_api_client.directories.map(&:name)).to include("#{application_name} Directory")
           end
-
-          it 'resolves naming conflict with existing directory throwing Stormpath::Error with status 409 and code 5010'
         end
 
         context 'with directory: ""' do
@@ -477,15 +476,17 @@ properties
           before { application }
 
           it 'creates no directory' do
-            expect(directories.map(&:name)).not_to include("#{application_name} Directory")
+            wait_for_resource_creation
+            expect(test_api_client.directories.map(&:name)).not_to include("#{application_name} Directory")
           end
         end
 
         after(:each) do |example|
+          wait_for_resource_creation
           unless example.metadata[:skip_cleanup]
             application.delete
             test_api_client.directories.each do |d|
-              d.delete if ["#{application_name} Directory", "#{application_name} Directory (2)", "#{application_name} Directory Custom"].include?(d.name)
+              d.delete if ["#{application_name} Directory", "#{application_name} Directory (2)"].include?(d.name)
             end
           end
         end
@@ -495,12 +496,12 @@ properties
 
   describe '#directories' do
     context 'given a collection' do
-      let(:directories) { test_api_client.directories }
-      let(:directory) { directories.create(directory_attrs) }
+      let(:directory) { test_api_client.directories.create(directory_attrs) }
 
       it 'returns the collection' do
-        expect(directories).to be_kind_of(Stormpath::Resource::Collection)
-        expect(directories.count).to be >= 1
+        wait_for_resource_creation
+        expect(test_api_client.directories).to be_kind_of(Stormpath::Resource::Collection)
+        expect(test_api_client.directories.count).to be >= 1
       end
 
       after { directory.delete }
@@ -516,19 +517,23 @@ properties
       end
 
       it 'should retrieve the number of directories described with the limit' do
+        wait_for_resource_creation
         expect(test_api_client.directories.count).to be >= 2
       end
     end
 
     describe '.create' do
+      let(:directory_name) { "rubysdkdir-#{random_number}" }
       let(:directory) do
-        test_api_client.directories.create(directory_attrs(name: 'ruby', description: 'ruby'))
+        test_api_client.directories.create(
+          directory_attrs(name: directory_name, description: directory_name)
+        )
       end
 
       it 'creates that application' do
         expect(directory).to be
-        expect(directory.name).to eq('ruby')
-        expect(directory.description).to eq('ruby')
+        expect(directory.name).to eq(directory_name)
+        expect(directory.description).to eq(directory_name)
       end
 
       after { directory.delete }
@@ -537,13 +542,13 @@ properties
 
   describe '#organization' do
     context 'search' do
-      let(:random_org_name) { "ruby-org-#{random_number}" }
+      let(:random_name_key) { "ruby-org-#{random_number}" }
       let!(:organization) do
-        test_api_client.organizations.create(organization_attrs(name: random_org_name))
+        test_api_client.organizations.create(organization_attrs(name: random_name_key))
       end
 
       context 'by any attribute' do
-        let(:search_results) { test_api_client.organizations.search(random_org_name) }
+        let(:search_results) { test_api_client.organizations.search(random_name_key) }
 
         it 'returns the application' do
           expect(search_results.count).to eq 1
@@ -551,7 +556,7 @@ properties
       end
 
       context 'by an explicit attribute' do
-        let(:search_results) { test_api_client.organizations.search(name: random_org_name) }
+        let(:search_results) { test_api_client.organizations.search(name: random_name_key) }
 
         it 'returns the application' do
           expect(search_results.count).to eq 1
@@ -587,17 +592,22 @@ properties
     end
 
     describe '.create' do
+      let(:organization_name) { "rubysdkorg#{random_number}" }
       let(:organization) do
-        test_api_client.organizations.create(organization_attrs(name: 'ruby',
-                                                                name_key: 'ruby-org',
-                                                                description: 'ruby-org'))
+        test_api_client.organizations.create(
+          organization_attrs(
+            name: organization_name,
+            name_key: organization_name,
+            description: organization_name
+          )
+        )
       end
 
       it 'creates an organization' do
         expect(organization).to be
-        expect(organization.name).to eq('ruby')
-        expect(organization.name_key).to eq('ruby-org')
-        expect(organization.description).to eq('ruby-org')
+        expect(organization.name).to eq(organization_name)
+        expect(organization.name_key).to eq(organization_name)
+        expect(organization.description).to eq(organization_name)
       end
 
       after { organization.delete }
@@ -658,27 +668,17 @@ properties
   end
 
   describe '#account_links' do
-    let(:application) do
-      test_api_client.applications.create(name: 'ruby sdk app', description: 'ruby sdk desc')
-    end
-    let(:directory1) do
-      test_api_client.directories.create(name: 'ruby sdk dir 1')
-    end
-    let(:directory2) do
-      test_api_client.directories.create(name: 'ruby sdk dir 2')
-    end
+    let(:application) { test_api_client.applications.create(application_attrs) }
+    let(:directory1) { test_api_client.directories.create(directory_attrs) }
+    let(:directory2) { test_api_client.directories.create(directory_attrs) }
 
     before do
       map_account_store(application, directory1, 1, true, false)
       map_account_store(application, directory2, 2, false, false)
     end
 
-    let!(:account1) do
-      directory1.accounts.create(account_attrs(email: 'jekyll', username: 'jekyll'))
-    end
-    let!(:account2) do
-      directory2.accounts.create(account_attrs(email: 'hyde', username: 'hyde'))
-    end
+    let!(:account1) { directory1.accounts.create(account_attrs) }
+    let!(:account2) { directory2.accounts.create(account_attrs) }
 
     let(:link_accounts) do
       test_api_client.account_links.create(

data/spec/data_store_spec.rb

@@ -6,9 +6,9 @@ shared_examples 'a data store' do
   let(:data_store) do
     Stormpath::DataStore.new(request_executor, test_api_key, store, nil)
   end
-  let(:application_cache) { data_store.cache_manager.get_cache 'applications' }
-  let(:tenant_cache)      { data_store.cache_manager.get_cache 'tenants' }
-  let(:group_cache)       { data_store.cache_manager.get_cache 'groups' }
+  let(:application_cache) { data_store.cache_manager.get_cache('applications') }
+  let(:tenant_cache)      { data_store.cache_manager.get_cache('tenants') }
+  let(:group_cache)       { data_store.cache_manager.get_cache('groups') }
   let(:default_base_url) { Stormpath::DataStore::DEFAULT_BASE_URL }
 
   after do
@@ -22,8 +22,10 @@ shared_examples 'a data store' do
     end
 
     it 'pulls resource name from href if its custom data also' do
-      region = data_store.send(:region_for,
-                               "#{default_base_url}/v1/accounts/7jWpcEVSgawKkAZp8XDIEw/customData")
+      region = data_store.send(
+        :region_for,
+        "#{default_base_url}/v1/accounts/7jWpcEVSgawKkAZp8XDIEw/customData"
+      )
       expect(region).to eq('customData')
     end
   end
@@ -71,7 +73,7 @@ shared_examples 'a data store' do
         href = resource['href']
         request_executor.response = MultiJson.dump resource
         data_store.get_resource href, Stormpath::Resource::Application
-        @cached = application_cache.get href
+        @cached = application_cache.get(href)
       end
 
       it 'caches a shallow resource' do
@@ -109,7 +111,7 @@ shared_examples 'a data store' do
         href = resource['href']
         request_executor.response = MultiJson.dump resource
         data_store.get_resource href, Stormpath::Resource::Application
-        @cached = application_cache.get href
+        @cached = application_cache.get(href)
       end
 
       it 'caches a shallow resource' do
@@ -158,12 +160,14 @@ shared_examples 'a data store' do
 
   context '#apply_default_user_agent' do
     let(:request) do
-      Stormpath::Http::Request.new('get',
-                                   'http://example.com/resources/abc123',
-                                   nil,
-                                   {},
-                                   nil,
-                                   test_api_key)
+      Stormpath::Http::Request.new(
+        'get',
+        'http://example.com/resources/abc123',
+        nil,
+        {},
+        nil,
+        test_api_key
+      )
     end
 
     before do
@@ -187,7 +191,12 @@ describe Stormpath::DataStore do
   end
 
   context 'memcached store' do
-    let(:store) { { store: Stormpath::Cache::MemcachedStore, store_opts: { host: 'localhost:11211', prefix_key: 'mem' } } }
+    let(:store) do
+      {
+        store: Stormpath::Cache::MemcachedStore,
+        store_opts: { host: 'localhost:11211', prefix_key: 'mem' }
+      }
+    end
     it_should_behave_like 'a data store'
   end
 end