Another round of user -> principal and project -> entity

modules/budgets/spec/features/work_package_filter_spec.rb

@@ -36,7 +36,7 @@
   let(:filters) { Components::WorkPackages::Filters.new }
 
   let(:member) do
-    create(:member, principal: user, entitiy: project, roles: [create(:role)])
+    create(:member, principal: user, entity: project, roles: [create(:role)])
   end
   let(:status) do
     create(:status)

modules/dashboards/spec/features/news_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
 
@@ -82,7 +82,7 @@
         .to have_content visible_news.created_at.strftime('%m/%d/%Y')
 
       expect(page)
-        .to have_no_content invisible_news.title
+        .not_to have_content invisible_news.title
     end
   end
 end

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, entity: @project, roles: [permission_role])
+      create(:member, principal: admin_user, entity: @project, roles: [permission_role])
 
       get 'edit', params: @params
 

spec/controllers/work_packages/bulk_controller_spec.rb

@@ -62,22 +62,13 @@
                            work_package_assigned])
   end
   let(:member1_p1) do
-    create(:member,
-           project: project1,
-           principal: user,
-           roles: [role])
+    create(:member, entity: project1, principal: user, roles: [role])
   end
   let(:member2_p1) do
-    create(:member,
-           project: project1,
-           principal: user2,
-           roles: [role])
+    create(:member, entity: project1, principal: user2, roles: [role])
   end
   let(:member1_p2) do
-    create(:member,
-           project: project2,
-           principal: user,
-           roles: [role])
+    create(:member, entity: project2, principal: user, roles: [role])
   end
   let(:work_package1) do
     create(:work_package,
@@ -340,16 +331,13 @@
 
           context 'allowed' do
             let!(:member_group_p1) do
-              create(:member,
-                     project: project1,
-                     principal: group,
-                     roles: [role])
+              create(:member, entity: project1, principal: group, roles: [role])
             end
 
             include_context 'update_request'
             it 'does succeed' do
               expect(flash[:error]).to be_nil
-              expect(subject).to match_array [group.id]
+              expect(subject).to contain_exactly(group.id)
             end
           end
 
@@ -362,7 +350,7 @@
               expect(flash[:error])
                 .to include(I18n.t(:'work_packages.bulk.none_could_be_saved',
                                    total: 2))
-              expect(subject).to match_array [user.id]
+              expect(subject).to contain_exactly(user.id)
             end
           end
         end
@@ -374,7 +362,7 @@
 
           subject { work_packages.map(&:responsible_id).uniq }
 
-          it { is_expected.to match_array [responsible_id] }
+          it { is_expected.to contain_exactly(responsible_id) }
         end
 
         describe '#status' do
@@ -399,7 +387,7 @@
 
           subject { work_packages.map(&:status_id).uniq }
 
-          it { is_expected.to match_array [closed_status.id] }
+          it { is_expected.to contain_exactly(closed_status.id) }
         end
 
         describe '#parent' do
@@ -419,7 +407,7 @@
 
           subject { work_packages.map(&:parent_id).uniq }
 
-          it { is_expected.to match_array [parent.id] }
+          it { is_expected.to contain_exactly(parent.id) }
         end
 
         describe '#custom_fields' do
@@ -440,7 +428,7 @@
                          .uniq
           end
 
-          it { is_expected.to match_array [result] }
+          it { is_expected.to contain_exactly(result) }
         end
 
         describe '#unassign' do
@@ -454,7 +442,7 @@
 
           subject { work_packages.map(&:assigned_to_id).uniq }
 
-          it { is_expected.to match_array [nil] }
+          it { is_expected.to contain_exactly(nil) }
         end
 
         describe '#delete_responsible' do
@@ -468,7 +456,7 @@
 
           subject { work_packages.map(&:responsible_id).uniq }
 
-          it { is_expected.to match_array [nil] }
+          it { is_expected.to contain_exactly(nil) }
         end
 
         describe '#version' do
@@ -501,13 +489,13 @@
               describe '#version' do
                 subject { work_packages.map(&:version_id).uniq }
 
-                it { is_expected.to match_array [version.id] }
+                it { is_expected.to contain_exactly(version.id) }
               end
 
               describe '#project' do
                 subject { work_packages.map(&:project_id).uniq }
 
-                it { is_expected.not_to match_array [subproject.id] }
+                it { is_expected.not_to contain_exactly(subproject.id) }
               end
             end
           end

spec/controllers/work_packages/moves_controller_spec.rb

@@ -117,8 +117,8 @@
   end
 
   describe '#create' do
-    let!(:source_member) { create(:member, user: current_user, project:, roles: [role]) }
-    let!(:target_member) { create(:member, user: current_user, project: target_project, roles: [role]) }
+    let!(:source_member) { create(:member, principal: current_user, entity: project, roles: [role]) }
+    let!(:target_member) { create(:member, principal: current_user, entity: target_project, roles: [role]) }
     let(:target_project) { create(:project, public: false) }
     let(:work_package_2) do
       create(:work_package,
@@ -361,14 +361,9 @@
           let(:target_status) { create(:status, workflow_for_type: target_type) }
 
           let(:target_user) do
-            user = create(:user)
-
-            create(:member,
-                   user:,
-                   project: target_project,
-                   roles: [role])
-
-            user
+            create(:user).tap do |user|
+              create(:member, princial: user, entity: target_project, roles: [role])
+            end
           end
 
           before do
@@ -521,10 +516,7 @@
                    types: [type])
           end
           let!(:member) do
-            create(:member,
-                   user: current_user,
-                   roles: [role],
-                   project: to_project)
+            create(:member, principal: current_user, roles: [role], entity: to_project)
           end
           let!(:child_wp) do
             create(:work_package,

spec/controllers/work_packages/reports_controller_spec.rb

@@ -36,10 +36,7 @@
            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,

spec/factories/member_factory.rb

@@ -32,7 +32,7 @@
 #   user    = create(:user)
 #   role    = create(:role, permissions: [:view_wiki_pages, :edit_wiki_pages])
 #
-#   member = create(:member, user: user, entity: project, roles: [role])
+#   member = create(:member, principal: user, entity: project, roles: [role])
 
 FactoryBot.define do
   factory :member do

spec/factories/principal_factory.rb

@@ -67,10 +67,7 @@
                                                         view_work_packages edit_work_packages
                                                       ])
         projects.compact.each do |project|
-          create(:member,
-                 project:,
-                 principal:,
-                 roles: Array(role))
+          create(:member, entity: project, principal:, roles: Array(role))
         end
       end
     end

spec/features/groups/membership_spec.rb

@@ -46,7 +46,7 @@
   let(:project_member) { {} }
 
   before do
-    create(:member, user: bob, project:, roles: [alpha])
+    create(:member, principal: bob, entity: project, roles: [alpha])
   end
 
   context 'given a group with members' do

spec/features/members/membership_spec.rb

@@ -65,9 +65,9 @@
 
   let!(:manager)   { create(:role, name: 'Manager', permissions: [:manage_members]) }
   let!(:developer) { create(:role, name: 'Developer') }
-  let(:member1) { create(:member, principal: peter, project:, roles: [manager]) }
-  let(:member2) { create(:member, principal: hannibal, project:, roles: [developer]) }
-  let(:member3) { create(:member, principal: group, project:, roles: [manager]) }
+  let(:member1) { create(:member, principal: peter, entity: project, roles: [manager]) }
+  let(:member2) { create(:member, principal: hannibal, entity: project, roles: [developer]) }
+  let(:member3) { create(:member, principal: group, entity: project, roles: [manager]) }
 
   let!(:existing_members) { [] }
 

spec/features/notifications/notification_center/notification_center_date_alerts_spec.rb

@@ -28,7 +28,7 @@ def find_compatible_local_time_zone
   end
   shared_let(:project) { create(:project_with_types) }
   shared_let(:role) { create(:role, permissions: %i[view_work_packages edit_work_packages work_package_assigned]) }
-  shared_let(:membership) { create(:member, principal: user, project:, roles: [role]) }
+  shared_let(:membership) { create(:member, principal: user, entity: project, roles: [role]) }
   shared_let(:milestone_type) { create(:type_milestone) }
 
   def create_alertable(**attributes)

spec/features/placeholder_users/delete_spec.rb

@@ -77,10 +77,7 @@
 
     let!(:project) { create(:project) }
     let!(:member) do
-      create(:member,
-             principal: placeholder_user,
-             project:,
-             roles: [create(:role)])
+      create(:member, principal: placeholder_user, entity: project, roles: [create(:role)])
     end
 
     it 'returns an error when trying to delete and disables the button' do

spec/features/projects/copy_spec.rb

@@ -46,13 +46,9 @@
     end
 
     let!(:parent_project) do
-      project = create(:project)
-
-      create(:member,
-             project:,
-             user:,
-             roles: [role])
-      project
+      create(:project).tap do |project|
+        create(:member, entity: project, principal: user, roles: [role])
+      end
     end
     let!(:project_custom_field) do
       create(:text_project_custom_field, is_required: true)
@@ -86,13 +82,9 @@
          work_package_assigned)
     end
     let(:wp_user) do
-      user = create(:user)
-
-      create(:member,
-             project:,
-             user:,
-             roles: [role])
-      user
+      create(:user).tap do |user|
+        create(:member, entity: project, principal: user, roles: [role])
+      end
     end
     let(:category) do
       create(:category, project:)

spec/features/users/invite_user_modal/invite_user_modal_spec.rb

@@ -198,10 +198,7 @@
           end
 
           let!(:membership_no_permission) do
-            create(:member,
-                   user: current_user,
-                   project: project_no_permissions,
-                   roles: [role_no_permissions])
+            create(:member, principal: current_user, entity: project_no_permissions, roles: [role_no_permissions])
           end
 
           it 'disables projects for which you do not have rights', with_cuprite: false do

spec/features/users/notifications/shared_examples.rb

@@ -3,8 +3,8 @@
     shared_let(:project) { create(:project) }
     shared_let(:project_alt) { create(:project) }
     shared_let(:role) { create(:role, permissions: %i[view_project]) }
-    shared_let(:member) { create(:member, user:, project:, roles: [role]) }
-    shared_let(:member_two) { create(:member, user:, project: project_alt, roles: [role]) }
+    shared_let(:member) { create(:member, principal: user, entity: project, roles: [role]) }
+    shared_let(:member_two) { create(:member, principal: user, entity: project_alt, roles: [role]) }
 
     it 'allows to control notification settings' do
       # Expect default settings

spec/features/work_packages/custom_actions/custom_actions_spec.rb

@@ -38,20 +38,10 @@
   let(:role) { create(:role, permissions:) }
   let!(:other_role) { create(:role, permissions:) }
   let(:user) do
-    user = create(:user,
-                  firstname: 'A',
-                  lastname: 'User')
-
-    create(:member,
-           project:,
-           roles: [role],
-           user:)
-
-    create(:member,
-           project: other_project,
-           roles: [role],
-           user:)
-    user
+    create(:user, firstname: 'A', lastname: 'User').tap do |user|
+      create(:member, entity: project, roles: [role], principal: user)
+      create(:member, entity: other_project, roles: [role], principal: user)
+    end
   end
   let!(:other_member_user) do
     create(:user,

spec/features/work_packages/details/inplace_editor/shared_examples.rb

@@ -129,10 +129,7 @@
   end
   let!(:mentioned_group) do
     create(:group, lastname: 'Laudators').tap do |group|
-      create(:member,
-             principal: group,
-             project:,
-             roles: [role])
+      create(:member, principal: group, entity: project, roles: [role])
     end
   end
 
@@ -193,10 +190,7 @@
   end
   let!(:mentioned_group) do
     create(:group, lastname: 'Laudators').tap do |group|
-      create(:member,
-             principal: group,
-             project:,
-             roles: [role])
+      create(:member, principal: group, entity: project, roles: [role])
     end
   end
 

spec/features/work_packages/table/inline_create/create_work_packages_spec.rb

@@ -185,8 +185,8 @@
       end
       let!(:membership) do
         create(:member,
-               user:,
-               project: project2,
+               principal: user,
+               entity: project2,
                roles: [role2])
       end