apartment 1.0.2 → 1.1.0

data/spec/examples/generic_adapter_examples.rb

@@ -14,13 +14,13 @@ shared_examples_for "a generic apartment adapter" do
   describe "#create" do
 
     it "should create the new databases" do
-      tenant_names.should include(db1)
-      tenant_names.should include(db2)
+      expect(tenant_names).to include(db1)
+      expect(tenant_names).to include(db2)
     end
 
     it "should load schema.rb to new schema" do
       subject.switch(db1) do
-        connection.tables.should include('companies')
+        expect(connection.tables).to include('companies')
       end
     end
 
@@ -31,32 +31,32 @@ shared_examples_for "a generic apartment adapter" do
 
       subject.create(db2) do
         @count = User.count
-        subject.current.should == db2
+        expect(subject.current).to eq(db2)
         User.create
       end
 
-      subject.current.should_not == db2
+      expect(subject.current).not_to eq(db2)
 
-      subject.switch(db2){ User.count.should == @count + 1 }
+      subject.switch(db2){ expect(User.count).to eq(@count + 1) }
     end
   end
 
   describe "#drop" do
     it "should remove the db" do
       subject.drop db1
-      tenant_names.should_not include(db1)
+      expect(tenant_names).not_to include(db1)
     end
   end
 
   describe "#switch!" do
     it "should connect to new db" do
       subject.switch!(db1)
-      subject.current.should == db1
+      expect(subject.current).to eq(db1)
     end
 
     it "should reset connection if database is nil" do
       subject.switch!
-      subject.current.should == default_tenant
+      expect(subject.current).to eq(default_tenant)
     end
 
     it "should raise an error if database is invalid" do
@@ -69,9 +69,9 @@ shared_examples_for "a generic apartment adapter" do
   describe "#switch" do
     it "connects and resets the tenant" do
       subject.switch(db1) do
-        subject.current.should == db1
+        expect(subject.current).to eq(db1)
       end
-      subject.current.should == default_tenant
+      expect(subject.current).to eq(default_tenant)
     end
 
     # We're often finding when using Apartment in tests, the `current` (ie the previously connect to db)
@@ -88,7 +88,7 @@ shared_examples_for "a generic apartment adapter" do
       expect(Apartment::Deprecation).to receive(:warn)
 
       subject.switch(db1)
-      subject.current.should == db1
+      expect(subject.current).to eq(db1)
     end
   end
 
@@ -97,7 +97,7 @@ shared_examples_for "a generic apartment adapter" do
       expect(Apartment::Deprecation).to receive(:warn)
 
       subject.process(db1) do
-        subject.current.should == db1
+        expect(subject.current).to eq(db1)
       end
     end
   end
@@ -106,14 +106,14 @@ shared_examples_for "a generic apartment adapter" do
     it "should reset connection" do
       subject.switch!(db1)
       subject.reset
-      subject.current.should == default_tenant
+      expect(subject.current).to eq(default_tenant)
     end
   end
 
   describe "#current" do
     it "should return the current db name" do
       subject.switch!(db1)
-      subject.current.should == db1
+      expect(subject.current).to eq(db1)
     end
   end
 

data/spec/examples/schema_adapter_examples.rb

@@ -18,7 +18,7 @@ shared_examples_for "a schema based apartment adapter" do
     it "should process model exclusions" do
       Apartment::Tenant.init
 
-      Company.table_name.should == "public.companies"
+      expect(Company.table_name).to eq("public.companies")
     end
 
     context "with a default_schema", :default_schema => true do
@@ -26,20 +26,20 @@ shared_examples_for "a schema based apartment adapter" do
       it "should set the proper table_name on excluded_models" do
         Apartment::Tenant.init
 
-        Company.table_name.should == "#{default_schema}.companies"
+        expect(Company.table_name).to eq("#{default_schema}.companies")
       end
 
       it 'sets the search_path correctly' do
         Apartment::Tenant.init
 
-        User.connection.schema_search_path.should =~ %r|#{default_schema}|
+        expect(User.connection.schema_search_path).to match(%r|#{default_schema}|)
       end
     end
 
     context "persistent_schemas", :persistent_schemas => true do
       it "sets the persistent schemas in the schema_search_path" do
         Apartment::Tenant.init
-        connection.schema_search_path.should end_with persistent_schemas.map { |schema| %{"#{schema}"} }.join(', ')
+        expect(connection.schema_search_path).to end_with persistent_schemas.map { |schema| %{"#{schema}"} }.join(', ')
       end
     end
   end
@@ -51,7 +51,7 @@ shared_examples_for "a schema based apartment adapter" do
 
     it "should load schema.rb to new schema" do
       connection.schema_search_path = schema1
-      connection.tables.should include('companies')
+      expect(connection.tables).to include('companies')
     end
 
     it "should yield to block if passed and reset" do
@@ -61,13 +61,13 @@ shared_examples_for "a schema based apartment adapter" do
 
       subject.create(schema2) do
         @count = User.count
-        connection.schema_search_path.should start_with %{"#{schema2}"}
+        expect(connection.schema_search_path).to start_with %{"#{schema2}"}
         User.create
       end
 
-      connection.schema_search_path.should_not start_with %{"#{schema2}"}
+      expect(connection.schema_search_path).not_to start_with %{"#{schema2}"}
 
-      subject.switch(schema2){ User.count.should == @count + 1 }
+      subject.switch(schema2){ expect(User.count).to eq(@count + 1) }
     end
 
     context "numeric database names" do
@@ -76,7 +76,7 @@ shared_examples_for "a schema based apartment adapter" do
         expect {
           subject.create(db)
         }.to_not raise_error
-        tenant_names.should include(db.to_s)
+        expect(tenant_names).to include(db.to_s)
       end
 
       after{ subject.drop(db) }
@@ -99,7 +99,7 @@ shared_examples_for "a schema based apartment adapter" do
         expect {
           subject.drop(db)
         }.to_not raise_error
-        tenant_names.should_not include(db.to_s)
+        expect(tenant_names).not_to include(db.to_s)
       end
 
       after { subject.drop(db) rescue nil }
@@ -109,10 +109,10 @@ shared_examples_for "a schema based apartment adapter" do
   describe "#switch" do
     it "connects and resets" do
       subject.switch(schema1) do
-        connection.schema_search_path.should start_with %{"#{schema1}"}
+        expect(connection.schema_search_path).to start_with %{"#{schema1}"}
       end
 
-      connection.schema_search_path.should start_with %{"#{public_schema}"}
+      expect(connection.schema_search_path).to start_with %{"#{public_schema}"}
     end
   end
 
@@ -120,14 +120,14 @@ shared_examples_for "a schema based apartment adapter" do
     it "should reset connection" do
       subject.switch!(schema1)
       subject.reset
-      connection.schema_search_path.should start_with %{"#{public_schema}"}
+      expect(connection.schema_search_path).to start_with %{"#{public_schema}"}
     end
 
     context "with default_schema", :default_schema => true do
       it "should reset to the default schema" do
         subject.switch!(schema1)
         subject.reset
-        connection.schema_search_path.should start_with %{"#{default_schema}"}
+        expect(connection.schema_search_path).to start_with %{"#{default_schema}"}
       end
     end
 
@@ -138,13 +138,13 @@ shared_examples_for "a schema based apartment adapter" do
       end
 
       it "maintains the persistent schemas in the schema_search_path" do
-        connection.schema_search_path.should end_with persistent_schemas.map { |schema| %{"#{schema}"} }.join(', ')
+        expect(connection.schema_search_path).to end_with persistent_schemas.map { |schema| %{"#{schema}"} }.join(', ')
       end
 
       context "with default_schema", :default_schema => true do
         it "prioritizes the switched schema to front of schema_search_path" do
           subject.reset # need to re-call this as the default_schema wasn't set at the time that the above reset ran
-          connection.schema_search_path.should start_with %{"#{default_schema}"}
+          expect(connection.schema_search_path).to start_with %{"#{default_schema}"}
         end
       end
     end
@@ -153,12 +153,12 @@ shared_examples_for "a schema based apartment adapter" do
   describe "#switch!" do
     it "should connect to new schema" do
       subject.switch!(schema1)
-      connection.schema_search_path.should start_with %{"#{schema1}"}
+      expect(connection.schema_search_path).to start_with %{"#{schema1}"}
     end
 
     it "should reset connection if database is nil" do
       subject.switch!
-      connection.schema_search_path.should == %{"#{public_schema}"}
+      expect(connection.schema_search_path).to eq(%{"#{public_schema}"})
     end
 
     it "should raise an error if schema is invalid" do
@@ -176,7 +176,7 @@ shared_examples_for "a schema based apartment adapter" do
           subject.switch!(db)
         }.to_not raise_error
 
-        connection.schema_search_path.should start_with %{"#{db.to_s}"}
+        expect(connection.schema_search_path).to start_with %{"#{db.to_s}"}
       end
 
       after{ subject.drop(db) }
@@ -188,11 +188,11 @@ shared_examples_for "a schema based apartment adapter" do
       end
 
       it "should switch out the default schema rather than public" do
-        connection.schema_search_path.should_not include default_schema
+        expect(connection.schema_search_path).not_to include default_schema
       end
 
       it "should still switch to the switched schema" do
-        connection.schema_search_path.should start_with %{"#{schema1}"}
+        expect(connection.schema_search_path).to start_with %{"#{schema1}"}
       end
     end
 
@@ -201,11 +201,11 @@ shared_examples_for "a schema based apartment adapter" do
       before{ subject.switch!(schema1) }
 
       it "maintains the persistent schemas in the schema_search_path" do
-        connection.schema_search_path.should end_with persistent_schemas.map { |schema| %{"#{schema}"} }.join(', ')
+        expect(connection.schema_search_path).to end_with persistent_schemas.map { |schema| %{"#{schema}"} }.join(', ')
       end
 
       it "prioritizes the switched schema to front of schema_search_path" do
-        connection.schema_search_path.should start_with %{"#{schema1}"}
+        expect(connection.schema_search_path).to start_with %{"#{schema1}"}
       end
     end
   end
@@ -213,13 +213,13 @@ shared_examples_for "a schema based apartment adapter" do
   describe "#current" do
     it "should return the current schema name" do
       subject.switch!(schema1)
-      subject.current.should == schema1
+      expect(subject.current).to eq(schema1)
     end
 
     context "persistent_schemas", :persistent_schemas => true do
       it "should exlude persistent_schemas" do
         subject.switch!(schema1)
-        subject.current.should == schema1
+        expect(subject.current).to eq(schema1)
       end
     end
   end

data/spec/integration/apartment_rake_integration_spec.rb

@@ -33,7 +33,7 @@ describe "apartment rake tasks", database: :postgresql do
 
     let(:x){ 1 + rand(5) }    # random number of dbs to create
     let(:db_names){ x.times.map{ Apartment::Test.next_db } }
-    let!(:company_count){ Company.count + db_names.length }
+    let!(:company_count){ db_names.length }
 
     before do
       db_names.collect do |db_name|
@@ -49,7 +49,7 @@ describe "apartment rake tasks", database: :postgresql do
 
     describe "#migrate" do
       it "should migrate all databases" do
-        ActiveRecord::Migrator.should_receive(:migrate).exactly(company_count).times
+        expect(ActiveRecord::Migrator).to receive(:migrate).exactly(company_count).times
 
         @rake['apartment:migrate'].invoke
       end
@@ -57,7 +57,7 @@ describe "apartment rake tasks", database: :postgresql do
 
     describe "#rollback" do
       it "should rollback all dbs" do
-        ActiveRecord::Migrator.should_receive(:rollback).exactly(company_count).times
+        expect(ActiveRecord::Migrator).to receive(:rollback).exactly(company_count).times
 
         @rake['apartment:rollback'].invoke
       end
@@ -65,7 +65,7 @@ describe "apartment rake tasks", database: :postgresql do
 
     describe "apartment:seed" do
       it "should seed all databases" do
-        Apartment::Tenant.should_receive(:seed).exactly(company_count).times
+        expect(Apartment::Tenant).to receive(:seed).exactly(company_count).times
 
         @rake['apartment:seed'].invoke
       end

data/spec/integration/query_caching_spec.rb

@@ -33,9 +33,9 @@ describe 'query caching' do
     ActiveRecord::Base.connection.enable_query_cache!
 
     Apartment::Tenant.switch! db_names.first
-    User.find_by_name(db_names.first).name.should == db_names.first
+    expect(User.find_by_name(db_names.first).name).to eq(db_names.first)
 
     Apartment::Tenant.switch! db_names.last
-    User.find_by_name(db_names.first).should be_nil
+    expect(User.find_by_name(db_names.first)).to be_nil
   end
 end

data/spec/spec_helper.rb

@@ -32,6 +32,17 @@ RSpec.configure do |config|
   config.after(:all) do
     `git checkout -- spec/dummy/db/schema.rb`
   end
+
+  # rspec-rails 3 will no longer automatically infer an example group's spec type
+  # from the file location. You can explicitly opt-in to the feature using this
+  # config option.
+  # To explicitly tag specs without using automatic inference, set the `:type`
+  # metadata manually:
+  #
+  #     describe ThingsController, :type => :controller do
+  #       # Equivalent to being in spec/controllers
+  #     end
+  config.infer_spec_type_from_file_location!
 end
 
 # Load shared examples, must happen after configure for RSpec 3

data/spec/support/apartment_helpers.rb

@@ -15,6 +15,12 @@ module Apartment
       "db%d" % @x += 1
     end
 
+    def reset_table_names
+      Apartment.excluded_models.each do |model|
+        model.constantize.reset_table_name
+      end
+    end
+
     def drop_schema(schema)
       ActiveRecord::Base.connection.execute("DROP SCHEMA IF EXISTS #{schema} CASCADE") rescue true
     end
@@ -28,7 +34,7 @@ module Apartment
     def load_schema(version = 3)
       file = File.expand_path("../../schemas/v#{version}.rb", __FILE__)
 
-      silence_stream(STDOUT){ load(file) }
+      silence_warnings{ load(file) }
     end
 
     def migrate
@@ -40,4 +46,4 @@ module Apartment
     end
 
   end
-end
+end

data/spec/support/setup.rb

@@ -14,7 +14,7 @@ module Apartment
           around(:each) do |example|
 
             def config
-              db = example.metadata.fetch(:database, :postgresql)
+              db = RSpec.current_example.metadata.fetch(:database, :postgresql)
 
               Apartment::Test.config['connections'][db.to_s].symbolize_keys
             end
@@ -22,6 +22,7 @@ module Apartment
             # before
             Apartment::Tenant.reload!(config)
             ActiveRecord::Base.establish_connection config
+            Apartment::Test.reset_table_names
 
             example.run
 
@@ -34,9 +35,8 @@ module Apartment
 
               Apartment.connection_class.remove_connection(klass)
               klass.clear_all_connections!
-              klass.reset_table_name
             end
-
+            Apartment::Test.reset_table_names
             Apartment.reset
             Apartment::Tenant.reload!
           end

data/spec/tasks/apartment_rake_spec.rb

@@ -34,16 +34,16 @@ describe "apartment rake tasks" do
     let(:tenant_count){ tenant_names.length }
 
     before do
-      Apartment.stub(:tenant_names).and_return tenant_names
+      allow(Apartment).to receive(:tenant_names).and_return tenant_names
     end
 
     describe "apartment:migrate" do
       before do
-        ActiveRecord::Migrator.stub(:migrate)   # don't care about this
+        allow(ActiveRecord::Migrator).to receive(:migrate)   # don't care about this
       end
 
       it "should migrate public and all multi-tenant dbs" do
-        Apartment::Migrator.should_receive(:migrate).exactly(tenant_count).times
+        expect(Apartment::Migrator).to receive(:migrate).exactly(tenant_count).times
         @rake['apartment:migrate'].invoke
       end
     end
@@ -56,9 +56,9 @@ describe "apartment rake tasks" do
         end
 
         it "requires a version to migrate to" do
-          lambda{
+          expect{
             @rake['apartment:migrate:up'].invoke
-          }.should raise_error("VERSION is required")
+          }.to raise_error("VERSION is required")
         end
       end
 
@@ -69,7 +69,7 @@ describe "apartment rake tasks" do
         end
 
         it "migrates up to a specific version" do
-          Apartment::Migrator.should_receive(:run).with(:up, anything, version.to_i).exactly(tenant_count).times
+          expect(Apartment::Migrator).to receive(:run).with(:up, anything, version.to_i).exactly(tenant_count).times
           @rake['apartment:migrate:up'].invoke
         end
       end
@@ -83,9 +83,9 @@ describe "apartment rake tasks" do
         end
 
         it "requires a version to migrate to" do
-          lambda{
+          expect{
             @rake['apartment:migrate:down'].invoke
-          }.should raise_error("VERSION is required")
+          }.to raise_error("VERSION is required")
         end
       end
 
@@ -96,7 +96,7 @@ describe "apartment rake tasks" do
         end
 
         it "migrates up to a specific version" do
-          Apartment::Migrator.should_receive(:run).with(:down, anything, version.to_i).exactly(tenant_count).times
+          expect(Apartment::Migrator).to receive(:run).with(:down, anything, version.to_i).exactly(tenant_count).times
           @rake['apartment:migrate:down'].invoke
         end
       end
@@ -106,12 +106,12 @@ describe "apartment rake tasks" do
       let(:step){ '3' }
 
       it "should rollback dbs" do
-        Apartment::Migrator.should_receive(:rollback).exactly(tenant_count).times
+        expect(Apartment::Migrator).to receive(:rollback).exactly(tenant_count).times
         @rake['apartment:rollback'].invoke
       end
 
       it "should rollback dbs STEP amt" do
-        Apartment::Migrator.should_receive(:rollback).with(anything, step.to_i).exactly(tenant_count).times
+        expect(Apartment::Migrator).to receive(:rollback).with(anything, step.to_i).exactly(tenant_count).times
         ENV['STEP'] = step
         @rake['apartment:rollback'].invoke
       end