Cosmetic styling fixes

Author: pirj

.rubocop_todo.yml

@@ -9,9 +9,3 @@ Layout/LineLength:
 # Over time we'd like to get this down, but this is what we're at now.
 Metrics/MethodLength:
   Max: 43 # default: 10
-
-# On 1.8 `proc` was `lambda`, so we used `Proc.new` to ensure we got real procs
-# on all supported versions.
-# http://batsov.com/articles/2014/02/04/the-elements-of-style-in-ruby-number-12-proc-vs-proc-dot-new/
-Style/Proc:
-  Enabled: false

Rakefile

@@ -62,7 +62,7 @@ namespace :generate do
 
       # Rails 4+ cannot use a `rails` binstub generated by Bundler
       sh "rm -f #{bindir}/rails"
-      sh "bundle exec rails new ./tmp/example_app --no-rc --skip-javascript --skip-bootsnap --skip-sprockets "\
+      sh "bundle exec rails new ./tmp/example_app --no-rc --skip-javascript --skip-bootsnap --skip-sprockets " \
          "--skip-git --skip-test-unit --skip-listen --skip-bundle --template=example_app_generator/generate_app.rb"
 
       in_example_app do
@@ -187,9 +187,8 @@ namespace :no_active_record do
 
         # Rails 4+ cannot use a `rails` binstub generated by Bundler
         sh "rm -f #{bindir}/rails"
-        # rubocop:disable Layout/LineLength
-        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"
-        # rubocop:enable Layout/LineLength
+        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"
 
         in_example_app(app_dir: example_app_dir) do
           sh "./travis_retry_bundle_install.sh 2>&1"

lib/rspec/rails/configuration.rb

@@ -55,8 +55,7 @@ def self.add_test_type_configurations(config)
     end
 
     # @private
-    # rubocop:disable Metrics/MethodLength
-    def self.initialize_configuration(config)
+    def self.initialize_configuration(config) # rubocop:disable Metrics/MethodLength
       config.backtrace_exclusion_patterns << /vendor\//
       config.backtrace_exclusion_patterns << %r{lib/rspec/rails}
 
@@ -151,7 +150,6 @@ def filter_rails_from_backtrace!
         config.include RSpec::Rails::MailboxExampleGroup, type: :mailbox
       end
     end
-    # rubocop:enable Metrics/MethodLength
 
     initialize_configuration RSpec.configuration
   end

lib/rspec/rails/example/channel_example_group.rb

@@ -34,7 +34,7 @@ def channel_class
               next if klass <= ::ActionCable::Channel::Base
 
               raise "Described class is not a channel class.\n" \
-                    "Specify the channel class in the `describe` statement "\
+                    "Specify the channel class in the `describe` statement " \
                     "or set it manually using `tests MyChannelClass`"
             end
           end
@@ -45,7 +45,7 @@ def connection_class
               next if klass <= ::ActionCable::Connection::Base
 
               raise "Described class is not a connection class.\n" \
-                    "Specify the connection class in the `describe` statement "\
+                    "Specify the connection class in the `describe` statement " \
                     "or set it manually using `tests MyConnectionClass`"
             end
           end

script/after_update_travis_build.sh

@@ -3,5 +3,3 @@ set -e
 
 echo "Restoring custom Travis config"
 mv .travis.yml{.update_backup,}
-
-echo "Removing Base rubocop, Rspec-Rails does not use it"

spec/rspec/rails/active_model_spec.rb

@@ -16,9 +16,10 @@
     end
 
     it 'allows you to stub instances of `ActiveModel`' do
-      # rubocop:disable Style/Semicolon
-      klass = Class.new { include ActiveModel::AttributeMethods; attr_accessor :name }
-      # rubocop:enable Style/Semicolon
+      klass = Class.new do
+        include ActiveModel::AttributeMethods
+        attr_accessor :name
+      end
       model = klass.new
       allow(model).to receive(:name) { 'stubbed name' }
       expect(model.name).to eq 'stubbed name'