From 93e7967fdb05728bd63961f0c5d766b9cd49434d Mon Sep 17 00:00:00 2001 From: Robin Daugherty Date: Tue, 25 Feb 2020 15:52:35 -0500 Subject: [PATCH 1/4] Add Ruby 2.6.5 and Rails 6.0 --- .travis.yml | 29 +++++++++++++++++++++++++++++ gemfiles/rails60.gemfile | 7 +++++++ gemfiles/rails60_boc.gemfile | 8 ++++++++ gemfiles/rails60_haml.gemfile | 8 ++++++++ 4 files changed, 52 insertions(+) create mode 100644 gemfiles/rails60.gemfile create mode 100644 gemfiles/rails60_boc.gemfile create mode 100644 gemfiles/rails60_haml.gemfile diff --git a/.travis.yml b/.travis.yml index 7e1b7a51..0b54094a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,20 +12,25 @@ rvm: - 2.3.8 - 2.4.9 - 2.5.7 + - 2.6.5 + - 2.7.0 - ruby-head gemfile: - gemfiles/rails42.gemfile - gemfiles/rails50.gemfile - gemfiles/rails51.gemfile - gemfiles/rails52.gemfile + - gemfiles/rails60.gemfile - gemfiles/rails42_haml.gemfile - gemfiles/rails50_haml.gemfile - gemfiles/rails51_haml.gemfile - gemfiles/rails52_haml.gemfile + - gemfiles/rails60_haml.gemfile - gemfiles/rails42_boc.gemfile - gemfiles/rails50_boc.gemfile - gemfiles/rails51_boc.gemfile - gemfiles/rails52_boc.gemfile + - gemfiles/rails60_boc.gemfile - gemfiles/rack.gemfile - gemfiles/rack_boc.gemfile - gemfiles/pry09.gemfile @@ -38,6 +43,12 @@ matrix: - gemfile: gemfiles/pry010.gemfile - gemfile: gemfiles/pry011.gemfile exclude: + - rvm: 2.2.10 + gemfile: gemfiles/rails60.gemfile + - rvm: 2.2.10 + gemfile: gemfiles/rails60_boc.gemfile + - rvm: 2.2.10 + gemfile: gemfiles/rails60_haml.gemfile - rvm: 2.3.8 gemfile: gemfiles/rails42.gemfile - rvm: 2.3.8 @@ -56,3 +67,21 @@ matrix: gemfile: gemfiles/rails42_boc.gemfile - rvm: 2.5.7 gemfile: gemfiles/rails42_haml.gemfile + - rvm: 2.6.5 + gemfile: gemfiles/rails42.gemfile + - rvm: 2.6.5 + gemfile: gemfiles/rails42_boc.gemfile + - rvm: 2.6.5 + gemfile: gemfiles/rails42_haml.gemfile + - rvm: 2.7.0 + gemfile: gemfiles/rails42.gemfile + - rvm: 2.7.0 + gemfile: gemfiles/rails42_boc.gemfile + - rvm: 2.7.0 + gemfile: gemfiles/rails42_haml.gemfile + - rvm: ruby-head + gemfile: gemfiles/rails42.gemfile + - rvm: ruby-head + gemfile: gemfiles/rails42_boc.gemfile + - rvm: ruby-head + gemfile: gemfiles/rails42_haml.gemfile diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile new file mode 100644 index 00000000..55f89c5e --- /dev/null +++ b/gemfiles/rails60.gemfile @@ -0,0 +1,7 @@ +source "https://rubygems.org" + +gem "rails", "~> 6.0.0" + +gem 'coveralls', require: false + +gemspec path: "../" diff --git a/gemfiles/rails60_boc.gemfile b/gemfiles/rails60_boc.gemfile new file mode 100644 index 00000000..190c573c --- /dev/null +++ b/gemfiles/rails60_boc.gemfile @@ -0,0 +1,8 @@ +source "https://rubygems.org" + +gem "rails", "~> 6.0.0" +gem "binding_of_caller" + +gem 'coveralls', require: false + +gemspec path: "../" diff --git a/gemfiles/rails60_haml.gemfile b/gemfiles/rails60_haml.gemfile new file mode 100644 index 00000000..84d3401a --- /dev/null +++ b/gemfiles/rails60_haml.gemfile @@ -0,0 +1,8 @@ +source "https://rubygems.org" + +gem "rails", "~> 6.0.0" +gem "haml" + +gem 'coveralls', require: false + +gemspec path: "../" From a93e6413d5bb3963d17934a5f3e6c807fe01095d Mon Sep 17 00:00:00 2001 From: Robin Daugherty Date: Tue, 25 Feb 2020 23:14:40 -0500 Subject: [PATCH 2/4] Fix nonspecific raise assertion --- spec/better_errors/stack_frame_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/better_errors/stack_frame_spec.rb b/spec/better_errors/stack_frame_spec.rb index 23a8982c..df96c90a 100644 --- a/spec/better_errors/stack_frame_spec.rb +++ b/spec/better_errors/stack_frame_spec.rb @@ -97,7 +97,7 @@ module BetterErrors it "raises on non-NameErrors" do frame = StackFrame.new("/abc/xyz/app/controllers/crap_controller.rb", 123, "index") allow(frame).to receive(:get_local_variable).and_raise(ArgumentError) - expect { frame.local_variable("foo") }.to raise_error + expect { frame.local_variable("foo") }.to raise_error(ArgumentError) end end From b47a3c8422f3854f1d96b163811d5af9d2b3c98e Mon Sep 17 00:00:00 2001 From: Robin Daugherty Date: Tue, 25 Feb 2020 23:17:18 -0500 Subject: [PATCH 3/4] Fix old-style assertions --- spec/better_errors_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/better_errors_spec.rb b/spec/better_errors_spec.rb index ef3d83c8..9d796105 100644 --- a/spec/better_errors_spec.rb +++ b/spec/better_errors_spec.rb @@ -41,7 +41,7 @@ [:atom].each do |editor| it "uses atom:// scheme when set to #{editor.inspect}" do subject.editor = editor - subject.editor[].should start_with "atom://" + expect(subject.editor[]).to start_with "atom://" end end @@ -82,7 +82,7 @@ it "uses atom:// scheme when EDITOR=#{editor}" do ENV["EDITOR"] = editor subject.editor = subject.default_editor - subject.editor[].should start_with "atom://" + expect(subject.editor[]).to start_with "atom://" end end From 2d7774ed830fca8fe1d825a4c62a44204ef867c0 Mon Sep 17 00:00:00 2001 From: Robin Daugherty Date: Wed, 26 Feb 2020 15:09:06 -0500 Subject: [PATCH 4/4] Rails 6 requires Ruby 2.5+ --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0b54094a..d2fd1f17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,12 +55,24 @@ matrix: gemfile: gemfiles/rails42_boc.gemfile - rvm: 2.3.8 gemfile: gemfiles/rails42_haml.gemfile + - rvm: 2.3.8 + gemfile: gemfiles/rails60.gemfile + - rvm: 2.3.8 + gemfile: gemfiles/rails60_boc.gemfile + - rvm: 2.3.8 + gemfile: gemfiles/rails60_haml.gemfile - rvm: 2.4.9 gemfile: gemfiles/rails42.gemfile - rvm: 2.4.9 gemfile: gemfiles/rails42_boc.gemfile - rvm: 2.4.9 gemfile: gemfiles/rails42_haml.gemfile + - rvm: 2.4.9 + gemfile: gemfiles/rails60.gemfile + - rvm: 2.4.9 + gemfile: gemfiles/rails60_boc.gemfile + - rvm: 2.4.9 + gemfile: gemfiles/rails60_haml.gemfile - rvm: 2.5.7 gemfile: gemfiles/rails42.gemfile - rvm: 2.5.7