Merge remote-tracking branch 'origin/main'

# Conflicts:
#	spec/requests/api/v1/account_requests_spec.rb
#	spec/requests/api/v1/assignment_controller_spec.rb
#	spec/requests/api/v1/bookmarks_controller_spec.rb
#	spec/requests/api/v1/roles_spec.rb
#	spec/requests/api/v1/student_tasks_controller_spec.rb

spec/models/course_spec.rb

@@ -5,7 +5,7 @@
   let(:instructor) { Instructor.create(name: 'testinstructor', email: '[email protected]', full_name: 'Test Instructor', password: '123456', role: role) }
   let(:institution) { create(:institution, id: 1) }
   let(:course) { create(:course, id: 1, name: 'ECE517', instructor: instructor, institution: institution) }
-  let(:user1) { create(:user, name: 'abcdef', full_name:'abc bbc', email: '[email protected]', password: '123456789', password_confirmation: '123456789') }
+  let(:user1) { create(:user, name: 'abcdef', full_name:'abc bbc', email: '[email protected]', password: '123456789', password_confirmation: '123456789', role: role) }
 
   describe 'validations' do
     it 'validates presence of name' do

spec/models/invitation_spec.rb

@@ -2,11 +2,12 @@
 
 RSpec.describe Invitation, type: :model do
   include ActiveJob::TestHelper
-  let(:user1) { create :user, name: 'rohitgeddam' }
-  let(:user2) { create :user, name: 'superman' }
-  let(:invalid_user) { build :user, name: 'INVALID' }
   let(:role) {Role.create(name: 'Instructor', parent_id: nil, id: 3, default_page_id: nil)}
+  let(:student) {Role.create(name: 'Student', parent_id: nil, id: 5, default_page_id: nil)}
   let(:instructor) { Instructor.create(name: 'testinstructor', email: '[email protected]', full_name: 'Test Instructor', password: '123456', role: role) }
+  let(:user1) { create :user, name: 'rohitgeddam', role: student }
+  let(:user2) { create :user, name: 'superman', role: student }
+  let(:invalid_user) { build :user, name: 'INVALID' }
   let(:assignment) { create(:assignment, instructor: instructor) }
   before(:each) do
     ActiveJob::Base.queue_adapter = :test