Skip to content

Minor improvements #2362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 27, 2020
Merged

Minor improvements #2362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34ef09f
Skip Spring
pirj Jul 25, 2020
1ea3f35
Update to the latest RubyGems
pirj Jul 25, 2020
c75b172
Add historical info to avoid confusion
pirj Jul 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion script/update_rubygems_and_install_bundler
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 5 additions & 2 deletions spec/rspec/rails/example/view_example_group_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 []
Expand Down