Fix create member calls to use user and entity

modules/backlogs/spec/controllers/versions_controller_spec.rb

@@ -36,10 +36,7 @@
 
   let(:other_project) do
     create(:project).tap do |p|
-      create(:member,
-             user: current_user,
-             roles: [create(:role, permissions: [:manage_versions])],
-             project: p)
+      create(:member, principal: current_user, roles: [create(:role, permissions: [:manage_versions])], entity: p)
     end
   end
 
@@ -58,9 +55,6 @@
     @params = {}
     @params[:id] = version.id
     @params[:version] = { name: @newVersionName }
-  end
-
-  before do
     login_as current_user
   end
 

modules/backlogs/spec/features/stories_in_backlog_spec.rb

@@ -117,10 +117,7 @@
   end
   let!(:other_project) do
     create(:project).tap do |p|
-      create(:member,
-             principal: current_user,
-             project: p,
-             roles: [role])
+      create(:member, principal: current_user, entity: p, roles: [role])
     end
   end
   let!(:sprint_story_in_other_project) do
@@ -192,7 +189,7 @@
 
     # All positions will be unique in the sprint
     expect(Story.where(version: sprint, type: story, project:).pluck(:position))
-      .to match_array([1, 2, 3])
+      .to contain_exactly(1, 2, 3)
 
     backlogs_page
       .expect_stories_in_order(sprint, new_story, sprint_story1, sprint_story2)
@@ -230,7 +227,7 @@
       .expect_stories_in_order(sprint, sprint_story1, new_story, sprint_story2)
 
     expect(Story.where(version: sprint, type: story, project:).pluck(:position))
-      .to match_array([1, 2, 3])
+      .to contain_exactly(1, 2, 3)
 
     # Moving a story to bottom
     backlogs_page
@@ -242,7 +239,7 @@
       .expect_stories_in_order(sprint, new_story, sprint_story2, sprint_story1)
 
     expect(Story.where(version: sprint, type: story, project:).pluck(:position))
-      .to match_array([1, 2, 3])
+      .to contain_exactly(1, 2, 3)
 
     # Moving a story to from the backlog to the sprint (3rd position)
 
@@ -256,7 +253,7 @@
       .expect_stories_in_order(sprint, new_story, sprint_story2, backlog_story1, sprint_story1)
 
     expect(Story.where(version: sprint, type: story, project:).pluck(:position))
-      .to match_array([1, 2, 3, 4])
+      .to contain_exactly(1, 2, 3, 4)
 
     # Available statuses when editing
 

modules/backlogs/spec/features/tasks_on_taskboard_spec.rb

@@ -123,10 +123,7 @@
   end
   let!(:other_project) do
     create(:project).tap do |p|
-      create(:member,
-             principal: current_user,
-             project: p,
-             roles: [role])
+      create(:member, principal: current_user, entity: p, roles: [role])
     end
   end
   let!(:story_in_other_project) do

modules/backlogs/spec/features/work_packages/filter_spec.rb

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

modules/backlogs/spec/models/task_spec.rb

@@ -48,7 +48,7 @@
   describe 'having custom journables', with_settings: { journal_aggregation_time_minutes: 0 } do
     let(:user) { create(:user) }
     let(:role) { create(:role, permissions: %i[add_work_packages manage_subtasks manage_work_packages view_work_packages]) }
-    let(:member) { create(:member, principal: user, project:, roles: [role]) }
+    let(:member) { create(:member, principal: user, entity: project, roles: [role]) }
 
     before do
       project.members << member

modules/backlogs/spec/services/impediments/create_services_spec.rb

@@ -48,13 +48,9 @@
   let(:version) { create(:version, project:) }
 
   let(:project) do
-    project = create(:project, types: [type_feature, type_task])
-
-    create(:member, principal: user,
-                    project:,
-                    roles: [role])
-
-    project
+    create(:project, types: [type_feature, type_task]).tap do |project|
+      create(:member, principal: user, entity: project, roles: [role])
+    end
   end
 
   let(:status1) { create(:status, name: 'status 1', is_default: true) }

modules/backlogs/spec/services/impediments/update_service_spec.rb

@@ -53,13 +53,9 @@
   let(:version) { create(:version, project:) }
 
   let(:project) do
-    project = create(:project, types: [type_feature, type_task])
-
-    create(:member, principal: user,
-                    project:,
-                    roles: [role])
-
-    project
+    create(:project, types: [type_feature, type_task]).tap do |project|
+      create(:member, principal: user, entity: project, roles: [role])
+    end
   end
 
   let(:status1) { create(:status, name: 'status 1', is_default: true) }

modules/backlogs/spec/services/stories/create_service_spec.rb

@@ -31,13 +31,9 @@
 RSpec.describe Stories::CreateService, type: :model do
   let(:priority) { create(:priority) }
   let(:project) do
-    project = create(:project, types: [type_feature])
-
-    create(:member,
-           principal: user,
-           project:,
-           roles: [role])
-    project
+    create(:project, types: [type_feature]).tap do |project|
+      create(:member, principal: user, entity: project, roles: [role])
+    end
   end
   let(:role) { create(:role, permissions:) }
   let(:permissions) { %i(add_work_packages manage_subtasks assign_versions) }

modules/backlogs/spec/views/rb_burndown_charts/show_spec.rb

@@ -38,19 +38,17 @@
   let(:role_forbidden) { create(:role) }
   # We need to create these as some view helpers access the database
   let(:statuses) do
-    [create(:status),
-     create(:status),
-     create(:status)]
+    create_list(:status, 3)
   end
 
   let(:type_task) { create(:type_task) }
   let(:type_feature) { create(:type_feature) }
   let(:issue_priority) { create(:priority) }
   let(:project) do
-    project = create(:project, types: [type_feature, type_task])
-    project.members = [create(:member, principal: user1, project:, roles: [role_allowed]),
-                       create(:member, principal: user2, project:, roles: [role_forbidden])]
-    project
+    create(:project, types: [type_feature, type_task]).tap do |project|
+      create(:member, principal: user1, entity: project, roles: [role_allowed])
+      create(:member, principal: user2, entity: project, roles: [role_forbidden])
+    end
   end
 
   let(:story_a) do

modules/backlogs/spec/views/rb_master_backlogs/index.html.erb_spec.rb

@@ -43,9 +43,9 @@
   let(:type_feature) { create(:type_feature) }
   let(:issue_priority) { create(:priority) }
   let(:project) do
-    project = create(:project, types: [type_feature, type_task])
-    project.members = [create(:member, principal: user, project:, roles: [role_allowed])]
-    project
+    create(:project, types: [type_feature, type_task]).tap do |project|
+      create(:member, principal: user, entity: project, roles: [role_allowed])
+    end
   end
   let(:story_a) do
     create(:story, status: statuses[0],

modules/backlogs/spec/views/rb_taskboards/show_spec.rb

@@ -38,19 +38,17 @@
   let(:role_forbidden) { create(:role) }
   # We need to create these as some view helpers access the database
   let(:statuses) do
-    [create(:status),
-     create(:status),
-     create(:status)]
+    create_list(:status, 3)
   end
 
   let(:type_task) { create(:type_task) }
   let(:type_feature) { create(:type_feature) }
   let(:issue_priority) { create(:priority) }
   let(:project) do
-    project = create(:project, types: [type_feature, type_task])
-    project.members = [create(:member, principal: user1, project:, roles: [role_allowed]),
-                       create(:member, principal: user2, project:, roles: [role_forbidden])]
-    project
+    create(:project, types: [type_feature, type_task]).tap do |project|
+      create(:member, principal: user1, entity: project, roles: [role_allowed])
+      create(:member, principal: user2, entity: project, roles: [role_forbidden])
+    end
   end
 
   let(:story_a) do

modules/bim/spec/bcf/bcf_xml/importer_spec.rb

@@ -32,7 +32,7 @@
   let(:filename) { 'MaximumInformation.bcf' }
   let(:file) do
     Rack::Test::UploadedFile.new(
-      File.join(Rails.root, "modules/bim/spec/fixtures/files/#{filename}"),
+      Rails.root.join("modules/bim/spec/fixtures/files/#{filename}").to_s,
       'application/octet-stream'
     )
   end
@@ -61,10 +61,7 @@
   end
   let(:priority) { create(:default_priority) }
   let(:bcf_manager_member) do
-    create(:member,
-           project:,
-           user: bcf_manager,
-           roles: [manage_bcf_role, member_role])
+    create(:member, entity: project, principal: bcf_manager, roles: [manage_bcf_role, member_role])
   end
 
   subject { described_class.new file, project, current_user: bcf_manager }

modules/bim/spec/bcf/bcf_xml/issue_reader_spec.rb

@@ -50,10 +50,7 @@
   end
   let(:priority) { create(:default_priority) }
   let(:bcf_manager_member) do
-    create(:member,
-           project:,
-           user: bcf_manager,
-           roles: [manage_bcf_role])
+    create(:member, entity: project, principal: bcf_manager, roles: [manage_bcf_role])
   end
   let(:markup) do
     <<-MARKUP

modules/bim/spec/controllers/issues_controller_spec.rb

@@ -45,16 +45,10 @@
     create(:project, enabled_module_names: %w[bim], identifier: 'bim_project')
   end
   let(:member) do
-    create(:member,
-           project:,
-           user: collaborator,
-           roles: [collaborator_role])
+    create(:member, entity: project, principal: collaborator, roles: [collaborator_role])
   end
   let(:bcf_manager_member) do
-    create(:member,
-           project:,
-           user: bcf_manager,
-           roles: [manage_bcf_role])
+    create(:member, entity: project, principal: bcf_manager, roles: [manage_bcf_role])
   end
 
   before do
@@ -105,7 +99,7 @@
       let(:filename) { 'MaximumInformation.bcf' }
       let(:file) do
         Rack::Test::UploadedFile.new(
-          File.join(Rails.root, "modules/bim/spec/fixtures/files/#{filename}"),
+          Rails.root.join("modules/bim/spec/fixtures/files/#{filename}").to_s,
           'application/zip'
         )
       end
@@ -137,7 +131,7 @@
       let(:filename) { 'MaximumInformation.bcf' }
       let(:file) do
         Rack::Test::UploadedFile.new(
-          File.join(Rails.root, "modules/bim/spec/fixtures/files/#{filename}"),
+          Rails.root.join("modules/bim/spec/fixtures/files/#{filename}").to_s,
           'application/octet-stream'
         )
       end
@@ -165,7 +159,7 @@
       let(:filename) { 'MaximumInformation.bcf' }
       let(:file) do
         Rack::Test::UploadedFile.new(
-          File.join(Rails.root, "modules/bim/spec/fixtures/files/#{filename}"),
+          Rails.root.join("modules/bim/spec/fixtures/files/#{filename}").to_s,
           'application/octet-stream'
         )
       end

modules/bim/spec/requests/api/bcf/v2_1/projects_api_spec.rb

@@ -29,7 +29,7 @@
 require 'spec_helper'
 require 'rack/test'
 
-require_relative './shared_responses'
+require_relative 'shared_responses'
 
 RSpec.describe 'BCF 2.1 projects resource', content_type: :json do
   include Rack::Test::Methods
@@ -131,10 +131,7 @@
     let!(:invisible_project) { create(:project, enabled_module_names: [:bcf]) }
     let!(:non_bcf_project) do
       create(:project, enabled_module_names: [:work_packages]).tap do |p|
-        create(:member,
-               project: p,
-               user: view_only_user,
-               roles: view_only_user.members.first.roles)
+        create(:member, entity: p, principal: view_only_user, roles: view_only_user.members.first.roles)
       end
     end
 

modules/boards/spec/features/action_boards/assignee_board_spec.rb

@@ -27,8 +27,8 @@
 #++
 
 require 'spec_helper'
-require_relative './../support/board_index_page'
-require_relative './../support/board_page'
+require_relative '../support/board_index_page'
+require_relative '../support/board_page'
 
 RSpec.describe 'Assignee action board',
                js: true,
@@ -68,10 +68,7 @@
 
   let!(:group) do
     create(:group, name: 'Grouped').tap do |group|
-      create(:member,
-             principal: group,
-             project:,
-             roles: [role])
+      create(:member, principal: group, entity: project, roles: [role])
     end
   end
 

modules/boards/spec/queries/grids/query_integration_spec.rb

@@ -37,8 +37,8 @@
   shared_let(:other_role) { create(:role, permissions: []) }
   shared_let(:current_user) do
     create(:user).tap do |user|
-      create(:member, user:, project:, roles: [show_board_views_role])
-      create(:member, user:, project: other_project, roles: [other_role])
+      create(:member, principal: user, entity: project, roles: [show_board_views_role])
+      create(:member, principal: user, entity: other_project, roles: [other_role])
     end
   end
   let!(:board_grid) do
@@ -56,7 +56,7 @@
   context 'without a filter' do
     describe '#results' do
       it 'is the same as getting all the boards visible to the user' do
-        expect(instance.results).to match_array [board_grid]
+        expect(instance.results).to contain_exactly(board_grid)
       end
     end
   end
@@ -69,7 +69,7 @@
 
       describe '#results' do
         it 'yields boards assigned to the project' do
-          expect(instance.results).to match_array [board_grid]
+          expect(instance.results).to contain_exactly(board_grid)
         end
       end