Further rails 5 fixes.

💘A 💙 💚 💛 💜

Author: Sam Phippen

Gemfile-rails-dependencies

@@ -6,6 +6,7 @@ when /master/
   gem "journey", :git => "git://github.com/rails/journey.git"
   gem "activerecord-deprecated_finders", :git => "git://github.com/rails/activerecord-deprecated_finders.git"
   gem "rails-observers", :git => "git://github.com/rails/rails-observers"
+  gem "web-console", :git => "git://github.com/rails/web-console"
   gem 'sass-rails', :git => "git://github.com/rails/sass-rails.git"
   gem 'coffee-rails', :git => "git://github.com/rails/coffee-rails.git"
   gem 'rack', :git => 'git://github.com/rack/rack.git'
@@ -14,15 +15,18 @@ when /master/
   gem 'sprockets-rails', :git => 'git://github.com/rails/sprockets-rails.git', :branch => 'master'
 when /stable$/
   gem "rails", :git => "git://github.com/rails/rails.git", :branch => version
+  gem 'web-console', '~> 2.0'
 when nil, false, ""
   if RUBY_VERSION < '1.9.3'
     # Rails 4+ requires 1.9.3+, so on earlier versions default to the last 3.x release.
     gem "rails", "~> 3.2.17"
   else
     gem "rails", "~> 4.0.4"
   end
+  gem 'web-console', '~> 2.0'
 else
   gem "rails", version
+  gem 'web-console', '~> 2.0'
 end
 
 gem "i18n", '< 0.7.0' if RUBY_VERSION < '1.9.3'

example_app_generator/generate_app.rb

@@ -14,6 +14,7 @@
   # Remove the existing rails version so we can properly use master or other
   # edge branches
   gsub_file 'Gemfile', /^.*\bgem 'rails.*$/, ''
+  gsub_file "Gemfile", /.*web-console.*/, ''
 
   if Rails::VERSION::STRING >= '5.0.0'
     append_to_file('Gemfile', "gem 'rails-controller-testing', :git => 'https://github.com/rails/rails-controller-testing'")

example_app_generator/generate_stuff.rb

@@ -127,9 +127,11 @@ def using_source_path(path)
 
 append_to_file 'spec/rails_helper.rb', <<-EOT.gsub(/^ +\|/, '')
   |RSpec.configure do |config|
-  |  config.include Rails::Controller::Testing::TestProcess
-  |  config.include Rails::Controller::Testing::TemplateAssertions
-  |  config.include Rails::Controller::Testing::Integration
+  |  [:controller, :view, :request].each do |type|
+  |    config.include Rails::Controller::Testing::TestProcess, :type => type
+  |    config.include Rails::Controller::Testing::TemplateAssertions, :type => type
+  |    config.include Rails::Controller::Testing::Integration, :type => type
+  |  end
   |end
 EOT
 

features/controller_specs/render_views.feature

@@ -12,9 +12,9 @@ Feature: render_views
         render_views
 
         describe "GET index" do
-          it "says 'Listing widgets'" do
+          it "has a widgets related heading" do
             get :index
-            expect(response.body).to match /Listing widgets/im
+            expect(response.body).to match /<h1>.*widgets/im
           end
         end
       end
@@ -34,7 +34,7 @@ Feature: render_views
           describe "GET index" do
             it "renders the actual template" do
               get :index
-              expect(response.body).to match /Listing widgets/im
+              expect(response.body).to match /<h1>.*widgets/im
             end
           end
 
@@ -65,7 +65,7 @@ Feature: render_views
           describe "GET index" do
             it "renders the actual template" do
               get :index
-              expect(response.body).to match /Listing widgets/im
+              expect(response.body).to match /<h1>.*widgets/im
             end
           end
         end
@@ -105,7 +105,7 @@ Feature: render_views
         describe "GET index" do
           it "renders the index template" do
             get :index
-            expect(response.body).to match /Listing widgets/im
+            expect(response.body).to match /<h1>.*widgets/im
           end
         end
       end

features/mailer_specs/url_helpers.feature

@@ -12,7 +12,7 @@ Feature: URL helpers in mailer examples
       """ruby
       require 'rails_helper'
 
-      RSpec.describe Notifications, :type => :mailer do
+      RSpec.describe NotificationsMailer, :type => :mailer do
         it 'should have access to URL helpers' do
           expect { gadgets_url }.not_to raise_error
         end
@@ -30,7 +30,7 @@ Feature: URL helpers in mailer examples
       """ruby
       require 'rails_helper'
 
-      RSpec.describe Notifications, :type => :mailer do
+      RSpec.describe NotificationsMailer, :type => :mailer do
         it 'should have access to URL helpers' do
           expect { gadgets_url :host => 'example.com' }.not_to raise_error
           expect { gadgets_url }.to raise_error