Skip to content

Commit f35fa68

Browse files
committed
Style/HashSyntax
1 parent d5672d1 commit f35fa68

35 files changed

+156
-156
lines changed

Rakefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ end
122122

123123
namespace :smoke do
124124
desc "create a new example app with generated specs and run them"
125-
task :app => ["clobber:app", "generate:app", "generate:stuff", :smoke]
125+
task app: ["clobber:app", "generate:app", "generate:stuff", :smoke]
126126
end
127127

128128
desc 'clobber generated files'
@@ -160,12 +160,12 @@ namespace :no_active_record do
160160
desc "run a variety of specs against a non-ActiveRecord generated app"
161161
task :smoke do
162162
in_example_app "LOCATION='../../example_app_generator/run_specs.rb' bin/rake #{rails_template_command} --backtrace",
163-
:app_dir => example_app_dir
163+
app_dir: example_app_dir
164164
end
165165

166166
namespace :smoke do
167167
desc "create a new example app without active record including generated specs and run them"
168-
task :app => [
168+
task app: [
169169
"no_active_record:clobber",
170170
"no_active_record:generate:app",
171171
"no_active_record:generate:stuff",
@@ -188,7 +188,7 @@ namespace :no_active_record do
188188
sh "rm -f #{bindir}/rails"
189189
sh "bundle exec rails new #{example_app_dir} --no-rc --skip-active-record --skip-javascript --skip-bootsnap --skip-sprockets --skip-git --skip-test-unit --skip-listen --skip-bundle --template=example_app_generator/generate_app.rb"
190190

191-
in_example_app(:app_dir => example_app_dir) do
191+
in_example_app(app_dir: example_app_dir) do
192192
sh "./travis_retry_bundle_install.sh 2>&1"
193193
# Rails 4+ cannot use a `rails` binstub generated by Bundler
194194
sh "bundle binstubs bundler rspec-core rake --force"
@@ -208,14 +208,14 @@ namespace :no_active_record do
208208

209209
desc "generate a bunch of stuff with generators"
210210
task :stuff do
211-
in_example_app "bin/rake #{rails_template_command} LOCATION='../../example_app_generator/generate_stuff.rb'", :app_dir => example_app_dir
211+
in_example_app "bin/rake #{rails_template_command} LOCATION='../../example_app_generator/generate_stuff.rb'", app_dir: example_app_dir
212212
end
213213
end
214214
end
215215

216-
task :acceptance => ['smoke:app', 'no_active_record:smoke:app', :cucumber]
216+
task acceptance: ['smoke:app', 'no_active_record:smoke:app', :cucumber]
217217

218-
task :default => [:spec, :acceptance]
218+
task default: [:spec, :acceptance]
219219

220220
task :verify_private_key_present do
221221
private_key = File.expand_path('~/.gem/rspec-gem-private_key.pem')
@@ -224,4 +224,4 @@ task :verify_private_key_present do
224224
end
225225
end
226226

227-
task :build => :verify_private_key_present
227+
task build: :verify_private_key_present

example_app_generator/generate_stuff.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ def using_source_path(path)
116116

117117
file "app/views/things/custom_action.html.erb",
118118
"This is a template for a custom action.",
119-
:force => true
119+
force: true
120120

121121
file "app/views/errors/401.html.erb",
122122
"This is a template for rendering an error page",
123-
:force => true
123+
force: true
124124

125125
# Use the absolute path so we can load it without active record too
126126
apply File.join(DEFAULT_SOURCE_PATH, 'generate_action_mailer_specs.rb')

example_app_generator/no_active_record/lib/rails/generators/in_memory/model/model_generator.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ class ModelGenerator < ::Rspec::Generators::Base
88

99
desc "Creates a Fake ActiveRecord acting model"
1010
argument :attributes,
11-
:type => :array,
12-
:default => [],
13-
:banner => "field:type field:type"
11+
type: :array,
12+
default: [],
13+
banner: "field:type field:type"
1414

1515
check_class_collision
1616

1717
class_option :parent,
18-
:type => :string,
19-
:desc => "The parent class for the generated model"
18+
type: :string,
19+
desc: "The parent class for the generated model"
2020

2121
def create_model_file
2222
template "model.rb.erb",

example_app_generator/spec/verify_custom_renderers_spec.rb

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
require 'rails_helper'
22

3-
RSpec.describe "template rendering", :type => :controller do
3+
RSpec.describe "template rendering", type: :controller do
44
context "without render_views" do
55
context "with the standard renderers" do
66
controller do
77
def index
8-
render :template => 'foo', :layout => false
8+
render template: 'foo', layout: false
99
end
1010
end
1111

@@ -27,7 +27,7 @@ def index
2727
def index
2828
prepend_view_path('app/views/some_templates')
2929

30-
render :template => 'bar', :layout => false
30+
render template: 'bar', layout: false
3131
end
3232
end
3333

@@ -37,7 +37,7 @@ def index
3737
expect(response).to render_template(:bar)
3838
end
3939

40-
it "renders an empty string", :skip => Rails::VERSION::STRING.to_f >= 6.0 do
40+
it "renders an empty string", skip: Rails::VERSION::STRING.to_f >= 6.0 do
4141
get :index
4242

4343
expect(response.body).to eq("")
@@ -49,7 +49,7 @@ def index
4949
def index
5050
prepend_view_path(MyResolver.new)
5151

52-
render :template => 'baz', :layout => false
52+
render template: 'baz', layout: false
5353
end
5454
end
5555

@@ -73,7 +73,7 @@ def index
7373
context "with the standard renderers" do
7474
controller do
7575
def index
76-
render :template => 'foo', :layout => false
76+
render template: 'foo', layout: false
7777
end
7878
end
7979

@@ -95,7 +95,7 @@ def index
9595
def index
9696
prepend_view_path('app/views/some_templates')
9797

98-
render :template => 'bar', :layout => false
98+
render template: 'bar', layout: false
9999
end
100100
end
101101

@@ -117,7 +117,7 @@ def index
117117
def index
118118
prepend_view_path(MyResolver.new)
119119

120-
render :template => 'baz', :layout => false
120+
render template: 'baz', layout: false
121121
end
122122
end
123123

@@ -151,9 +151,9 @@ def find_template(name, path)
151151
"",
152152
name,
153153
lambda { |template, _source = nil| %("Dynamic template with path '#{template.virtual_path}'") },
154-
:virtual_path => path,
155-
:format => :html,
156-
:locals => []
154+
virtual_path: path,
155+
format: :html,
156+
locals: []
157157
)
158158
end
159159
end

example_app_generator/spec/verify_mailer_preview_path_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def as_commandline(ops)
1616
end
1717

1818
def capture_exec(*ops)
19-
ops << { :err => [:child, :out] }
19+
ops << { err: [:child, :out] }
2020
io = IO.popen(ops)
2121
# Necessary to ignore warnings from Rails code base
2222
out = io.readlines.
@@ -28,7 +28,7 @@ def capture_exec(*ops)
2828
end
2929

3030
def have_no_preview
31-
have_attributes(:io => be_blank, :exit_status => 0)
31+
have_attributes(io: be_blank, exit_status: 0)
3232
end
3333

3434
let(:exec_script) {

spec/generators/rspec/channel/channel_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require "generators/rspec/channel/channel_generator"
33
require 'support/generators'
44

5-
RSpec.describe Rspec::Generators::ChannelGenerator, :type => :generator, :skip => !RSpec::Rails::FeatureCheck.has_action_cable_testing? do
5+
RSpec.describe Rspec::Generators::ChannelGenerator, type: :generator, skip: !RSpec::Rails::FeatureCheck.has_action_cable_testing? do
66
setup_default_destination
77

88
describe 'the generated files' do

spec/generators/rspec/controller/controller_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'generators/rspec/controller/controller_generator'
33
require 'support/generators'
44

5-
RSpec.describe Rspec::Generators::ControllerGenerator, :type => :generator do
5+
RSpec.describe Rspec::Generators::ControllerGenerator, type: :generator do
66
setup_default_destination
77

88
describe 'request specs' do

spec/generators/rspec/feature/feature_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'generators/rspec/feature/feature_generator'
33
require 'support/generators'
44

5-
RSpec.describe Rspec::Generators::FeatureGenerator, :type => :generator do
5+
RSpec.describe Rspec::Generators::FeatureGenerator, type: :generator do
66
setup_default_destination
77

88
describe 'feature specs' do

spec/generators/rspec/generator/generator_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'generators/rspec/generator/generator_generator'
22
require 'support/generators'
33

4-
RSpec.describe Rspec::Generators::GeneratorGenerator, :type => :generator do
4+
RSpec.describe Rspec::Generators::GeneratorGenerator, type: :generator do
55
setup_default_destination
66

77
describe "generator specs" do

spec/generators/rspec/helper/helper_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'generators/rspec/helper/helper_generator'
33
require 'support/generators'
44

5-
RSpec.describe Rspec::Generators::HelperGenerator, :type => :generator do
5+
RSpec.describe Rspec::Generators::HelperGenerator, type: :generator do
66
setup_default_destination
77

88
subject { file('spec/helpers/posts_helper_spec.rb') }

spec/generators/rspec/install/install_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'generators/rspec/install/install_generator'
33
require 'support/generators'
44

5-
RSpec.describe Rspec::Generators::InstallGenerator, :type => :generator do
5+
RSpec.describe Rspec::Generators::InstallGenerator, type: :generator do
66
def use_active_record_migration
77
match(/ActiveRecord::Migration\./m)
88
end

spec/generators/rspec/integration/integration_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'generators/rspec/integration/integration_generator'
33
require 'support/generators'
44

5-
RSpec.describe Rspec::Generators::IntegrationGenerator, :type => :generator do
5+
RSpec.describe Rspec::Generators::IntegrationGenerator, type: :generator do
66
setup_default_destination
77
it_behaves_like "a request spec generator"
88
end

spec/generators/rspec/job/job_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'generators/rspec/job/job_generator'
33
require 'support/generators'
44

5-
RSpec.describe Rspec::Generators::JobGenerator, :type => :generator, :skip => !RSpec::Rails::FeatureCheck.has_active_job? do
5+
RSpec.describe Rspec::Generators::JobGenerator, type: :generator, skip: !RSpec::Rails::FeatureCheck.has_active_job? do
66
setup_default_destination
77

88
describe 'the generated files' do

spec/generators/rspec/mailbox/mailbox_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'generators/rspec/mailbox/mailbox_generator'
33
require 'support/generators'
44

5-
RSpec.describe Rspec::Generators::MailboxGenerator, :type => :generator, :skip => !RSpec::Rails::FeatureCheck.has_action_mailbox? do
5+
RSpec.describe Rspec::Generators::MailboxGenerator, type: :generator, skip: !RSpec::Rails::FeatureCheck.has_action_mailbox? do
66
setup_default_destination
77

88
describe 'the generated files' do

spec/generators/rspec/mailer/mailer_generator_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'generators/rspec/mailer/mailer_generator'
33
require 'support/generators'
44

5-
RSpec.describe Rspec::Generators::MailerGenerator, :type => :generator do
5+
RSpec.describe Rspec::Generators::MailerGenerator, type: :generator do
66
setup_default_destination
77

88
describe 'mailer spec' do
@@ -44,7 +44,7 @@
4444
end
4545
end
4646

47-
describe 'a preview is generated for each action', :skip => !RSpec::Rails::FeatureCheck.has_action_mailer_preview? do
47+
describe 'a preview is generated for each action', skip: !RSpec::Rails::FeatureCheck.has_action_mailer_preview? do
4848
subject { file('spec/mailers/previews/posts_preview.rb') }
4949
before do
5050
run_generator %w[posts index show]

spec/generators/rspec/model/model_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'generators/rspec/model/model_generator'
33
require 'support/generators'
44

5-
RSpec.describe Rspec::Generators::ModelGenerator, :type => :generator do
5+
RSpec.describe Rspec::Generators::ModelGenerator, type: :generator do
66
setup_default_destination
77

88
it 'runs both the model and fixture tasks' do

spec/generators/rspec/request/request_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'generators/rspec/request/request_generator'
33
require 'support/generators'
44

5-
RSpec.describe Rspec::Generators::RequestGenerator, :type => :generator do
5+
RSpec.describe Rspec::Generators::RequestGenerator, type: :generator do
66
setup_default_destination
77
it_behaves_like "a request spec generator"
88
end

spec/generators/rspec/system/system_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'generators/rspec/system/system_generator'
44
require 'support/generators'
55

6-
RSpec.describe Rspec::Generators::SystemGenerator, :type => :generator do
6+
RSpec.describe Rspec::Generators::SystemGenerator, type: :generator do
77
setup_default_destination
88

99
describe "system specs" do

spec/generators/rspec/view/view_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'generators/rspec/view/view_generator'
33
require 'support/generators'
44

5-
RSpec.describe Rspec::Generators::ViewGenerator, :type => :generator do
5+
RSpec.describe Rspec::Generators::ViewGenerator, type: :generator do
66
setup_default_destination
77

88
describe 'with default template engine' do

spec/rspec/rails/example/controller_example_group_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def group_for(klass)
2323
it "uses the controller as the subject" do
2424
controller = double('controller')
2525
example = group.new
26-
allow(example).to receive_messages(:controller => controller)
26+
allow(example).to receive_messages(controller: controller)
2727
expect(example.subject).to eq(controller)
2828
end
2929

@@ -73,7 +73,7 @@ def my_helper
7373
end
7474

7575
allow(controller).to receive(:foos_url).and_return('http://test.host/foos')
76-
allow(example).to receive_messages(:controller => controller)
76+
allow(example).to receive_messages(controller: controller)
7777
example.instance_variable_set(:@orig_routes, routes)
7878
end
7979

spec/rspec/rails/example/feature_example_group_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module RSpec::Rails
66
it "includes Rails route helpers" do
77
with_isolated_stderr do
88
Rails.application.routes.draw do
9-
get "/foo", :as => :foo, :to => "foo#bar"
9+
get "/foo", as: :foo, to: "foo#bar"
1010
end
1111
end
1212

0 commit comments

Comments
 (0)