From d9532a482eaefa584e6e896e916b9215bf2d8a06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Sep 2026 09:23:17 +0000 Subject: [PATCH 1/2] Bump rubocop from 1.89.0 to 1.90.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.89.0 to 1.90.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.89.0...v1.90.0) --- updated-dependencies: - dependency-name: rubocop dependency-version: 1.90.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fd2735757..ba0c15576 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -449,8 +449,8 @@ GEM rspec-support (3.13.7) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.89.0) - json (~> 2.3) + rubocop (1.90.0) + json (>= 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) parallel (>= 1.10) From 5acfaf8382360f7738b32792bbdcefd041128fbd Mon Sep 17 00:00:00 2001 From: Chris Zetter <253059100+zetter-rpf@users.noreply.github.com> Date: Fri, 4 Sep 2026 11:42:31 +0100 Subject: [PATCH 2/2] Autofix rubocop errors from upgrade --- lib/concepts/school_student/create_batch_sso.rb | 3 +-- lib/profile_api_client.rb | 3 +-- lib/tasks/seeds_helper.rb | 6 ++---- spec/requests/join_controller_spec.rb | 3 +-- spec/support/sign_in_stubs.rb | 3 +-- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/lib/concepts/school_student/create_batch_sso.rb b/lib/concepts/school_student/create_batch_sso.rb index e1c18dd5d..435dd8f53 100644 --- a/lib/concepts/school_student/create_batch_sso.rb +++ b/lib/concepts/school_student/create_batch_sso.rb @@ -67,9 +67,8 @@ def create_student_roles(school, responses) end # We know the school and uniqueness is ok at this stage, so we can skip validations - # rubocop:disable Rails/SkipsModelValidations + # rubocop:disable-next Rails/SkipsModelValidations Role.insert_all(new_roles, unique_by: %i[user_id school_id role]) - # rubocop:enable Rails/SkipsModelValidations end def format_student_responses(responses) diff --git a/lib/profile_api_client.rb b/lib/profile_api_client.rb index cbd45d8e1..ad41f358d 100644 --- a/lib/profile_api_client.rb +++ b/lib/profile_api_client.rb @@ -6,9 +6,8 @@ class ProfileApiClient owner: 'school:owner' }.freeze - # rubocop:disable Naming/MethodName + # rubocop:disable-next Naming/MethodName Student = Data.define(:id, :schoolId, :name, :username, :createdAt, :updatedAt, :discardedAt, :email, :ssoProviders) - # rubocop:enable Naming/MethodName class Error < StandardError; end diff --git a/lib/tasks/seeds_helper.rb b/lib/tasks/seeds_helper.rb index c13ec74b0..1bf055803 100644 --- a/lib/tasks/seeds_helper.rb +++ b/lib/tasks/seeds_helper.rb @@ -2,7 +2,7 @@ require_relative 'project_preview_seeds_helper' -# rubocop:disable Metrics/ModuleLength +# rubocop:disable-next Metrics/ModuleLength module SeedsHelper include ProjectPreviewSeedsHelper @@ -59,9 +59,8 @@ def verify_school(school) Role.teacher.create!(user_id: school.creator_id, school:) end - # rubocop:disable Rails/SkipsModelValidations + # rubocop:disable-next Rails/SkipsModelValidations school.update_column(:code, SCHOOL_CODE) # The code needs to match the one in the profile - # rubocop:enable Rails/SkipsModelValidations end def create_school_class(teacher_id, school, name = Faker::Educator.course_name, description = Faker::Hacker.phrases.sample) @@ -150,4 +149,3 @@ def create_project(user_id, school, lesson, project_type) end end end -# rubocop:enable Metrics/ModuleLength diff --git a/spec/requests/join_controller_spec.rb b/spec/requests/join_controller_spec.rb index 3ebc56083..9ffa73d9b 100644 --- a/spec/requests/join_controller_spec.rb +++ b/spec/requests/join_controller_spec.rb @@ -203,7 +203,7 @@ expect(response).to have_http_status(:not_found) end - # rubocop:disable RSpec/AnyInstance + # rubocop:disable-next RSpec/AnyInstance it 'responds with 500 when action_status returns an unexpected value' do allow_any_instance_of(Api::JoinController).to receive(:action_status).and_return(:something_unexpected) @@ -212,7 +212,6 @@ expect(response).to have_http_status(:internal_server_error) expect(response.body).to include('Unexpected join action_status') end - # rubocop:enable RSpec/AnyInstance context 'when the email domain is not registered for the school' do let(:student) { build(:student, email: 'student@other.edu') } diff --git a/spec/support/sign_in_stubs.rb b/spec/support/sign_in_stubs.rb index 8305ee15b..56786cc89 100644 --- a/spec/support/sign_in_stubs.rb +++ b/spec/support/sign_in_stubs.rb @@ -3,11 +3,10 @@ module SignInStubs # Use this method if you don't want to bother going through the login process # itself. - # rubocop:disable RSpec/AnyInstance + # rubocop:disable-next RSpec/AnyInstance def stub_sign_in(user) allow_any_instance_of(AuthenticationHelper).to receive(:current_user).and_return(user) end - # rubocop:enable RSpec/AnyInstance def stub_auth_for(user) OmniAuth.config.add_mock(:rpi, uid: user.id, extra: { raw_info: user.serializable_hash(except: :id) })