Skip to content

Commit f6ce79e

Browse files
dependabot[bot]philippthun
dependabot[bot]
and
philippthun
authored
build(deps-dev): bump rubocop from 1.84.0 to 1.84.1 (#4826)
* build(deps-dev): bump rubocop from 1.84.0 to 1.84.1 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.84.0 to 1.84.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](rubocop/rubocop@v1.84.0...v1.84.1) --- updated-dependencies: - dependency-name: rubocop dependency-version: 1.84.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Correct Rubocop offenses --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Philipp Thun <philipp.thun@sap.com>
1 parent 9ae9ffc commit f6ce79e

9 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ group :test do
7979
gem 'rspec-its'
8080
gem 'rspec-rails', '~> 8.0.2'
8181
gem 'rspec-wait'
82-
gem 'rubocop', '~> 1.84.0'
82+
gem 'rubocop', '~> 1.84.1'
8383
gem 'rubocop-capybara'
8484
gem 'rubocop-factory_bot'
8585
gem 'rubocop-rails', '~> 2.34'

‎Gemfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ GEM
475475
activesupport (>= 3.0.0)
476476
mustache (~> 1.0, >= 0.99.4)
477477
rspec (~> 3.0)
478-
rubocop (1.84.0)
478+
rubocop (1.84.1)
479479
json (~> 2.3)
480480
language_server-protocol (~> 3.17.0.2)
481481
lint_roller (~> 1.1.0)
@@ -679,7 +679,7 @@ DEPENDENCIES
679679
rspec-rails (~> 8.0.2)
680680
rspec-wait
681681
rspec_api_documentation (>= 6.1.0)
682-
rubocop (~> 1.84.0)
682+
rubocop (~> 1.84.1)
683683
rubocop-capybara
684684
rubocop-factory_bot
685685
rubocop-rails (~> 2.34)

‎app/fetchers/app_list_fetcher.rb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,24 @@ def filter(message, dataset)
3838
when BuildpackLifecycleDataModel::LIFECYCLE_TYPE
3939
dataset = dataset.where(
4040
guid: BuildpackLifecycleDataModel.
41-
where(Sequel.~(app_guid: nil)).
42-
select(:app_guid)
41+
where(Sequel.~(app_guid: nil)).
42+
select(:app_guid)
4343
)
4444
when DockerLifecycleDataModel::LIFECYCLE_TYPE
4545
dataset = dataset.exclude(
4646
guid: BuildpackLifecycleDataModel.
47-
where(Sequel.~(app_guid: nil)).
48-
select(:app_guid)
47+
where(Sequel.~(app_guid: nil)).
48+
select(:app_guid)
4949
).exclude(
5050
guid: CNBLifecycleDataModel.
51-
where(Sequel.~(app_guid: nil)).
52-
select(:app_guid)
51+
where(Sequel.~(app_guid: nil)).
52+
select(:app_guid)
5353
)
5454
when CNBLifecycleDataModel::LIFECYCLE_TYPE
5555
dataset = dataset.where(
5656
guid: CNBLifecycleDataModel.
57-
where(Sequel.~(app_guid: nil)).
58-
select(:app_guid)
57+
where(Sequel.~(app_guid: nil)).
58+
select(:app_guid)
5959
)
6060
end
6161
end

‎app/fetchers/queries/app_query.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ def stack_filter(dataset, cond)
2828
dataset.where(
2929
app: VCAP::CloudController::AppModel.where(
3030
buildpack_lifecycle_data: VCAP::CloudController::BuildpackLifecycleDataModel.where(stack: stack_names).
31-
exclude(app_guid: nil).
32-
select(:guid)
31+
exclude(app_guid: nil).
32+
select(:guid)
3333
).select(:guid)
3434
)
3535
end

‎app/models/runtime/organization.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class Organization < Sequel::Model
5757
# r.qualified_right_key = :private_domain_id
5858
# r.predicate_key = :organization_id
5959
VCAP::CloudController::Domain.dataset.where(owning_organization_id: id).
60-
or(id: db[r.join_table_source].select(r.qualified_right_key).where(r.predicate_key => id))
60+
or(id: db[r.join_table_source].select(r.qualified_right_key).where(r.predicate_key => id))
6161
},
6262
before_add: proc { |org, private_domain| org.cancel_action unless private_domain.addable_to_organization?(org) },
6363
before_remove: proc { |org, private_domain| org.cancel_action if private_domain.owned_by?(org) },

‎app/models/runtime/route.rb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,12 @@ def validate_changed_space(new_space)
189189
def self.user_visibility_filter(user)
190190
{
191191
space_id: user.space_developer_space_ids.
192-
union(user.space_manager_space_ids, from_self: false).
193-
union(user.space_auditor_space_ids, from_self: false).
194-
union(user.space_supporter_space_ids, from_self: false).
195-
union(Space.join(user.org_manager_org_ids, organization_id: :organization_id).select(:spaces__id)).
196-
union(Space.join(user.org_auditor_org_ids, organization_id: :organization_id).select(:spaces__id)).
197-
select(:space_id)
192+
union(user.space_manager_space_ids, from_self: false).
193+
union(user.space_auditor_space_ids, from_self: false).
194+
union(user.space_supporter_space_ids, from_self: false).
195+
union(Space.join(user.org_manager_org_ids, organization_id: :organization_id).select(:spaces__id)).
196+
union(Space.join(user.org_auditor_org_ids, organization_id: :organization_id).select(:spaces__id)).
197+
select(:space_id)
198198
}
199199
end
200200

‎app/models/runtime/space.rb‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class DBNameUniqueRaceError < Sequel::ValidationFailed; end
7575
many_to_many :security_groups,
7676
dataset: lambda {
7777
SecurityGroup.left_join(:security_groups_spaces, security_group_id: :id).
78-
where(Sequel.or(security_groups_spaces__space_id: id, security_groups__running_default: true)).distinct(:id)
78+
where(Sequel.or(security_groups_spaces__space_id: id, security_groups__running_default: true)).distinct(:id)
7979
},
8080
eager_loader: lambda { |spaces_map|
8181
space_ids = spaces_map[:id_map].keys
@@ -99,7 +99,7 @@ class DBNameUniqueRaceError < Sequel::ValidationFailed; end
9999
right_key: :staging_security_group_id,
100100
dataset: lambda {
101101
SecurityGroup.left_join(:staging_security_groups_spaces, staging_security_group_id: :id).
102-
where(Sequel.or(staging_security_groups_spaces__staging_space_id: id, security_groups__staging_default: true)).distinct(:id)
102+
where(Sequel.or(staging_security_groups_spaces__staging_space_id: id, security_groups__staging_default: true)).distinct(:id)
103103
},
104104
eager_loader: lambda { |spaces_map|
105105
space_ids = spaces_map[:id_map].keys
@@ -277,11 +277,11 @@ def number_service_keys
277277
def self.user_visibility_filter(user)
278278
{
279279
spaces__id: user.space_developer_space_ids.
280-
union(user.space_manager_space_ids, from_self: false).
281-
union(user.space_auditor_space_ids, from_self: false).
282-
union(user.space_supporter_space_ids, from_self: false).
283-
union(dataset.join(user.org_manager_org_ids, organization_id: :organization_id).select(:spaces__id), from_self: false).
284-
select(:space_id)
280+
union(user.space_manager_space_ids, from_self: false).
281+
union(user.space_auditor_space_ids, from_self: false).
282+
union(user.space_supporter_space_ids, from_self: false).
283+
union(dataset.join(user.org_manager_org_ids, organization_id: :organization_id).select(:spaces__id), from_self: false).
284+
select(:space_id)
285285
}
286286
end
287287

‎middleware/cors.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def call(env)
2929
'Access-Control-Allow-Methods' => 'GET,PUT,POST,DELETE',
3030
'Access-Control-Max-Age' => '900',
3131
'Access-Control-Allow-Headers' => Set.new(%w[origin content-type authorization]).
32-
merge(env['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'].to_s.split(',').map(&:strip).map(&:downcase)).to_a.join(',')
32+
merge(env['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'].to_s.split(',').map(&:strip).map(&:downcase)).to_a.join(',')
3333
})
3434
end
3535

‎spec/unit/models/runtime/pollable_job_model_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ module VCAP::CloudController
9595
it 'returns true if the resource exists' do
9696
organization_quota = QuotaDefinition.make
9797
job = PollableJobModel.make(resource_type: 'organization_quota', resource_guid: organization_quota.
98-
guid)
98+
guid)
9999
expect(job.resource_exists?).to be(true)
100100
end
101101

0 commit comments

Comments
 (0)