acts_as_tenant 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9dbb40015b39583a44c37496f0687641e1a66f9b70357260b1fcabe7f3c542d
-  data.tar.gz: 88d1ce36220fd3c8e8264b95d76afb7f883cc77da0ac9f12538cde682fa9dacf
+  metadata.gz: 157bb94b2c59bdc0699a43f247141e44f4f8b9f41979186d678e996adfdbda2e
+  data.tar.gz: c4f559b0b12e8e92fc5025f9c926f437f01742cca85c91f4e3d306373a0e3492
 SHA512:
-  metadata.gz: 7d76fbf4cc3381afdfa2c02627ad6de56ff9e4cdaa636da4103e11e38ee48a6f6ecf3f432f296bfd3b8ae5cfc690d8fc52cbc7e025953e39cf3b3dab4439d3f1
-  data.tar.gz: ba09cb46b06f2399de2ac2e4d6efa3369d22e287a6741bfd0fcfc483836b64ac96851dd671dd4a97bace409c7aa72f6e7fc03394250f853c55a54159e720118a
+  metadata.gz: f843cea7abb50c0745b51e0850b93176c4a0713dcc875d62c733b4ff1df3b5cd7d9d2bf0b46de892af7009dfe106a3932d6698ed0132a2411466f43ecf243123
+  data.tar.gz: 1efe052c243a8fc2a7d857d559945f99646f237cb16c22dd6219ea4f94697f2ecd299384ca86bb57758cd37e7773186f2f75becb66998c5c00218ffa0a42f3fd

data/README.md

@@ -25,7 +25,7 @@ Row-level multitenancy  each model must have a tenant ID column on it. This make
 
 Schema multitenancy uses database schemas to handle multitenancy. For this approach, your database has multiple schemas and each schema contains your database tables. Schemas require migrations to be run against each tenant and generally makes it harder to scale as you add more tenants. The Apartment gem uses schema multitenancy.
 
-#### 🎬 Walkthrough 
+#### 🎬 Walkthrough
 
 Want to see how it works? Check out [the ActsAsTenant walkthrough video](https://www.youtube.com/watch?v=BIyxM9f8Jus):
 
@@ -101,7 +101,7 @@ Setting the `current_tenant` yourself, requires you to declare `set_current_tena
 
 If you are setting the tenant in a specific controller (except `application_controller`), it should to be included **AT THE TOP** of the file.
 
-```
+```ruby
 class MembersController < ActionController::Base
   set_current_tenant_through_filter
   before_action :set_tenant
@@ -137,6 +137,16 @@ end
 ```
 This is useful in shared routes such as admin panels or internal dashboards when `require_tenant` option is enabled throughout the app.
 
+### Allowing tenant updating for a block ###
+
+```ruby
+ActsAsTenant.with_mutable_tenant do
+  # Tenant updating is enabled for all code in this block
+end
+```
+
+This will allow you to change the tenant of a model. This feature is useful for admin screens, where it is ok to allow certain users to change the tenant on existing models in specific cases.
+
 ### Require tenant to be set always ###
 
 If you want to require the tenant to be set at all times, you can configure acts_as_tenant to raise an error when a query is made without a tenant available. See below under configuration options.
@@ -210,6 +220,28 @@ You can also explicitly specifiy a primary_key for AaT to use should the key dif
 acts_as_tenant(:account, :primary_key => 'primaryID') # by default AaT expects id
 ```
 
+
+### Has and belongs to many ###
+
+You can scope a model that is part of a HABTM relationship by using the `through` option.
+
+```ruby
+class Organisation < ActiveRecord::Base
+  has_many :organisations_users
+  has_many :users, through: :organisations_users
+end
+
+class User < ActiveRecord::Base
+  has_many :organisations_users
+  acts_as_tenant :organisation, through: :organisations_users
+end
+
+class OrganisationsUser < ActiveRecord::Base
+  belongs_to :user
+  acts_as_tenant :organisation
+end
+```
+
 Configuration options
 ---------------------
 An initializer can be created to control (currently one) option in ActsAsTenant. Defaults
@@ -223,12 +255,26 @@ end
 
 * `config.require_tenant` when set to true will raise an ActsAsTenant::NoTenant error whenever a query is made without a tenant set.
 
+`config.require_tenant` can also be assigned a lambda that is evaluated at run time. For example:
+
+```ruby
+ActsAsTenant.configure do |config|
+  config.require_tenant = lambda do
+    if $request_env.present?
+      return false if $request_env["REQUEST_PATH"].start_with?("/admin/")
+    end
+  end
+end
+```
+
+`ActsAsTenant.should_require_tenant?` is used to determine if a tenant is required in the current context, either by evaluating the lambda provided, or by returning the boolean value assigned to `config.require_tenant`.
+
 belongs_to options
 ---------------------
-`acts_as_tenant :account` includes the belongs_to relationship. 
+`acts_as_tenant :account` includes the belongs_to relationship.
 So when using acts_as_tenant on a model, do not add `belongs_to :account` alongside `acts_as_tenant :account`:
 
-```
+```ruby
 class User < ActiveRecord::Base
   acts_as_tenant(:account) # YES
   belongs_to :account # REDUNDANT
@@ -236,7 +282,7 @@ end
 ```
 
 You can add the following `belongs_to` options to `acts_as_tenant`:
-`:foreign_key, :class_name, :inverse_of, :optional, :primary_key, :counter_cache`
+`:foreign_key, :class_name, :inverse_of, :optional, :primary_key, :counter_cache, :polymorphic, :touch`
 
 Example: `acts_as_tenant(:account, counter_cache: true)`
 

data/lib/acts_as_tenant/errors.rb

@@ -9,9 +9,6 @@ module ActsAsTenant
     class NoTenantSet < ActsAsTenant::Error
     end
 
-    class ModelNotScopedByTenant < ActsAsTenant::Error
-    end
-
     class TenantIsImmutable < ActsAsTenant::Error
     end
   end

data/lib/acts_as_tenant/model_extensions.rb

@@ -5,18 +5,19 @@ module ActsAsTenant
     class_methods do
       def acts_as_tenant(tenant = :account, **options)
         ActsAsTenant.set_tenant_klass(tenant)
+        ActsAsTenant.mutable_tenant!(false)
 
         ActsAsTenant.add_global_record_model(self) if options[:has_global_records]
 
         # Create the association
-        valid_options = options.slice(:foreign_key, :class_name, :inverse_of, :optional, :primary_key, :counter_cache)
+        valid_options = options.slice(:foreign_key, :class_name, :inverse_of, :optional, :primary_key, :counter_cache, :polymorphic, :touch)
         fkey = valid_options[:foreign_key] || ActsAsTenant.fkey
         pkey = valid_options[:primary_key] || ActsAsTenant.pkey
         polymorphic_type = valid_options[:foreign_type] || ActsAsTenant.polymorphic_type
         belongs_to tenant, **valid_options
 
         default_scope lambda {
-          if ActsAsTenant.configuration.require_tenant && ActsAsTenant.current_tenant.nil? && !ActsAsTenant.unscoped?
+          if ActsAsTenant.should_require_tenant? && ActsAsTenant.current_tenant.nil? && !ActsAsTenant.unscoped?
             raise ActsAsTenant::Errors::NoTenantSet
           end
 
@@ -24,9 +25,15 @@ module ActsAsTenant
             keys = [ActsAsTenant.current_tenant.send(pkey)].compact
             keys.push(nil) if options[:has_global_records]
 
-            query_criteria = {fkey.to_sym => keys}
-            query_criteria[polymorphic_type.to_sym] = ActsAsTenant.current_tenant.class.to_s if options[:polymorphic]
-            where(query_criteria)
+            if options[:through]
+              query_criteria = {options[:through] => {fkey.to_sym => keys}}
+              query_criteria[polymorphic_type.to_sym] = ActsAsTenant.current_tenant.class.to_s if options[:polymorphic]
+              joins(options[:through]).where(query_criteria)
+            else
+              query_criteria = {fkey.to_sym => keys}
+              query_criteria[polymorphic_type.to_sym] = ActsAsTenant.current_tenant.class.to_s if options[:polymorphic]
+              where(query_criteria)
+            end
           else
             all
           end
@@ -71,15 +78,19 @@ module ActsAsTenant
         to_include = Module.new {
           define_method "#{fkey}=" do |integer|
             write_attribute(fkey.to_s, integer)
-            raise ActsAsTenant::Errors::TenantIsImmutable if send("#{fkey}_changed?") && persisted? && !send("#{fkey}_was").nil?
+            raise ActsAsTenant::Errors::TenantIsImmutable if !ActsAsTenant.mutable_tenant? && tenant_modified?
             integer
           end
 
           define_method "#{ActsAsTenant.tenant_klass}=" do |model|
             super(model)
-            raise ActsAsTenant::Errors::TenantIsImmutable if send("#{fkey}_changed?") && persisted? && !send("#{fkey}_was").nil?
+            raise ActsAsTenant::Errors::TenantIsImmutable if !ActsAsTenant.mutable_tenant? && tenant_modified?
             model
           end
+
+          define_method :tenant_modified? do
+            will_save_change_to_attribute?(fkey) && persisted? && attribute_in_database(fkey).present?
+          end
         }
         include to_include
 
@@ -95,9 +106,9 @@ module ActsAsTenant
 
         fkey = reflect_on_association(ActsAsTenant.tenant_klass).foreign_key
 
-        validation_args = args.clone
+        validation_args = args.deep_dup
         validation_args[:scope] = if args[:scope]
-          Array(args[:scope]) << fkey
+          Array(args[:scope]) + [fkey]
         else
           fkey
         end

data/lib/acts_as_tenant/sidekiq.rb

@@ -1,6 +1,14 @@
 module ActsAsTenant::Sidekiq
+  class BaseMiddleware
+    def self.sidekiq_7_and_up?
+      Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("7")
+    end
+  end
+
   # Get the current tenant and store in the message to be sent to Sidekiq.
-  class Client
+  class Client < BaseMiddleware
+    include Sidekiq::ClientMiddleware if sidekiq_7_and_up?
+
     def call(worker_class, msg, queue, redis_pool)
       if ActsAsTenant.current_tenant.present?
         msg["acts_as_tenant"] ||=
@@ -15,7 +23,9 @@ module ActsAsTenant::Sidekiq
   end
 
   # Pull the tenant out and run the current thread with it.
-  class Server
+  class Server < BaseMiddleware
+    include Sidekiq::ServerMiddleware if sidekiq_7_and_up?
+
     def call(worker_class, msg, queue)
       if msg.has_key?("acts_as_tenant")
         account = msg["acts_as_tenant"]["class"].constantize.find msg["acts_as_tenant"]["id"]

data/lib/acts_as_tenant/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTenant
-  VERSION = "0.5.1"
+  VERSION = "0.6.1"
 end

data/lib/acts_as_tenant.rb

@@ -12,9 +12,9 @@ module ActsAsTenant
   @@configuration = nil
   @@tenant_klass = nil
   @@models_with_global_records = []
+  @@mutable_tenant = false
 
   class << self
-    attr_accessor :test_tenant
     attr_writer :default_tenant
   end
 
@@ -64,6 +64,14 @@ module ActsAsTenant
     RequestStore.store[:current_tenant] || test_tenant || default_tenant
   end
 
+  def self.test_tenant=(tenant)
+    Thread.current[:test_tenant] = tenant
+  end
+
+  def self.test_tenant
+    Thread.current[:test_tenant]
+  end
+
   def self.unscoped=(unscoped)
     RequestStore.store[:acts_as_tenant_unscoped] = unscoped
   end
@@ -80,6 +88,14 @@ module ActsAsTenant
     @default_tenant unless unscoped
   end
 
+  def self.mutable_tenant!(toggle)
+    @@mutable_tenant = toggle
+  end
+
+  def self.mutable_tenant?
+    @@mutable_tenant
+  end
+
   def self.with_tenant(tenant, &block)
     if block.nil?
       raise ArgumentError, "block required"
@@ -99,16 +115,34 @@ module ActsAsTenant
     end
 
     old_tenant = current_tenant
+    old_test_tenant = test_tenant
     old_unscoped = unscoped
 
     self.current_tenant = nil
+    self.test_tenant = nil
     self.unscoped = true
     value = block.call
     value
   ensure
     self.current_tenant = old_tenant
+    self.test_tenant = old_test_tenant
     self.unscoped = old_unscoped
   end
+
+  def self.with_mutable_tenant(&block)
+    ActsAsTenant.mutable_tenant!(true)
+    without_tenant(&block)
+  ensure
+    ActsAsTenant.mutable_tenant!(false)
+  end
+
+  def self.should_require_tenant?
+    if configuration.require_tenant.respond_to?(:call)
+      !!configuration.require_tenant.call
+    else
+      !!configuration.require_tenant
+    end
+  end
 end
 
 ActiveSupport.on_load(:active_record) do |base|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tenant
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors:
 - Erwin Matthijssen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -153,89 +153,6 @@ files:
 - lib/acts_as_tenant/tenant_helper.rb
 - lib/acts_as_tenant/test_tenant_middleware.rb
 - lib/acts_as_tenant/version.rb
-- spec/acts_as_tenant/configuration_spec.rb
-- spec/acts_as_tenant/sidekiq_spec.rb
-- spec/controllers/filter_spec.rb
-- spec/controllers/subdomain_or_domain_spec.rb
-- spec/controllers/subdomain_spec.rb
-- spec/dummy/.ruby-version
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/app/assets/images/.keep
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/channels/application_cable/channel.rb
-- spec/dummy/app/channels/application_cable/connection.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/concerns/.keep
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/javascript/packs/application.js
-- spec/dummy/app/jobs/application_job.rb
-- spec/dummy/app/mailers/application_mailer.rb
-- spec/dummy/app/mailers/user_mailer.rb
-- spec/dummy/app/models/account.rb
-- spec/dummy/app/models/aliased_task.rb
-- spec/dummy/app/models/article.rb
-- spec/dummy/app/models/comment.rb
-- spec/dummy/app/models/concerns/.keep
-- spec/dummy/app/models/custom_counter_cache_task.rb
-- spec/dummy/app/models/custom_foreign_key_task.rb
-- spec/dummy/app/models/custom_primary_key_task.rb
-- spec/dummy/app/models/global_project.rb
-- spec/dummy/app/models/global_project_with_conditions.rb
-- spec/dummy/app/models/global_project_with_if.rb
-- spec/dummy/app/models/manager.rb
-- spec/dummy/app/models/polymorphic_tenant_comment.rb
-- spec/dummy/app/models/project.rb
-- spec/dummy/app/models/task.rb
-- spec/dummy/app/models/unique_task.rb
-- spec/dummy/app/models/unscoped_model.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/layouts/mailer.html.erb
-- spec/dummy/app/views/layouts/mailer.text.erb
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/bin/setup
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/cable.yml
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/application_controller_renderer.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/content_security_policy.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/puma.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/spring.rb
-- spec/dummy/config/storage.yml
-- spec/dummy/db/schema.rb
-- spec/dummy/lib/assets/.keep
-- spec/dummy/log/.keep
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/apple-touch-icon-precomposed.png
-- spec/dummy/public/apple-touch-icon.png
-- spec/dummy/public/favicon.ico
-- spec/dummy/tmp/development_secret.txt
-- spec/fixtures/accounts.yml
-- spec/fixtures/custom_primary_key_tasks.yml
-- spec/fixtures/global_projects.yml
-- spec/fixtures/projects.yml
-- spec/helpers/tenant_helper_spec.rb
-- spec/middlewares/test_tenant_middleware_spec.rb
-- spec/models/model_extensions_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/ErwinM/acts_as_tenant
 licenses: []
 metadata: {}
@@ -254,91 +171,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.4
 signing_key:
 specification_version: 4
 summary: Add multi-tenancy to Rails applications using a shared db strategy
-test_files:
-- spec/acts_as_tenant/configuration_spec.rb
-- spec/acts_as_tenant/sidekiq_spec.rb
-- spec/controllers/filter_spec.rb
-- spec/controllers/subdomain_or_domain_spec.rb
-- spec/controllers/subdomain_spec.rb
-- spec/dummy/.ruby-version
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/app/assets/images/.keep
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/channels/application_cable/channel.rb
-- spec/dummy/app/channels/application_cable/connection.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/concerns/.keep
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/javascript/packs/application.js
-- spec/dummy/app/jobs/application_job.rb
-- spec/dummy/app/mailers/application_mailer.rb
-- spec/dummy/app/mailers/user_mailer.rb
-- spec/dummy/app/models/account.rb
-- spec/dummy/app/models/aliased_task.rb
-- spec/dummy/app/models/article.rb
-- spec/dummy/app/models/comment.rb
-- spec/dummy/app/models/concerns/.keep
-- spec/dummy/app/models/custom_counter_cache_task.rb
-- spec/dummy/app/models/custom_foreign_key_task.rb
-- spec/dummy/app/models/custom_primary_key_task.rb
-- spec/dummy/app/models/global_project.rb
-- spec/dummy/app/models/global_project_with_conditions.rb
-- spec/dummy/app/models/global_project_with_if.rb
-- spec/dummy/app/models/manager.rb
-- spec/dummy/app/models/polymorphic_tenant_comment.rb
-- spec/dummy/app/models/project.rb
-- spec/dummy/app/models/task.rb
-- spec/dummy/app/models/unique_task.rb
-- spec/dummy/app/models/unscoped_model.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/layouts/mailer.html.erb
-- spec/dummy/app/views/layouts/mailer.text.erb
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/bin/setup
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/cable.yml
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/application_controller_renderer.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/content_security_policy.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/puma.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/spring.rb
-- spec/dummy/config/storage.yml
-- spec/dummy/db/schema.rb
-- spec/dummy/lib/assets/.keep
-- spec/dummy/log/.keep
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/apple-touch-icon-precomposed.png
-- spec/dummy/public/apple-touch-icon.png
-- spec/dummy/public/favicon.ico
-- spec/dummy/tmp/development_secret.txt
-- spec/fixtures/accounts.yml
-- spec/fixtures/custom_primary_key_tasks.yml
-- spec/fixtures/global_projects.yml
-- spec/fixtures/projects.yml
-- spec/helpers/tenant_helper_spec.rb
-- spec/middlewares/test_tenant_middleware_spec.rb
-- spec/models/model_extensions_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/acts_as_tenant/configuration_spec.rb

@@ -1,17 +0,0 @@
-require "spec_helper"
-
-describe ActsAsTenant::Configuration do
-  after { ActsAsTenant.configure }
-
-  it "provides defaults" do
-    expect(ActsAsTenant.configuration.require_tenant).not_to be_truthy
-  end
-
-  it "stores config" do
-    ActsAsTenant.configure do |config|
-      config.require_tenant = true
-    end
-
-    expect(ActsAsTenant.configuration.require_tenant).to eq(true)
-  end
-end

data/spec/acts_as_tenant/sidekiq_spec.rb

@@ -1,58 +0,0 @@
-require "spec_helper"
-require "sidekiq"
-require "acts_as_tenant/sidekiq"
-
-describe ActsAsTenant::Sidekiq do
-  let(:account) { Account.new(id: 1234) }
-  let(:message) { {"acts_as_tenant" => {"class" => "Account", "id" => 1234}} }
-
-  describe ActsAsTenant::Sidekiq::Client do
-    subject { ActsAsTenant::Sidekiq::Client.new }
-
-    it "saves tenant if present" do
-      ActsAsTenant.current_tenant = account
-
-      msg = {}
-      subject.call(nil, msg, nil, nil) {}
-      expect(msg).to eq message
-    end
-
-    it "does not set tenant if not present" do
-      expect(ActsAsTenant.current_tenant).to be_nil
-
-      msg = {}
-      subject.call(nil, msg, nil, nil) {}
-      expect(msg).not_to eq message
-    end
-  end
-
-  describe ActsAsTenant::Sidekiq::Server do
-    subject { ActsAsTenant::Sidekiq::Server.new }
-
-    it "restores tenant if tenant saved" do
-      expect(Account).to receive(:find).with(1234).once { account }
-
-      msg = message
-      subject.call(nil, msg, nil) do
-        expect(ActsAsTenant.current_tenant).to be_a_kind_of Account
-      end
-      expect(ActsAsTenant.current_tenant).to be_nil
-    end
-
-    it "runs without tenant if no tenant saved" do
-      expect(Account).not_to receive(:find)
-
-      msg = {}
-      subject.call(nil, msg, nil) do
-        expect(ActsAsTenant.current_tenant).to be_nil
-      end
-      expect(ActsAsTenant.current_tenant).to be_nil
-    end
-  end
-
-  it "includes ActsAsTenant client middleware" do
-    expect(Sidekiq.client_middleware.exists?(ActsAsTenant::Sidekiq::Client)).to eq(true)
-  end
-
-  # unable to test server configuration
-end

data/spec/controllers/filter_spec.rb

@@ -1,28 +0,0 @@
-require "spec_helper"
-
-class ApplicationController2 < ActionController::Base
-  include Rails.application.routes.url_helpers
-  set_current_tenant_through_filter
-  before_action :your_method_that_finds_the_current_tenant
-
-  def your_method_that_finds_the_current_tenant
-    current_account = Account.new(name: "account1")
-    set_current_tenant(current_account)
-  end
-end
-
-# Start testing
-describe ApplicationController2, type: :controller do
-  controller do
-    def index
-      # Exercise current_tenant helper method
-      render plain: current_tenant.name
-    end
-  end
-
-  it "Finds the correct tenant using the filter command" do
-    get :index
-    expect(ActsAsTenant.current_tenant.name).to eq "account1"
-    expect(response.body).to eq "account1"
-  end
-end

data/spec/controllers/subdomain_or_domain_spec.rb

@@ -1,55 +0,0 @@
-require "spec_helper"
-
-class DomainController < ActionController::Base
-  include Rails.application.routes.url_helpers
-  set_current_tenant_by_subdomain_or_domain
-end
-
-describe DomainController, type: :controller do
-  let(:account) { accounts(:with_domain) }
-
-  controller do
-    def index
-      # Exercise current_tenant helper method
-      render plain: current_tenant.name
-    end
-  end
-
-  it "finds the correct tenant with a example1.com" do
-    @request.host = account.domain
-    get :index
-    expect(ActsAsTenant.current_tenant).to eq account
-    expect(response.body).to eq account.name
-  end
-
-  it "finds the correct tenant with a subdomain.example.com" do
-    @request.host = "#{account.subdomain}.example.com"
-    get :index
-    expect(ActsAsTenant.current_tenant).to eq account
-    expect(response.body).to eq account.name
-  end
-
-  it "finds the correct tenant with a www.subdomain.example.com" do
-    @request.host = "www.#{account.subdomain}.example.com"
-    get :index
-    expect(ActsAsTenant.current_tenant).to eq account
-  end
-
-  it "ignores case when finding tenant by subdomain" do
-    @request.host = "#{account.subdomain.upcase}.example.com"
-    get :index
-    expect(ActsAsTenant.current_tenant).to eq account
-  end
-
-  context "overriding subdomain lookup" do
-    after { controller.subdomain_lookup = :last }
-
-    it "allows overriding the subdomain lookup" do
-      controller.subdomain_lookup = :first
-      @request.host = "#{account.subdomain}.another.example.com"
-      get :index
-      expect(ActsAsTenant.current_tenant).to eq account
-      expect(response.body).to eq(account.subdomain)
-    end
-  end
-end