Skip to content

Commit ea51529

Browse files
jonathanhefnerp8
andauthored
Merge pull request rails#49846 from aashishpsaini/use-consistent-name-for-redis
Use Consistent name for Redis Co-authored-by: Petrik <[email protected]>
2 parents 4425ba2 + d8b3c55 commit ea51529

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

activejob/test/support/integration/adapters/backburner.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def setup
88
config.logger = Rails.logger
99
end
1010
unless can_run?
11-
puts "Cannot run integration tests for backburner. To be able to run integration tests for backburner you need to install and start beanstalkd.\n"
11+
puts "Cannot run integration tests for Backburner. To be able to run integration tests for Backburner you need to install and start beanstalkd.\n"
1212
status = ENV["BUILDKITE"] ? false : true
1313
exit status
1414
end

activejob/test/support/integration/adapters/queue_classic.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def start_workers
4040
end
4141

4242
rescue PG::ConnectionBad
43-
puts "Cannot run integration tests for queue_classic. To be able to run integration tests for queue_classic you need to install and start postgresql.\n"
43+
puts "Cannot run integration tests for QueueClassic. To be able to run integration tests for QueueClassic you need to install and start PostgreSQL.\n"
4444
status = ENV["BUILDKITE"] ? false : true
4545
exit status
4646
end

activejob/test/support/integration/adapters/resque.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def setup
66
Resque.redis = Redis::Namespace.new "active_jobs_int_test", redis: Redis.new(url: ENV["REDIS_URL"] || "redis://127.0.0.1:6379/12")
77
Resque.logger = Rails.logger
88
unless can_run?
9-
puts "Cannot run integration tests for resque. To be able to run integration tests for resque you need to install and start redis.\n"
9+
puts "Cannot run integration tests for Resque. To be able to run integration tests for Resque you need to install and start Redis.\n"
1010
status = ENV["BUILDKITE"] ? false : true
1111
exit status
1212
end

activejob/test/support/integration/adapters/sidekiq.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module SidekiqJobsManager
99
def setup
1010
ActiveJob::Base.queue_adapter = :sidekiq
1111
unless can_run?
12-
puts "Cannot run integration tests for sidekiq. To be able to run integration tests for sidekiq you need to install and start redis.\n"
12+
puts "Cannot run integration tests for Sidekiq. To be able to run integration tests for Sidekiq you need to install and start Redis.\n"
1313
status = ENV["BUILDKITE"] ? false : true
1414
exit status
1515
end

activejob/test/support/integration/adapters/sneakers.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def setup
1717
pid_path: Rails.root.join("tmp/sneakers.pid").to_s,
1818
log: Rails.root.join("log/sneakers.log").to_s
1919
unless can_run?
20-
puts "Cannot run integration tests for sneakers. To be able to run integration tests for sneakers you need to install and start rabbitmq.\n"
20+
puts "Cannot run integration tests for Sneakers. To be able to run integration tests for Sneakers you need to install and start RabbitMQ.\n"
2121
status = ENV["BUILDKITE"] ? false : true
2222
exit status
2323
end

activerecord/lib/active_record/sanitization.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def replace_bind_variable(value, c = connection)
212212

213213
def replace_named_bind_variables(statement, bind_vars)
214214
statement.gsub(/([:\\]?):([a-zA-Z]\w*)/) do |match|
215-
if $1 == ":" # skip postgresql casts
215+
if $1 == ":" # skip PostgreSQL casts
216216
match # return the whole match
217217
elsif $1 == "\\" # escaped literal colon
218218
match[1..-1] # return match with escaping backlash char removed

activerecord/test/cases/schema_dumper_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def test_schema_dump_includes_limit_constraint_for_integer_columns
122122
assert_match %r{c_int_1.*limit: 2}, output
123123
assert_match %r{c_int_2.*limit: 2}, output
124124

125-
# int 3 is 4 bytes in postgresql
125+
# int 3 is 4 bytes in PostgreSQL
126126
assert_match %r{"c_int_3"(?!.*limit)}, output
127127
assert_match %r{"c_int_4"(?!.*limit)}, output
128128
elsif current_adapter?(:Mysql2Adapter, :TrilogyAdapter)

activesupport/test/cache/stores/redis_cache_store_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def build(**kwargs)
135135
class StoreTest < ActiveSupport::TestCase
136136
setup do
137137
@cache = nil
138-
skip "redis server is not up" unless REDIS_UP
138+
skip "Redis server is not up" unless REDIS_UP
139139
@namespace = "test-#{SecureRandom.hex}"
140140

141141
@cache = lookup_store(expires_in: 60)

railties/lib/rails/health_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module Rails
2424
# The health check will now be accessible via the +/healthz+ path.
2525
#
2626
# NOTE: This endpoint does not reflect the status of all of your application's
27-
# dependencies, such as the database or redis cluster. Replace
27+
# dependencies, such as the database or Redis cluster. Replace
2828
# <tt>"rails/health#show"</tt> with your own controller action if you have
2929
# application specific needs.
3030
#

0 commit comments

Comments
 (0)