diff --git a/Rakefile b/Rakefile index f17ba175a4..7ea901fa9d 100644 --- a/Rakefile +++ b/Rakefile @@ -63,7 +63,8 @@ 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 " \ - "--skip-git --skip-test-unit --skip-listen --skip-bundle --template=example_app_generator/generate_app.rb" + "--skip-git --skip-test-unit --skip-listen --skip-bundle --skip-spring " \ + "--template=example_app_generator/generate_app.rb" in_example_app do sh "./travis_retry_bundle_install.sh 2>&1" @@ -189,7 +190,8 @@ namespace :no_active_record do # Rails 4+ cannot use a `rails` binstub generated by Bundler sh "rm -f #{bindir}/rails" 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" + "--skip-sprockets --skip-git --skip-test-unit --skip-listen --skip-bundle --skip-spring " \ + "--template=example_app_generator/generate_app.rb" in_example_app(app_dir: example_app_dir) do sh "./travis_retry_bundle_install.sh 2>&1" diff --git a/script/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler index 2ecbbf294a..3cfe3a4565 100755 --- a/script/update_rubygems_and_install_bundler +++ b/script/update_rubygems_and_install_bundler @@ -10,6 +10,6 @@ if is_ruby_23_plus; then gem install --no-document bundler else echo "Warning installing older versions of Rubygems / Bundler" - gem update --system '2.7.8' + gem update --system '2.7.10' gem install bundler -v '1.17.3' fi diff --git a/spec/rspec/rails/example/view_example_group_spec.rb b/spec/rspec/rails/example/view_example_group_spec.rb index d16002ff60..ec27baf461 100644 --- a/spec/rspec/rails/example/view_example_group_spec.rb +++ b/spec/rspec/rails/example/view_example_group_spec.rb @@ -247,15 +247,18 @@ def _view; end # Stub method pending_only_on_ruby_22_rails_52 = false end - it 'is accessible to hooks', pending: pending_only_on_ruby_22_rails_52 do + # Regression test from rspec/rspec-rails#833 + it 'is accessible to configuration-level hooks', pending: pending_only_on_ruby_22_rails_52 do with_isolated_config do run_count = 0 RSpec.configuration.before(:each, type: :view) do + # `view` is provided from the view example type, and serves to + # demonstrate this hook is run in the correct context. allow(view).to receive(:render) { :value } run_count += 1 end group = RSpec::Core::ExampleGroup.describe 'a view', type: :view do - specify { expect(true).to eq true } + specify { expect(view.render).to eq(:value) } end group.run(failure_reporter) expect(failure_reporter.exceptions).to eq []