Merge pull request #14698 from opf/fix-deprecation-warnings

Fix test typo, deprecation warnings, rubocop error.
opf · Feb 1, 2024 · 839e710 · 839e710
2 parents 7c7e1db + 40fd280
commit 839e710
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/app/models/queries/projects/project_query.rb b/app/models/queries/projects/project_query.rb
@@ -32,8 +32,8 @@ class Queries::Projects::ProjectQuery < ApplicationRecord
 
   belongs_to :user
 
-  serialize :filters, Queries::Serialization::Filters.new(self)
-  serialize :orders, Queries::Serialization::Orders.new(self)
+  serialize :filters, coder: Queries::Serialization::Filters.new(self)
+  serialize :orders, coder: Queries::Serialization::Orders.new(self)
 
   def self.model
     Project

diff --git a/db/migrate/20240131130134_fix_inherited_group_memberships.rb b/db/migrate/20240131130134_fix_inherited_group_memberships.rb
@@ -7,7 +7,6 @@ def up
       .find_each do |group|
 
       warn "Creating inherited roles for group ##{group.id}"
-
       Groups::CreateInheritedRolesService
         .new(group, current_user: User.system, contract_class: EmptyContract)
         .call(user_ids: group.user_ids, send_notifications: false, project_ids: nil)

diff --git a/spec/services/members/create_service_integration_spec.rb b/spec/services/members/create_service_integration_spec.rb
@@ -52,7 +52,7 @@
       expect(subject).to be_success
 
       group.users.each do |user|
-        members = Member.where(user_id: user1.id, project_id: nil)
+        members = Member.where(user_id: user.id, project_id: nil)
         expect(members.count).to eq 1
         expect(members.first.roles).to eq [global_role]
       end