diff --git a/.travis.yml b/.travis.yml index 3209843..f00aa31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,10 @@ rvm: - - 1.8.7 - - 1.9.2 - 1.9.3 - 2.0.0 branches: only: - master gemfile: - - gemfiles/rails30.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 + 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 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 600e386..35c19e4 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