From 874945b501f76ee72865efc7b8766e614957a4d9 Mon Sep 17 00:00:00 2001
From: Klaus Zanders <k.zanders@openproject.com>
Date: Wed, 9 Aug 2023 17:05:44 +0200
Subject: [PATCH] More changes project -> entity and user -> principal

---
 .../available_projects_resource_spec.rb       | 25 +++---------
 .../time_entries/update_form_resource_spec.rb | 11 ++---
 .../requests/api/time_entry_resource_spec.rb  | 10 +----
 .../{docments_spec.rb => documents_spec.rb}   |  6 +--
 .../spec/features/read_only_allowed_spec.rb   |  2 +-
 .../spec/features/subprojects_spec.rb         | 10 ++---
 .../spec/features/time_entries_spec.rb        |  4 +-
 .../features/work_package_calendar_spec.rb    |  4 +-
 .../work_package_graph_overview_spec.rb       |  2 +-
 .../spec/features/work_package_graph_spec.rb  |  4 +-
 .../spec/features/work_package_table_spec.rb  |  4 +-
 .../controllers/documents_controller_spec.rb  |  2 +-
 .../spec/features/meetings_index_spec.rb      |  5 +--
 .../spec/support/plugin_spec_helper.rb        |  4 +-
 .../storages_representer_rendering_spec.rb    | 10 ++---
 ...eam_planner_subproject_constraints_spec.rb |  4 +-
 .../projects/archive_contract_spec.rb         |  8 ++--
 .../controllers/categories_controller_spec.rb |  5 +--
 spec/controllers/groups_controller_spec.rb    |  9 +----
 spec/controllers/members_controller_spec.rb   |  4 +-
 spec/controllers/messages_controller_spec.rb  |  7 +---
 .../memberships_controller_spec.rb            |  2 +-
 spec/controllers/sys_controller_spec.rb       | 40 ++++---------------
 spec/controllers/users_controller_spec.rb     | 15 ++++---
 .../wiki_menu_authentication_spec.rb          |  2 +-
 .../auto_completes_controller_spec.rb         | 13 ++----
 26 files changed, 68 insertions(+), 144 deletions(-)
 rename modules/dashboards/spec/features/{docments_spec.rb => documents_spec.rb} (92%)

diff --git a/modules/costs/spec/requests/api/time_entries/available_projects_resource_spec.rb b/modules/costs/spec/requests/api/time_entries/available_projects_resource_spec.rb
index 33fbb71d0e41..5b4ff76a05b0 100644
--- a/modules/costs/spec/requests/api/time_entries/available_projects_resource_spec.rb
+++ b/modules/costs/spec/requests/api/time_entries/available_projects_resource_spec.rb
@@ -41,42 +41,27 @@
   end
   let(:project_with_log_permission) do
     create(:project).tap do |p|
-      create(:member,
-             roles: [create(:role, permissions: [:log_own_time])],
-             project: p,
-             user: current_user)
+      create(:member, roles: [create(:role, permissions: [:log_own_time])], entity: p, principal: current_user)
     end
   end
   let(:project_with_edit_permission) do
     create(:project).tap do |p|
-      create(:member,
-             roles: [create(:role, permissions: [:edit_time_entries])],
-             project: p,
-             user: current_user)
+      create(:member, roles: [create(:role, permissions: [:edit_time_entries])], entity: p, principal: current_user)
     end
   end
   let(:project_with_edit_own_permission) do
     create(:project).tap do |p|
-      create(:member,
-             roles: [create(:role, permissions: [:edit_own_time_entries])],
-             project: p,
-             user: current_user)
+      create(:member, roles: [create(:role, permissions: [:edit_own_time_entries])], entity: p, principal: current_user)
     end
   end
   let(:project_with_view_permission) do
     create(:project).tap do |p|
-      create(:member,
-             roles: [create(:role, permissions: [:view_time_entries])],
-             project: p,
-             user: current_user)
+      create(:member, roles: [create(:role, permissions: [:view_time_entries])], entity: p, principal: current_user)
     end
   end
   let(:project_without_permission) do
     create(:project).tap do |p|
-      create(:member,
-             roles: [create(:role, permissions: [])],
-             project: p,
-             user: current_user)
+      create(:member, roles: [create(:role, permissions: [])], entity: p, principal: current_user)
     end
   end
   let(:project_without_membership) do
diff --git a/modules/costs/spec/requests/api/time_entries/update_form_resource_spec.rb b/modules/costs/spec/requests/api/time_entries/update_form_resource_spec.rb
index c598118b572c..b63dcc7d2d7a 100644
--- a/modules/costs/spec/requests/api/time_entries/update_form_resource_spec.rb
+++ b/modules/costs/spec/requests/api/time_entries/update_form_resource_spec.rb
@@ -195,14 +195,9 @@
 
       context 'with the time_entry being of the user' do
         let(:user) do
-          user = time_entry.user
-
-          create(:member,
-                 project: time_entry.project,
-                 roles: [create(:role, permissions:)],
-                 principal: user)
-
-          user
+          time_entry.user.tap do |user|
+            create(:member, entity: time_entry.project, roles: [create(:role, permissions:)], principal: user)
+          end
         end
 
         it 'returns 200 OK' do
diff --git a/modules/costs/spec/requests/api/time_entry_resource_spec.rb b/modules/costs/spec/requests/api/time_entry_resource_spec.rb
index d58d7ec13feb..233225e52c7a 100644
--- a/modules/costs/spec/requests/api/time_entry_resource_spec.rb
+++ b/modules/costs/spec/requests/api/time_entry_resource_spec.rb
@@ -220,10 +220,7 @@
       end
 
       before do
-        create(:member,
-               roles: [role],
-               project: other_project,
-               user: current_user)
+        create(:member, roles: [role], entity: other_project, principal: current_user)
 
         time_entry
         other_time_entry
@@ -284,10 +281,7 @@
       end
 
       before do
-        create(:member,
-               roles: [role],
-               project: other_project,
-               user: current_user)
+        create(:member, roles: [role], entity: other_project, principal: current_user)
         get path
       end
 
diff --git a/modules/dashboards/spec/features/docments_spec.rb b/modules/dashboards/spec/features/documents_spec.rb
similarity index 92%
rename from modules/dashboards/spec/features/docments_spec.rb
rename to modules/dashboards/spec/features/documents_spec.rb
index c8bf2bc56c76..1352eff9ac6d 100644
--- a/modules/dashboards/spec/features/docments_spec.rb
+++ b/modules/dashboards/spec/features/documents_spec.rb
@@ -50,8 +50,8 @@
   end
   let(:user) do
     create(:user).tap do |u|
-      create(:member, project:, roles: [role], user: u)
-      create(:member, project: other_project, roles: [role], user: u)
+      create(:member, entity: project, roles: [role], principal: u)
+      create(:member, entity: other_project, roles: [role], principal: u)
     end
   end
   let(:dashboard) do
@@ -79,7 +79,7 @@
         .to have_content visible_document.created_at.strftime('%m/%d/%Y')
 
       expect(page)
-        .to have_no_content invisible_document.title
+        .not_to have_content invisible_document.title
     end
   end
 end
diff --git a/modules/dashboards/spec/features/read_only_allowed_spec.rb b/modules/dashboards/spec/features/read_only_allowed_spec.rb
index 7885742e2c05..a493af17f597 100644
--- a/modules/dashboards/spec/features/read_only_allowed_spec.rb
+++ b/modules/dashboards/spec/features/read_only_allowed_spec.rb
@@ -58,7 +58,7 @@
 
   let(:user) do
     create(:user).tap do |u|
-      create(:member, project:, user: u, roles: [role])
+      create(:member, entity: project, principal: u, roles: [role])
     end
   end
   let(:dashboard_page) do
diff --git a/modules/dashboards/spec/features/subprojects_spec.rb b/modules/dashboards/spec/features/subprojects_spec.rb
index 8c458e06c918..2b814bebda7b 100644
--- a/modules/dashboards/spec/features/subprojects_spec.rb
+++ b/modules/dashboards/spec/features/subprojects_spec.rb
@@ -62,11 +62,11 @@
 
   let(:user) do
     create(:user).tap do |u|
-      create(:member, project:, roles: [role], user: u)
-      create(:member, project: child_project, roles: [role], user: u)
-      create(:member, project: archived_child_project, roles: [role], user: u)
-      create(:member, project: grandchild_project, roles: [role], user: u)
-      create(:member, project: parent_project, roles: [role], user: u)
+      create(:member, entity: project, roles: [role], principal: u)
+      create(:member, entity: child_project, roles: [role], principal: u)
+      create(:member, entity: archived_child_project, roles: [role], principal: u)
+      create(:member, entity: grandchild_project, roles: [role], principal: u)
+      create(:member, entity: parent_project, roles: [role], principal: u)
     end
   end
   let(:dashboard_page) do
diff --git a/modules/dashboards/spec/features/time_entries_spec.rb b/modules/dashboards/spec/features/time_entries_spec.rb
index b916ea018ef9..3128e070bced 100644
--- a/modules/dashboards/spec/features/time_entries_spec.rb
+++ b/modules/dashboards/spec/features/time_entries_spec.rb
@@ -78,8 +78,8 @@
   end
   let(:user) do
     create(:user).tap do |u|
-      create(:member, project:, roles: [role], user: u)
-      create(:member, project: other_project, roles: [role], user: u)
+      create(:member, entity: project, roles: [role], principal: u)
+      create(:member, entity: other_project, roles: [role], principal: u)
     end
   end
 
diff --git a/modules/dashboards/spec/features/work_package_calendar_spec.rb b/modules/dashboards/spec/features/work_package_calendar_spec.rb
index c84978070d18..40983da0a5a8 100644
--- a/modules/dashboards/spec/features/work_package_calendar_spec.rb
+++ b/modules/dashboards/spec/features/work_package_calendar_spec.rb
@@ -100,8 +100,8 @@
 
   let(:user) do
     create(:user).tap do |u|
-      create(:member, project:, user: u, roles: [role])
-      create(:member, project: other_project, user: u, roles: [role])
+      create(:member, entity: project, principal: u, roles: [role])
+      create(:member, entity: other_project, principal: u, roles: [role])
     end
   end
 
diff --git a/modules/dashboards/spec/features/work_package_graph_overview_spec.rb b/modules/dashboards/spec/features/work_package_graph_overview_spec.rb
index 0acb088ee94f..c3429f653a6d 100644
--- a/modules/dashboards/spec/features/work_package_graph_overview_spec.rb
+++ b/modules/dashboards/spec/features/work_package_graph_overview_spec.rb
@@ -68,7 +68,7 @@
 
   let(:user) do
     create(:user).tap do |u|
-      create(:member, project:, user: u, roles: [role])
+      create(:member, entity: project, principal: u, roles: [role])
     end
   end
 
diff --git a/modules/dashboards/spec/features/work_package_graph_spec.rb b/modules/dashboards/spec/features/work_package_graph_spec.rb
index 4178019e61ea..915782186307 100644
--- a/modules/dashboards/spec/features/work_package_graph_spec.rb
+++ b/modules/dashboards/spec/features/work_package_graph_spec.rb
@@ -79,8 +79,8 @@
 
   let(:user) do
     create(:user).tap do |u|
-      create(:member, project:, user: u, roles: [role])
-      create(:member, project: other_project, user: u, roles: [role])
+      create(:member, entity: project, principal: u, roles: [role])
+      create(:member, entity: other_project, principal: u, roles: [role])
     end
   end
   let(:dashboard_page) do
diff --git a/modules/dashboards/spec/features/work_package_table_spec.rb b/modules/dashboards/spec/features/work_package_table_spec.rb
index 289b7b7ebdb8..43387f004c8c 100644
--- a/modules/dashboards/spec/features/work_package_table_spec.rb
+++ b/modules/dashboards/spec/features/work_package_table_spec.rb
@@ -74,8 +74,8 @@
 
   let(:user) do
     create(:user).tap do |u|
-      create(:member, project:, user: u, roles: [role])
-      create(:member, project: other_project, user: u, roles: [role])
+      create(:member, entity: project, principal: u, roles: [role])
+      create(:member, entity: other_project, principal: u, roles: [role])
     end
   end
   let(:dashboard_page) do
diff --git a/modules/documents/spec/controllers/documents_controller_spec.rb b/modules/documents/spec/controllers/documents_controller_spec.rb
index 121c7f9e416a..3b91bfb5bb63 100644
--- a/modules/documents/spec/controllers/documents_controller_spec.rb
+++ b/modules/documents/spec/controllers/documents_controller_spec.rb
@@ -110,7 +110,7 @@
 
       before do
         notify_project = project
-        create(:member, project: notify_project, user:, roles: [role])
+        create(:member, entity: notify_project, principal: user, roles: [role])
 
         post :create,
              params: {
diff --git a/modules/meeting/spec/features/meetings_index_spec.rb b/modules/meeting/spec/features/meetings_index_spec.rb
index 88dc1b8f7115..5c1e172564d9 100644
--- a/modules/meeting/spec/features/meetings_index_spec.rb
+++ b/modules/meeting/spec/features/meetings_index_spec.rb
@@ -38,10 +38,7 @@
   let(:user) do
     create(:user) do |user|
       [project, other_project].each do |p|
-        create(:member,
-               project: p,
-               principal: user,
-               roles: [role])
+        create(:member, entity: p, principal: user, roles: [role])
       end
     end
   end
diff --git a/modules/reporting/spec/support/plugin_spec_helper.rb b/modules/reporting/spec/support/plugin_spec_helper.rb
index 28d470492fd0..4b51d4689337 100644
--- a/modules/reporting/spec/support/plugin_spec_helper.rb
+++ b/modules/reporting/spec/support/plugin_spec_helper.rb
@@ -31,9 +31,7 @@ module PluginSpecHelper
     def is_member(project, user, permissions = [])
       role = create(:role, permissions:)
 
-      create(:member, project:,
-                      principal: user,
-                      roles: [role])
+      create(:member, entity: project, principal: user, roles: [role])
     end
   end
 end
diff --git a/modules/storages/spec/lib/api/v3/storages/storages_representer_rendering_spec.rb b/modules/storages/spec/lib/api/v3/storages/storages_representer_rendering_spec.rb
index 7a397783fae7..b3ee71156b8d 100644
--- a/modules/storages/spec/lib/api/v3/storages/storages_representer_rendering_spec.rb
+++ b/modules/storages/spec/lib/api/v3/storages/storages_representer_rendering_spec.rb
@@ -93,30 +93,30 @@
           project_linked_with_upload_permission =
             create(:project, name: 'project linked, user member with upload permission').tap do |project|
               create(:project_storage, project:, storage:, creator: user)
-              create(:member, user:, project:, roles: [uploader_role])
+              create(:member, principal: user, entity: project, roles: [uploader_role])
             end
           another_project_linked_with_upload_permission =
             create(:project, name: 'another project linked, user member with upload permission').tap do |project|
               create(:project_storage, project:, storage:, creator: user)
-              create(:member, user:, project:, roles: [uploader_role])
+              create(:member, principal: user, entity: project, roles: [uploader_role])
             end
           create(:project, name: 'project linked, no permissions').tap do |project|
             create(:project_storage, project:, storage:, creator: user)
-            create(:member, user:, project:, roles: [no_permissions_role])
+            create(:member, principal: user, entity: project, roles: [no_permissions_role])
           end
           create(:project, name: 'project linked, user not member').tap do |project|
             create(:project_storage, project:, storage:, creator: user)
           end
           create(:project, active: false, name: 'archived project linked, user member with upload permission').tap do |project|
             create(:project_storage, project:, storage:, creator: user)
-            create(:member, user:, project:, roles: [uploader_role])
+            create(:member, principal: user, entity: project, roles: [uploader_role])
           end
           create(:project, name: 'project linked, another user is member with upload permission').tap do |project|
             create(:project_storage, project:, storage:, creator: user)
             create(:member, user: another_user, project:, roles: [uploader_role])
           end
           create(:project, name: 'project not linked, with upload permission').tap do |project|
-            create(:member, user:, project:, roles: [uploader_role])
+            create(:member, principal: user, entity: project, roles: [uploader_role])
           end
 
           expect(generated).to have_json_size(2).at_path('_links/prepareUpload')
diff --git a/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb b/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb
index dd782fab7aa7..34b982536efc 100644
--- a/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb
+++ b/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb
@@ -27,7 +27,7 @@
 #++
 
 require 'spec_helper'
-require_relative './shared_context'
+require_relative 'shared_context'
 
 RSpec.describe 'Team planner constraints for a subproject', js: true, with_ee: %i[team_planner_view] do
   include_context 'with team planner full access'
@@ -43,7 +43,7 @@
 
   let!(:subproject) { create(:project, parent: project) }
   let!(:role) { create(:role, permissions: %i[view_work_packages edit_work_packages work_package_assigned]) }
-  let!(:member) { create(:member, principal: user, project: subproject, roles: [role]) }
+  let!(:member) { create(:member, principal: user, entity: subproject, roles: [role]) }
   let(:project_include) { Components::ProjectIncludeComponent.new }
 
   let!(:work_package) do
diff --git a/spec/contracts/projects/archive_contract_spec.rb b/spec/contracts/projects/archive_contract_spec.rb
index 144dc10e423b..5c55f7d6799d 100644
--- a/spec/contracts/projects/archive_contract_spec.rb
+++ b/spec/contracts/projects/archive_contract_spec.rb
@@ -58,7 +58,7 @@
 
       context 'when user has archive_project permission on some subprojects but not all' do
         before do
-          create(:member, user: current_user, project: subproject1, roles: [archivist_role])
+          create(:member, principal: current_user, entity: subproject1, roles: [archivist_role])
         end
 
         include_examples 'contract is invalid', base: :archive_permission_missing_on_subprojects
@@ -66,8 +66,8 @@
 
       context 'when user has archive_project permission on all subprojects' do
         before do
-          create(:member, user: current_user, project: subproject1, roles: [archivist_role])
-          create(:member, user: current_user, project: subproject2, roles: [archivist_role])
+          create(:member, principal: current_user, entity: subproject1, roles: [archivist_role])
+          create(:member, principal: current_user, entity: subproject2, roles: [archivist_role])
         end
 
         include_examples 'contract is valid'
@@ -76,7 +76,7 @@
       context 'when some of subprojects are archived but not all' do
         before do
           subproject1.update_column(:active, false)
-          create(:member, user: current_user, project: subproject2, roles: [archivist_role])
+          create(:member, principal: current_user, entity: subproject2, roles: [archivist_role])
         end
 
         include_examples 'contract is valid'
diff --git a/spec/controllers/categories_controller_spec.rb b/spec/controllers/categories_controller_spec.rb
index 485d99358d7d..9681138633ea 100644
--- a/spec/controllers/categories_controller_spec.rb
+++ b/spec/controllers/categories_controller_spec.rb
@@ -36,10 +36,7 @@
            permissions: [:manage_categories])
   end
   let(:member) do
-    create(:member,
-           project:,
-           principal: user,
-           roles: [role])
+    create(:member, entity: project, principal: user, roles: [role])
   end
 
   before do
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index 0ae7df926f8b..eef3c176d8c6 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -114,9 +114,7 @@
       render_views
 
       let!(:member_group) do
-        create(:global_member,
-               principal: group,
-               roles: [create(:global_role)])
+        create(:global_member, principal: group, roles: [create(:global_role)])
       end
 
       it 'displays edit memberships' do
@@ -142,10 +140,7 @@
 
       context 'with an existing membership' do
         let!(:member_group) do
-          create(:member,
-                 project:,
-                 principal: group,
-                 roles: [role1])
+          create(:member, entity: project, principal: group, roles: [role1])
         end
 
         it 'edits a membership' do
diff --git a/spec/controllers/members_controller_spec.rb b/spec/controllers/members_controller_spec.rb
index 4f6c66a01d0b..05d1ebdb2d2e 100644
--- a/spec/controllers/members_controller_spec.rb
+++ b/spec/controllers/members_controller_spec.rb
@@ -34,9 +34,7 @@
   let(:project) { create(:project, identifier: 'pet_project') }
   let(:role) { create(:role) }
   let(:member) do
-    create(:member, project:,
-                    user:,
-                    roles: [role])
+    create(:member, entity: project, principal: user, roles: [role])
   end
 
   before do
diff --git a/spec/controllers/messages_controller_spec.rb b/spec/controllers/messages_controller_spec.rb
index 785d4b4d7ed4..ded3336eb01f 100644
--- a/spec/controllers/messages_controller_spec.rb
+++ b/spec/controllers/messages_controller_spec.rb
@@ -33,10 +33,7 @@
   let(:project) { create(:project) }
   let(:role) { create(:role) }
   let!(:member) do
-    create(:member,
-           project:,
-           principal: user,
-           roles: [role])
+    create(:member, entity: project, principal: user, roles: [role])
   end
   let!(:forum) do
     create(:forum,
@@ -44,7 +41,7 @@
   end
 
   let(:filename) { 'testfile.txt' }
-  let(:file) { File.open(Rails.root.join('spec/fixtures/files', filename)) }
+  let(:file) { Rails.root.join('spec/fixtures/files', filename).open }
 
   before { allow(User).to receive(:current).and_return user }
 
diff --git a/spec/controllers/placeholder_users/memberships_controller_spec.rb b/spec/controllers/placeholder_users/memberships_controller_spec.rb
index 5666dcec8a6a..cce77bded272 100644
--- a/spec/controllers/placeholder_users/memberships_controller_spec.rb
+++ b/spec/controllers/placeholder_users/memberships_controller_spec.rb
@@ -134,7 +134,7 @@
 
     context 'with a membership in another project that is invisible' do
       shared_let(:project2) { create(:project) }
-      shared_let(:membership) { create(:member, principal: placeholder_user, project: project2, roles: [role]) }
+      shared_let(:membership) { create(:member, principal: placeholder_user, entity: project2, roles: [role]) }
 
       describe 'PUT update' do
         it 'returns an error' do
diff --git a/spec/controllers/sys_controller_spec.rb b/spec/controllers/sys_controller_spec.rb
index 00523736424d..439d2c90566b 100644
--- a/spec/controllers/sys_controller_spec.rb
+++ b/spec/controllers/sys_controller_spec.rb
@@ -86,10 +86,7 @@
 
       context 'for valid login and user has read permission (role reporter) for project' do
         before do
-          create(:member,
-                 user: valid_user,
-                 roles: [browse_role],
-                 project:)
+          create(:member, principal: valid_user, roles: [browse_role], entity: project)
 
           request.env['HTTP_AUTHORIZATION'] =
             ActionController::HttpAuthentication::Basic.encode_credentials(
@@ -117,10 +114,7 @@
 
       context 'for valid login and user has rw permission (role developer) for project' do
         before do
-          create(:member,
-                 user: valid_user,
-                 roles: [commit_role],
-                 project:)
+          create(:member, principal: valid_user, roles: [commit_role], entity: project)
           valid_user.save
           request.env['HTTP_AUTHORIZATION'] =
             ActionController::HttpAuthentication::Basic.encode_credentials(
@@ -148,10 +142,7 @@
 
       context 'for invalid login and user has role manager for project' do
         before do
-          create(:member,
-                 user: valid_user,
-                 roles: [commit_role],
-                 project:)
+          create(:member, principal: valid_user, roles: [commit_role], entity: project)
           request.env['HTTP_AUTHORIZATION'] =
             ActionController::HttpAuthentication::Basic.encode_credentials(
               valid_user.login,
@@ -191,10 +182,7 @@
 
         before do
           random_project = create(:project, public: false)
-          create(:member,
-                 user: valid_user,
-                 roles: [browse_role],
-                 project: random_project)
+          create(:member, principal: valid_user, roles: [browse_role], entity: random_project)
 
           request.env['HTTP_AUTHORIZATION'] =
             ActionController::HttpAuthentication::Basic.encode_credentials(
@@ -288,10 +276,7 @@
 
       context 'for valid login and user has read permission (role reporter) for project' do
         before do
-          create(:member,
-                 user: valid_user,
-                 roles: [browse_role],
-                 project:)
+          create(:member, principal: valid_user, roles: [browse_role], entity: project)
 
           request.env['HTTP_AUTHORIZATION'] =
             ActionController::HttpAuthentication::Basic.encode_credentials(
@@ -325,10 +310,7 @@
 
       context 'for valid login and user has rw permission (role developer) for project' do
         before do
-          create(:member,
-                 user: valid_user,
-                 roles: [commit_role],
-                 project:)
+          create(:member, principal: valid_user, roles: [commit_role], entity: project)
           valid_user.save
 
           request.env['HTTP_AUTHORIZATION'] =
@@ -363,10 +345,7 @@
 
       context 'for invalid login and user has role manager for project' do
         before do
-          create(:member,
-                 user: valid_user,
-                 roles: [commit_role],
-                 project:)
+          create(:member, principal: valid_user, roles: [commit_role], entity: project)
 
           request.env['HTTP_AUTHORIZATION'] =
             ActionController::HttpAuthentication::Basic.encode_credentials(
@@ -414,10 +393,7 @@
 
         before do
           random_project = create(:project, public: false)
-          create(:member,
-                 user: valid_user,
-                 roles: [browse_role],
-                 project: random_project)
+          create(:member, principal: valid_user, roles: [browse_role], entity: random_project)
 
           request.env['HTTP_AUTHORIZATION'] =
             ActionController::HttpAuthentication::Basic.encode_credentials(
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index d567fb5319df..4c31997efcad 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -523,7 +523,7 @@
 
     it 'assigns users' do
       expect(assigns(:users))
-        .to match_array([user, admin])
+        .to contain_exactly(user, admin)
     end
 
     context 'with a name filter' do
@@ -531,7 +531,7 @@
 
       it 'assigns users' do
         expect(assigns(:users))
-          .to match_array([user])
+          .to contain_exactly(user)
       end
     end
 
@@ -544,7 +544,7 @@
 
       it 'assigns users' do
         expect(assigns(:users))
-          .to match_array([user])
+          .to contain_exactly(user)
       end
     end
   end
@@ -716,7 +716,7 @@
           mail = ActionMailer::Base.deliveries.last
 
           expect(mail.to)
-            .to match_array [user.mail]
+            .to contain_exactly(user.mail)
 
           expect(mail.body.encoded)
             .to include('newpassPASS!')
@@ -893,10 +893,9 @@
       end
       let!(:member) do
         create(:member,
-               project: work_package.project,
+               entity: work_package.project,
                principal: user,
-               roles: [create(:role,
-                              permissions: [:view_work_packages])])
+               roles: [create(:role, permissions: [:view_work_packages])])
       end
       let!(:journal_1) do
         create(:work_package_journal,
@@ -973,7 +972,7 @@
       mail = ActionMailer::Base.deliveries.last
 
       expect(mail.to)
-        .to match_array [params[:user][:mail]]
+        .to contain_exactly(params[:user][:mail])
 
       activation_link = Regexp.new(
         "http://#{Setting.host_name}/account/activate\\?token=[a-f0-9]+",
diff --git a/spec/controllers/wiki_menu_authentication_spec.rb b/spec/controllers/wiki_menu_authentication_spec.rb
index fd44696045ff..77982171fbcf 100644
--- a/spec/controllers/wiki_menu_authentication_spec.rb
+++ b/spec/controllers/wiki_menu_authentication_spec.rb
@@ -48,7 +48,7 @@
 
       allow(User).to receive(:current).and_return admin_user
       permission_role = create(:role, name: 'accessgranted', permissions: [:manage_wiki_menu])
-      member = create(:member, principal: admin_user, user: admin_user, project: @project, roles: [permission_role])
+      member = create(:member, principal: admin_user, user: admin_user, entity: @project, roles: [permission_role])
 
       get 'edit', params: @params
 
diff --git a/spec/controllers/work_packages/auto_completes_controller_spec.rb b/spec/controllers/work_packages/auto_completes_controller_spec.rb
index 057990c263ee..c3696f9612bd 100644
--- a/spec/controllers/work_packages/auto_completes_controller_spec.rb
+++ b/spec/controllers/work_packages/auto_completes_controller_spec.rb
@@ -32,14 +32,10 @@
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(:role) do
-    create(:role,
-           permissions: [:view_work_packages])
+    create(:role, permissions: [:view_work_packages])
   end
   let(:member) do
-    create(:member,
-           project:,
-           principal: user,
-           roles: [role])
+    create(:member, entity: project, principal: user, roles: [role])
   end
   let(:work_package_1) do
     create(:work_package,
@@ -202,10 +198,7 @@
       end
       let(:expected_values) { work_package_4 }
       let(:member_2) do
-        create(:member,
-               project: project_2,
-               principal: user,
-               roles: [role])
+        create(:member, entity: project_2, principal: user, roles: [role])
       end
       let(:work_package_4) do
         create(:work_package,