From ef3895cbcf3c2c8391a88952198168b4c4eaab41 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 3 Jul 2015 09:31:46 -0400 Subject: [PATCH 1/3] No one uses 1.8.7 or 1.9.2 anymore. Sorry, folks. --- .travis.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3209843..11a3815 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,4 @@ rvm: - - 1.8.7 - - 1.9.2 - 1.9.3 - 2.0.0 branches: @@ -11,9 +9,4 @@ gemfile: - gemfiles/rails31.gemfile - gemfiles/rails32.gemfile - gemfiles/rails40.gemfile -matrix: - exclude: - - rvm: 1.8.7 - gemfile: gemfiles/rails40.gemfile - - rvm: 1.9.2 - gemfile: gemfiles/rails40.gemfile + From d06a756c8d79f0095474337bf65c16a3f94b841e Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 3 Jul 2015 12:20:54 -0400 Subject: [PATCH 2/3] RSpec modernization fixes. --- spec/rack/livereload/body_processor_spec.rb | 2 +- spec/rack/livereload/processing_skip_analyzer_spec.rb | 2 +- spec/rack/livereload_spec.rb | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spec/rack/livereload/body_processor_spec.rb b/spec/rack/livereload/body_processor_spec.rb index fad68b6..331471c 100644 --- a/spec/rack/livereload/body_processor_spec.rb +++ b/spec/rack/livereload/body_processor_spec.rb @@ -15,7 +15,7 @@ describe Rack::LiveReload::BodyProcessor do end it 'responds false when no head tag' do - regex.match("
").should be_false + regex.match("
").should be_falsey end end diff --git a/spec/rack/livereload/processing_skip_analyzer_spec.rb b/spec/rack/livereload/processing_skip_analyzer_spec.rb index e1c856e..bc28426 100644 --- a/spec/rack/livereload/processing_skip_analyzer_spec.rb +++ b/spec/rack/livereload/processing_skip_analyzer_spec.rb @@ -14,7 +14,7 @@ describe Rack::LiveReload::ProcessingSkipAnalyzer do describe '#skip_processing?' do it "should skip processing" do - subject.skip_processing?.should be_true + subject.skip_processing?.should be_truthy end end diff --git a/spec/rack/livereload_spec.rb b/spec/rack/livereload_spec.rb index d955ab5..9322706 100644 --- a/spec/rack/livereload_spec.rb +++ b/spec/rack/livereload_spec.rb @@ -7,7 +7,9 @@ describe Rack::LiveReload do subject { middleware } - its(:app) { should == app } + it 'should be an app' do + middleware.app.should be == app + end let(:env) { {} } let(:options) { {} } @@ -20,7 +22,7 @@ describe Rack::LiveReload do end it 'should return the js file' do - middleware._call(env).should be_true + middleware._call(env).should be_truthy end end end From ffa5d63ffc1eb45634fc855f0ef12ec64edbda54 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Fri, 3 Jul 2015 12:28:20 -0400 Subject: [PATCH 3/3] Trim a little more out of the tests. --- .travis.yml | 2 -- Appraisals | 8 -------- gemfiles/rails30.gemfile | 7 ------- gemfiles/rails31.gemfile | 7 ------- 4 files changed, 24 deletions(-) delete mode 100644 gemfiles/rails30.gemfile delete mode 100644 gemfiles/rails31.gemfile diff --git a/.travis.yml b/.travis.yml index 11a3815..f00aa31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ branches: only: - master gemfile: - - gemfiles/rails30.gemfile - - gemfiles/rails31.gemfile - gemfiles/rails32.gemfile - gemfiles/rails40.gemfile diff --git a/Appraisals b/Appraisals index e80ed07..2e0bfb2 100644 --- a/Appraisals +++ b/Appraisals @@ -1,11 +1,3 @@ -appraise 'rails30' do - gem 'rails', '~> 3.0.0' -end - -appraise 'rails31' do - gem 'rails', '~> 3.1.0' -end - appraise 'rails32' do gem 'rails', '~> 3.2.0' end diff --git a/gemfiles/rails30.gemfile b/gemfiles/rails30.gemfile deleted file mode 100644 index eaf7f8d..0000000 --- a/gemfiles/rails30.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -# This file was generated by Appraisal - -source "http://rubygems.org" - -gem "rails", "~> 3.0.0" - -gemspec :path=>"../" \ No newline at end of file diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile deleted file mode 100644 index 5a7622b..0000000 --- a/gemfiles/rails31.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -# This file was generated by Appraisal - -source "http://rubygems.org" - -gem "rails", "~> 3.1.0" - -gemspec :path=>"../" \ No newline at end of file