spec/adapters/mysql2_adapter_spec.rb in apartment-0.23.2 vs spec/adapters/mysql2_adapter_spec.rb in apartment-0.24.0

- old
+ new

@@ -4,23 +4,23 @@ describe Apartment::Adapters::Mysql2Adapter, database: :mysql do unless defined?(JRUBY_VERSION) subject(:adapter){ Apartment::Database.mysql2_adapter config } - def database_names + def tenant_names ActiveRecord::Base.connection.execute("SELECT schema_name FROM information_schema.schemata").collect { |row| row[0] } end - let(:default_database) { subject.process { ActiveRecord::Base.connection.current_database } } + let(:default_tenant) { subject.process { ActiveRecord::Base.connection.current_database } } context "using - the equivalent of - schemas" do before { Apartment.use_schemas = true } it_should_behave_like "a generic apartment adapter" - describe "#default_database" do - its(:default_database){ should == config[:database] } + describe "#default_tenant" do + its(:default_tenant){ should == config[:database] } end describe "#init" do include Apartment::Spec::AdapterRequirements @@ -31,10 +31,10 @@ end it "should process model exclusions" do Apartment::Database.init - Company.table_name.should == "#{default_database}.companies" + Company.table_name.should == "#{default_tenant}.companies" end end end context "using connections" do