Fix global record validations with existing scope

lib/acts_as_tenant/model_extensions.rb

@@ -105,9 +105,9 @@ def validates_uniqueness_to_tenant(fields, args = {})
 
         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

spec/dummy/app/models/global_project_with_scope.rb

@@ -0,0 +1,6 @@
+class GlobalProjectWithScope < ActiveRecord::Base
+  self.table_name = "projects"
+
+  acts_as_tenant :account, has_global_records: true
+  validates_uniqueness_to_tenant :name, scope: [:user_defined_scope]
+end

spec/dummy/db/schema.rb

@@ -21,6 +21,7 @@
   create_table :projects, force: true do |t|
     t.column :name, :string
     t.column :account_id, :integer
+    t.column :user_defined_scope, :string
   end
 
   create_table :managers, force: true do |t|

spec/fixtures/global_projects.yml

@@ -11,3 +11,7 @@ global_foo:
 global_bar:
   account: bar
   name: "global bar"
+
+global_scope:
+  name: "global scope"
+  user_defined_scope: abc

spec/models/model_extensions_spec.rb

@@ -164,6 +164,14 @@
       it "is invalid if tenant record conflicts with global record" do
         expect(GlobalProject.new(name: "global").valid?).to be(false)
       end
+
+      it "is invalid if tenant record conflicts with global record with scope" do
+        duplicate = GlobalProjectWithScope.new(
+          name: "global scope",
+          user_defined_scope: "abc"
+        )
+        expect(duplicate.valid?).to be(false)
+      end
     end
 
     context "should validate global records against global & tenant records" do