Skip to content

Commit 477568e

Browse files
committed
modernizes hash syntax in railties
1 parent 5c315a8 commit 477568e

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
lines changed

railties/Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
require "rake/testtask"
22

3-
task :default => :test
3+
task default: :test
44

55
task :package
66

77
desc "Run all unit tests"
8-
task :test => "test:isolated"
8+
task test: "test:isolated"
99

1010
namespace :test do
1111
task :isolated do

railties/lib/rails/api/task.rb

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@ module API
55
class Task < RDoc::Task
66
RDOC_FILES = {
77
"activesupport" => {
8-
:include => %w(
8+
include: %w(
99
README.rdoc
1010
lib/active_support/**/*.rb
1111
),
12-
:exclude => "lib/active_support/vendor/*"
12+
exclude: "lib/active_support/vendor/*"
1313
},
1414

1515
"activerecord" => {
16-
:include => %w(
16+
include: %w(
1717
README.rdoc
1818
lib/active_record/**/*.rb
1919
)
2020
},
2121

2222
"activemodel" => {
23-
:include => %w(
23+
include: %w(
2424
README.rdoc
2525
lib/active_model/**/*.rb
2626
)
2727
},
2828

2929
"actionpack" => {
30-
:include => %w(
30+
include: %w(
3131
README.rdoc
3232
lib/abstract_controller/**/*.rb
3333
lib/action_controller/**/*.rb
@@ -36,40 +36,40 @@ class Task < RDoc::Task
3636
},
3737

3838
"actionview" => {
39-
:include => %w(
39+
include: %w(
4040
README.rdoc
4141
lib/action_view/**/*.rb
4242
),
43-
:exclude => "lib/action_view/vendor/*"
43+
exclude: "lib/action_view/vendor/*"
4444
},
4545

4646
"actionmailer" => {
47-
:include => %w(
47+
include: %w(
4848
README.rdoc
4949
lib/action_mailer/**/*.rb
5050
)
5151
},
5252

5353
"activejob" => {
54-
:include => %w(
54+
include: %w(
5555
README.md
5656
lib/active_job/**/*.rb
5757
)
5858
},
5959

6060
"actioncable" => {
61-
:include => %w(
61+
include: %w(
6262
README.md
6363
lib/action_cable/**/*.rb
6464
)
6565
},
6666

6767
"railties" => {
68-
:include => %w(
68+
include: %w(
6969
README.rdoc
7070
lib/**/*.rb
7171
),
72-
:exclude => "lib/rails/generators/rails/**/templates/**/*.rb"
72+
exclude: "lib/rails/generators/rails/**/templates/**/*.rb"
7373
}
7474
}
7575

railties/lib/rails/tasks/engine.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ task "load_app" do
22
namespace :app do
33
load APP_RAKEFILE
44
end
5-
task :environment => "app:environment"
5+
task environment: "app:environment"
66

77
if !defined?(ENGINE_ROOT) || !ENGINE_ROOT
88
ENGINE_ROOT = find_engine_path(APP_RAKEFILE)

railties/lib/rails/test_unit/testing.rake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ namespace :test do
2121
# If used with Active Record, this task runs before the database schema is synchronized.
2222
end
2323

24-
task :run => %w[test]
24+
task run: %w[test]
2525

2626
desc "Run tests quickly, but also reset db"
27-
task :db => %w[db:test:prepare test]
27+
task db: %w[db:test:prepare test]
2828

2929
["models", "helpers", "controllers", "mailers", "integration", "jobs"].each do |name|
3030
task name => "test:prepare" do
@@ -33,17 +33,17 @@ namespace :test do
3333
end
3434
end
3535

36-
task :generators => "test:prepare" do
36+
task generators: "test:prepare" do
3737
$: << "test"
3838
Minitest.rake_run(["test/lib/generators"])
3939
end
4040

41-
task :units => "test:prepare" do
41+
task units: "test:prepare" do
4242
$: << "test"
4343
Minitest.rake_run(["test/models", "test/helpers", "test/unit"])
4444
end
4545

46-
task :functionals => "test:prepare" do
46+
task functionals: "test:prepare" do
4747
$: << "test"
4848
Minitest.rake_run(["test/controllers", "test/mailers", "test/functional"])
4949
end

railties/test/application/initializers/i18n_test.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ class Foo < ActiveRecord::Base
233233
end
234234

235235
test "config.i18n.fallbacks.map = { :ca => :'es-ES' } initializes fallbacks with a mapping ca => es-ES" do
236-
I18n::Railtie.config.i18n.fallbacks.map = { :ca => :'es-ES' }
236+
I18n::Railtie.config.i18n.fallbacks.map = { ca: :'es-ES' }
237237
load_app
238238
assert_fallbacks ca: [:ca, :"es-ES", :es, :en]
239239
end
@@ -245,13 +245,13 @@ class Foo < ActiveRecord::Base
245245
end
246246

247247
test "[shortcut] config.i18n.fallbacks = [{ :ca => :'es-ES' }] initializes fallbacks with a mapping ca => es-ES" do
248-
I18n::Railtie.config.i18n.fallbacks.map = { :ca => :'es-ES' }
248+
I18n::Railtie.config.i18n.fallbacks.map = { ca: :'es-ES' }
249249
load_app
250250
assert_fallbacks ca: [:ca, :"es-ES", :es, :en]
251251
end
252252

253253
test "[shortcut] config.i18n.fallbacks = [:'en-US', { :ca => :'es-ES' }] initializes fallbacks with the given arguments" do
254-
I18n::Railtie.config.i18n.fallbacks = [:'en-US', { :ca => :'es-ES' }]
254+
I18n::Railtie.config.i18n.fallbacks = [:'en-US', { ca: :'es-ES' }]
255255
load_app
256256
assert_fallbacks ca: [:ca, :"es-ES", :es, :'en-US', :en]
257257
end

railties/test/application/middleware/exceptions_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def index
116116
✓測試テスト시험
117117
ERB
118118

119-
get "/foo", :utf8 => "✓"
119+
get "/foo", utf8: "✓"
120120
assert_match(/boooom/, last_response.body)
121121
assert_match(/測試テスト시험/, last_response.body)
122122
end

railties/test/application/routing_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ def index
448448

449449
get "/en/foo"
450450
assert_equal "foo", last_response.body
451-
assert_equal "/en/foo", Rails.application.routes.url_helpers.foo_path(:locale => "en")
451+
assert_equal "/en/foo", Rails.application.routes.url_helpers.foo_path(locale: "en")
452452

453453
app_file "config/routes.rb", <<-RUBY
454454
Rails.application.routes.draw do
@@ -463,7 +463,7 @@ def index
463463

464464
get "/en/bar"
465465
assert_equal "bar", last_response.body
466-
assert_equal "/en/bar", Rails.application.routes.url_helpers.foo_path(:locale => "en")
466+
assert_equal "/en/bar", Rails.application.routes.url_helpers.foo_path(locale: "en")
467467
end
468468

469469
test "resource routing with irregular inflection" do

railties/test/generators/scaffold_generator_test.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ def test_scaffold_with_namespace_on_invoke
269269

270270
def test_scaffold_with_namespace_on_revoke
271271
run_generator [ "admin/role", "name:string", "description:string" ]
272-
run_generator [ "admin/role" ], :behavior => :revoke
272+
run_generator [ "admin/role" ], behavior: :revoke
273273

274274
# Model
275275
assert_file "app/models/admin.rb" # ( should not be remove )
@@ -310,7 +310,7 @@ def test_scaffold_generator_on_revoke_does_not_mutilate_legacy_map_parameter
310310
end
311311
File.open(route_path, "wb") { |file| file.write(content) }
312312

313-
run_generator ["product_line"], :behavior => :revoke
313+
run_generator ["product_line"], behavior: :revoke
314314

315315
assert_file "config/routes.rb", /\.routes\.draw do\s*\|map\|\s*$/
316316
end
@@ -328,7 +328,7 @@ def test_scaffold_generator_on_revoke_does_not_mutilate_routes
328328
File.open(route_path, "wb") { |file| file.write(content) }
329329
assert_file "config/routes.rb", /\.routes\.draw do\n resources :product_lines\nend\n\z/
330330

331-
run_generator ["product_line"], :behavior => :revoke
331+
run_generator ["product_line"], behavior: :revoke
332332

333333
assert_file "config/routes.rb", /\.routes\.draw do\nend\n\z/
334334
end

0 commit comments

Comments
 (0)