stormpath-sdk 1.0.0.beta.6 → 1.0.0.beta.7

data/spec/resource/custom_data_spec.rb

@@ -6,7 +6,7 @@ describe Stormpath::Resource::CustomData, :vcr do
   end
 
   context 'wuth caching regions' do
-    let(:directory) { test_api_client.directories.create name: 'test_directory' }
+    let(:directory) { test_api_client.directories.create name: random_directory_name }
 
     it_behaves_like 'account_custom_data'
     it_behaves_like 'group_custom_data'
@@ -17,7 +17,7 @@ describe Stormpath::Resource::CustomData, :vcr do
       @disabled_cache_client ||= Stormpath::Client.new({api_key: test_api_key, cache: { store: Stormpath::Cache::DisabledCacheStore }})
     end
 
-    let(:directory) { disabled_cache_client.directories.create name: 'test_directory' }
+    let(:directory) { disabled_cache_client.directories.create name: random_directory_name }
 
     it_behaves_like 'account_custom_data'
     it_behaves_like 'group_custom_data'

data/spec/resource/directory_spec.rb

@@ -3,22 +3,24 @@ require 'spec_helper'
 describe Stormpath::Resource::Directory, :vcr do
 
   describe "instances should respond to attribute property methods" do
-    subject(:directory) { test_api_client.directories.create name: 'some_test_directory', description: 'description_for_some_test_directory' }
+    let(:directory) { test_api_client.directories.create name: random_directory_name, description: 'description_for_some_test_directory' }
 
-    it { should be_instance_of Stormpath::Resource::Directory }
-
-    [:name, :description, :status].each do |property_accessor|
-      it { should respond_to property_accessor }
-      it { should respond_to "#{property_accessor}="}
-      its(property_accessor) { should be_instance_of String }
+    after do
+      directory.delete if directory
     end
 
-    its(:tenant) { should be_instance_of Stormpath::Resource::Tenant }
-    its(:groups) { should be_instance_of Stormpath::Resource::Collection }
-    its(:accounts) { should be_instance_of Stormpath::Resource::Collection }
+    it do
+      expect(directory).to be_a Stormpath::Resource::Directory
 
-    after do
-      directory.delete if directory
+      [:name, :description, :status].each do |property_accessor|
+        expect(directory).to respond_to(property_accessor)
+        expect(directory).to respond_to("#{property_accessor}=")
+        expect(directory.send property_accessor).to be_a String
+      end
+
+      expect(directory.tenant).to be_a Stormpath::Resource::Tenant
+      expect(directory.groups).to be_a Stormpath::Resource::Collection
+      expect(directory.accounts).to be_a Stormpath::Resource::Collection
     end
   end
 
@@ -42,7 +44,7 @@ describe Stormpath::Resource::Directory, :vcr do
     end
 
     context '#groups' do
-      let(:group) { directory.groups.create name: "test_group"}
+      let(:group) { directory.groups.create name: random_group_name }
 
       after do
         group.delete if group
@@ -64,11 +66,11 @@ describe Stormpath::Resource::Directory, :vcr do
 
     let(:account) do
       Stormpath::Resource::Account.new({
-        email: "test@example.com",
+        email: random_email,
         given_name: 'Ruby SDK',
         password: 'P@$$w0rd',
         surname: 'SDK',
-        username: "username"
+        username: random_user_name
       })
     end
 
@@ -130,11 +132,11 @@ describe Stormpath::Resource::Directory, :vcr do
 
       it 'creates an account with custom data' do
         account =  Stormpath::Resource::Account.new({
-          email: "test@example.com",
+          email: random_email,
           given_name: 'Ruby SDK',
           password: 'P@$$w0rd',
           surname: 'SDK',
-          username: "username"
+          username: random_user_name
         })
 
         account.custom_data["birth_date"] = "2305-07-13"
@@ -170,9 +172,9 @@ describe Stormpath::Resource::Directory, :vcr do
 
   describe '#delete_directory' do
 
-    let(:directory) { test_api_client.directories.create name: 'test_directory' }
+    let(:directory) { test_api_client.directories.create name: random_directory_name }
 
-    let(:application) { test_api_client.applications.create name: 'test_application' }
+    let(:application) { test_api_client.applications.create name: random_application_name }
 
     let!(:group) { directory.groups.create name: 'someGroup' }
 
@@ -187,19 +189,19 @@ describe Stormpath::Resource::Directory, :vcr do
     end
 
     it 'and all of its associations' do
-      expect(directory.groups).to have(1).item
-      expect(directory.accounts).to have(1).item
+      expect(directory.groups.count).to eq(1)
+      expect(directory.accounts.count).to eq(1)
 
       expect(application.account_store_mappings.first.account_store).to eq(directory)
 
       expect(application.accounts).to include(account)
       expect(application.groups).to include(group)
 
-      expect(application.account_store_mappings).to have(1).item
+      expect(application.account_store_mappings.count).to eq(1)
 
       directory.delete
 
-      expect(application.account_store_mappings).to have(0).item
+      expect(application.account_store_mappings.count).to eq(0)
 
       expect(application.accounts).not_to include(account)
       expect(application.groups).not_to include(group)

data/spec/resource/group_membership_spec.rb

@@ -8,7 +8,7 @@ describe Stormpath::Resource::GroupMembership, :vcr do
   describe '#add_account' do
     context "given an account and a group" do
 
-      let(:directory) { test_api_client.directories.create name: 'testDirectory' }
+      let(:directory) { test_api_client.directories.create name: random_directory_name }
 
       let(:group) { directory.groups.create name: 'someGroup' }
 
@@ -23,8 +23,8 @@ describe Stormpath::Resource::GroupMembership, :vcr do
       end
 
       it ", group membership and account membership should correspond to each other" do
-        expect(group.account_memberships).to have(1).item
-        expect(account.group_memberships).to have(1).item
+        expect(group.account_memberships.count).to eq(1)
+        expect(account.group_memberships.count).to eq(1)
         expect(group.accounts).to include(account)
         expect(account.groups).to include(group)
         expect(group.account_memberships.first).to be_a(Stormpath::Resource::GroupMembership)

data/spec/resource/group_spec.rb

@@ -5,32 +5,31 @@ describe Stormpath::Resource::Group, :vcr do
   describe "instances should respond to attribute property methods" do
     let(:directory) { test_directory }
 
-    subject(:group) { directory.groups.create name: 'someTestGroup', description: 'someTestDescription' }
-
-    [:name, :description, :status].each do |property_accessor|
-      it { should respond_to property_accessor }
-      it { should respond_to "#{property_accessor}="}
-      its(property_accessor) { should be_instance_of String }
-    end
-
-    its(:tenant) { should be_instance_of Stormpath::Resource::Tenant }
-    its(:directory) { should be_instance_of Stormpath::Resource::Directory }
-    its(:custom_data) { should be_instance_of Stormpath::Resource::CustomData }
-
-    its(:accounts) { should be_instance_of Stormpath::Resource::Collection }
-    its(:account_memberships) { should be_instance_of Stormpath::Resource::Collection}
-
+    let(:group) { directory.groups.create name: 'someTestGroup', description: 'someTestDescription' }
 
     after do
       group.delete if group
     end
 
+    it do
+      [:name, :description, :status].each do |property_accessor|
+        expect(group).to respond_to(property_accessor)
+        expect(group).to respond_to("#{property_accessor}=")
+        expect(group.send property_accessor).to be_a String
+      end
+
+      expect(group.tenant).to be_a Stormpath::Resource::Tenant
+      expect(group.directory).to be_a Stormpath::Resource::Directory
+      expect(group.custom_data).to be_a Stormpath::Resource::CustomData
+      expect(group.accounts).to be_a Stormpath::Resource::Collection
+      expect(group.account_memberships).to be_a Stormpath::Resource::Collection
+    end
   end
 
   describe '#add_or_remove_account' do
     context "given an account" do
 
-      let(:directory) { test_api_client.directories.create name: 'testDirectory' }
+      let(:directory) { test_api_client.directories.create name: random_directory_name }
 
       let(:group) { directory.groups.create name: 'someGroup' }
 
@@ -51,7 +50,7 @@ describe Stormpath::Resource::Group, :vcr do
       end
 
       it 'has one account membership resource' do
-        expect(group.account_memberships).to have(1).item
+        expect(group.account_memberships.count).to eq(1)
       end
 
       it 'adds and removes the group from the account' do

data/spec/resource/status_spec.rb

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
 describe Stormpath::Resource::Status, :vcr do
-  
+
   def authenticate_user
     auth_request = Stormpath::Authentication::UsernamePasswordRequest.new 'test@example.com', 'P@$$w0rd'
     account_store_mapping unless account_store_mapping
     application.authenticate_account auth_request
   end
 
-  let(:directory) { test_api_client.directories.create name: 'testDirectory', description: 'testDirectory' }
+  let(:directory) { test_api_client.directories.create name: random_directory_name, description: 'testDirectory for statuses' }
+
+  let(:application) { test_api_client.applications.create name: random_application_name, description: 'testDirectory for statuses' }
 
-  let(:application) { test_api_client.applications.create name: 'testApplication', description: 'testApplication' }
-  
   let(:group) { directory.groups.create name: 'testGroup', description: 'testGroup' }
 
   let(:account_store_mapping) { test_api_client.account_store_mappings.create application: application, account_store: directory }
@@ -28,25 +28,25 @@ describe Stormpath::Resource::Status, :vcr do
     application.delete if application
     directory.delete if directory
   end
-    
+
   it "should respond to status getter and setter" do
-    expect(directory.respond_to? :status).to be_true
-    expect(directory.respond_to? :status=).to be_true
+    expect(directory.respond_to? :status).to be_truthy
+    expect(directory.respond_to? :status=).to be_truthy
 
-    expect(application.respond_to? :status).to be_true
-    expect(application.respond_to? :status=).to be_true
-    
-    expect(group.respond_to? :status).to be_true
-    expect(group.respond_to? :status=).to be_true
+    expect(application.respond_to? :status).to be_truthy
+    expect(application.respond_to? :status=).to be_truthy
 
-    expect(account.respond_to? :status).to be_true
-    expect(account.respond_to? :status=).to be_true
+    expect(group.respond_to? :status).to be_truthy
+    expect(group.respond_to? :status=).to be_truthy
+
+    expect(account.respond_to? :status).to be_truthy
+    expect(account.respond_to? :status=).to be_truthy
   end
 
   it "compare status hashes" do
     expect(directory.status_hash).to eq(status_hash)
     expect(application.status_hash).to eq(status_hash)
-    
+
     expect(group.status_hash).to eq(status_hash)
     expect(account.status_hash).to eq(account_status_hash)
   end
@@ -60,7 +60,7 @@ describe Stormpath::Resource::Status, :vcr do
     account.save
     expect(reloaded_account.status).to eq("DISABLED")
   end
- 
+
   it "authenticate user with status ENABLED" do
     expect(authenticate_user.properties["account"]["href"]).to eq(account.href)
   end

data/spec/resource/tenant_spec.rb

@@ -3,17 +3,19 @@ require 'spec_helper'
 describe Stormpath::Resource::Tenant, :vcr do
 
   describe "instances should respond to attribute property methods" do
-    subject(:tenant) { test_api_client.tenant }
+    let(:tenant) { test_api_client.tenant }
 
-    it { should be_instance_of Stormpath::Resource::Tenant }
+    it do
+      expect(tenant).to be_a Stormpath::Resource::Tenant
 
-    [:name, :key].each do |property_accessor|
-      it { should respond_to property_accessor }
-      its(property_accessor) { should be_instance_of String }
-    end
+      [:name, :key].each do |property_accessor|
+        expect(tenant).to respond_to(property_accessor)
+        expect(tenant.send property_accessor).to be_a String
+      end
 
-    its(:applications) { should be_instance_of Stormpath::Resource::Collection }
-    its(:directories) { should be_instance_of Stormpath::Resource::Collection }
+      expect(tenant.applications).to be_a Stormpath::Resource::Collection
+      expect(tenant.directories).to be_a Stormpath::Resource::Collection
+    end
   end
 
 end

data/spec/spec_helper.rb

@@ -6,10 +6,8 @@ SimpleCov.start
 
 require 'stormpath-sdk'
 require 'pry'
-require 'pry-debugger'
 require 'webmock/rspec'
 require 'vcr'
-require_relative '../support/api.rb'
 
 Dir['./spec/support/*.rb'].each { |file| require file }
 
@@ -24,6 +22,12 @@ VCR.configure do |c|
   c.ignore_request { |r| HIJACK_HTTP_REQUESTS_WITH_VCR == false }
 end
 
+RSpec::Matchers.define :be_boolean do
+  match do |actual|
+    actual.should satisfy { |x| x == true || x == false }
+  end
+end
+
 module Stormpath
   module TestApiKeyHelpers
     TEST_ENV_REQUIRED_VARS = {
@@ -87,23 +91,44 @@ module Stormpath
   end
 
   module TestResourceHelpers
-    def destroy_all_stormpath_test_resources
-      Stormpath::Support::Api.destroy_resources(
-        test_api_key_id, test_api_key_secret, test_application_url,
-        test_directory_url, test_directory_with_verification_url
-      )
-    end
-
     def build_account(opts={})
       opts.tap do |o|
         o[:surname]    = (!opts[:surname].blank? && opts[:surname]) || 'surname'
         o[:given_name] = (!opts[:given_name].blank? && opts[:given_name]) || 'givenname'
-        o[:username]   = (!opts[:username].blank? && opts[:username]) || 'username'
+        o[:username]   = (!opts[:username].blank? && opts[:username]) || random_user_name
         o[:password]   = (!opts[:password].blank? && opts[:password]) || 'P@$$w0rd'
-        o[:email]      = (!opts[:email].blank? && opts[:email]) || 'test@example.com'
+        o[:email]      = (!opts[:email].blank? && opts[:email]) || random_email
       end
     end
   end
+
+  module RandomResourceNameGenerator
+    include UUIDTools
+
+    %w(application directory group user).each do |resource|
+      define_method "random_#{resource}_name" do |suffix=nil|
+        "#{random_string}_#{resource}_#{suffix}"
+      end
+    end
+
+    def random_email
+      "#{random_string}@stormpath.com"
+    end
+
+    def random_string
+      if HIJACK_HTTP_REQUESTS_WITH_VCR
+        'test'
+      else
+        UUID.method(:random_create).call.to_s[0..9]
+      end
+    end
+  end
+end
+
+RSpec::Matchers.define :be_boolean do
+  match do |actual|
+    actual == true || actual == false
+  end
 end
 
 RSpec.configure do |c|
@@ -117,8 +142,7 @@ RSpec.configure do |c|
 
   c.include Stormpath::TestApiKeyHelpers
   c.include Stormpath::TestResourceHelpers
-
-  c.treat_symbols_as_metadata_keys_with_true_values = true
+  c.include Stormpath::RandomResourceNameGenerator
 
   c.before(:all) do
     unless test_missing_env_vars.empty?
@@ -129,11 +153,6 @@ RSpec.configure do |c|
       set_up_message << "\nBe sure to configure these before running the specs again."
       raise set_up_message
     end
-
-    destroy_all_stormpath_test_resources unless HIJACK_HTTP_REQUESTS_WITH_VCR
   end
 
-  c.after(:all) do
-    destroy_all_stormpath_test_resources unless HIJACK_HTTP_REQUESTS_WITH_VCR
-  end
 end

data/spec/support/custom_data_storage_behavior.rb

@@ -1,16 +1,16 @@
 shared_examples_for 'account_custom_data' do
   context 'account' do
     let(:custom_data_storage) do
-      directory.accounts.create username: "jlpicard",
-         email: "capt@enterprise.com",
+      directory.accounts.create username: random_user_name,
+         email: random_email,
          givenName: "Jean-Luc",
          surname: "Picard",
          password: "uGhd%a8Kl!"
     end
 
     let(:custom_data_storage_w_nested_custom_data) do
-      directory.accounts.create username: "jlpicard",
-         email: "capt@enterprise.com",
+      directory.accounts.create username: random_user_name,
+         email: random_email,
          given_name: "Jean-Luc",
          surname: "Picard",
          password: "uGhd%a8Kl!",
@@ -36,11 +36,11 @@ end
 shared_examples_for 'group_custom_data' do
   context 'group' do
     let(:custom_data_storage) do
-      directory.groups.create name: 'test_group'
+      directory.groups.create name: random_group_name
     end
 
     let(:custom_data_storage_w_nested_custom_data) do
-      directory.groups.create name: "Jean",
+      directory.groups.create name: random_group_name,
          description: "Capital Group",
          custom_data: {
             rank: "Captain",
@@ -266,7 +266,7 @@ shared_examples_for 'custom_data_storage' do
     custom_data_storage.custom_data[:rank] = "Captain"
     custom_data_storage.custom_data["favorite_drink"] = "Earl Grey Tea"
     custom_data_storage.custom_data.save
-    
+
     custom_data_storage.custom_data.delete(:rank)
     custom_data_storage.custom_data.save
 
@@ -277,19 +277,19 @@ shared_examples_for 'custom_data_storage' do
 
 
   it '#has_key?' do
-    expect(custom_data_storage.custom_data.has_key? "createdAt").to be_true
-    expect(custom_data_storage.custom_data.has_key? "created_at").not_to be_true
+    expect(custom_data_storage.custom_data.has_key? "createdAt").to be_truthy
+    expect(custom_data_storage.custom_data.has_key? "created_at").to be_falsey
   end
 
   it '#include?' do
-    expect(custom_data_storage.custom_data.include? "createdAt").to be_true
-    expect(custom_data_storage.custom_data.include? "created_at").not_to be_true
+    expect(custom_data_storage.custom_data.include? "createdAt").to be_truthy
+    expect(custom_data_storage.custom_data.include? "created_at").to be_falsey
   end
 
   it '#has_value?' do
     custom_data_storage.custom_data[:rank] = "Captain"
     custom_data_storage.custom_data.save
-    expect(reloaded_custom_data_storage.custom_data.has_value? "Captain").to be_true
+    expect(reloaded_custom_data_storage.custom_data.has_value? "Captain").to be_truthy
   end
 
   it '#store' do
@@ -336,7 +336,7 @@ shared_examples_for 'custom_data_storage' do
 
   it '#keys' do
     expect(custom_data_storage.custom_data.keys).to be_kind_of(Array)
-    expect(custom_data_storage.custom_data.keys).to have_at_least(3).items
+    expect(custom_data_storage.custom_data.keys.count).to eq(3)
     expect(custom_data_storage.custom_data.keys).to eq(custom_data_storage.custom_data.properties.keys)
   end
 
@@ -348,7 +348,7 @@ shared_examples_for 'custom_data_storage' do
   end
 
   it 'inner property holders clearing properly' do
-    expect(deleted_properties).to have(0).items
+    expect(deleted_properties.count).to eq(0)
 
     custom_data_storage.custom_data[:permissions] = 'NOOP'
 
@@ -358,12 +358,12 @@ shared_examples_for 'custom_data_storage' do
     custom_data_storage.custom_data.delete(:permissions)
     expect(custom_data_storage.custom_data[:permissions]).to be_nil
 
-    expect(deleted_properties).to have(1).items
+    expect(deleted_properties.count).to eq(1)
 
     custom_data_storage.custom_data.save
 
     expect(custom_data_storage.custom_data[:permissions]).to be_nil
-    expect(deleted_properties).to have(0).items
+    expect(deleted_properties.count).to eq(0)
 
     custom_data_storage.custom_data[:permissions] = 'NOOP'
     expect(custom_data_storage.custom_data[:permissions]).to eq("NOOP")
@@ -371,18 +371,18 @@ shared_examples_for 'custom_data_storage' do
     custom_data_storage.custom_data.delete(:permissions)
     expect(custom_data_storage.custom_data[:permissions]).to be_nil
 
-    expect(deleted_properties).to have(1).items
+    expect(deleted_properties.count).to eq(1)
 
     if custom_data_storage.is_a? Stormpath::Resource::Account
       custom_data_storage.given_name = "Capt"
     else
-      custom_data_storage.name = "Capt"
+      custom_data_storage.name = random_group_name
     end
 
     custom_data_storage.save
 
     expect(custom_data_storage.custom_data[:permissions]).to be_nil
-    expect(deleted_properties).to have(0).items
+    expect(deleted_properties.count).to eq(0)
   end
 
   def deleted_properties