More changes project -> entity and user -> principal

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

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

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
 

modules/dashboards/spec/features/docments_spec.rb → 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

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

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

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
 

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
 

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
 

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

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

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: {

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

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

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')

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

spec/contracts/projects/archive_contract_spec.rb

@@ -58,16 +58,16 @@
 
       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
       end
 
       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'

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

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

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

spec/controllers/messages_controller_spec.rb

@@ -33,18 +33,15 @@
   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,
            project:)
   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 }
 

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