Skip to content

Commit

Permalink
Environment updated; Version tick
Browse files Browse the repository at this point in the history
  • Loading branch information
inossidabile committed Feb 4, 2016
1 parent dd54faf commit 6bf7ef3
Show file tree
Hide file tree
Showing 11 changed files with 123 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pkg/
spec/dummy/db/*.sqlite3
spec/dummy/log/*.log
spec/dummy/tmp/
gemfiles
gemfiles/*.lock
coverage
tags
Gemfile.lock
24 changes: 20 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
before_install:
- gem install bundler
script: "bundle exec rspec"
script: bundle exec rspec
gemfile:
- gemfiles/rails_3.1.3.gemfile
- gemfiles/rails_3.2.12.gemfile
- gemfiles/rails_4.0.0.gemfile
- gemfiles/rails_4.1.0.gemfile
- gemfiles/rails_4.2.0.gemfile
rvm:
- 1.9.3
- 2.0.0
- 2.1.8
- 2.2.4
- 2.3.0
- jruby-19mode
- jruby
matrix:
exclude:
- rvm: 2.2.4
gemfile: gemfiles/rails_3.1.3.gemfile
- rvm: 2.2.4
gemfile: gemfiles/rails_3.2.12.gemfile
- rvm: 2.3.0
gemfile: gemfiles/rails_3.1.3.gemfile
- rvm: 2.3.0
gemfile: gemfiles/rails_3.2.12.gemfile
before_install:
- gem update bundler
6 changes: 2 additions & 4 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
appraise "rails-3.2.8" do
gem "rails", "3.2.8"
end

appraise "rails-3.1.3" do
gem "rails", "3.1.3"
gem "test-unit"
end

appraise "rails-3.2.12" do
gem "rails", "3.2.12"
gem "test-unit"
end

appraise "rails-4.0.0" do
Expand Down
10 changes: 1 addition & 9 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,9 @@ require 'rspec/core/rake_task'

RSpec::Core::RakeTask.new(:spec)

desc "Default: run the unit tests."
task :default => [:all]

task :console do
require "action_controller/railtie"
require "rails/test_unit/railtie"
Bundler.require
binding.pry
end

desc 'Test the plugin under all supported Rails versions.'
task :all => ["appraisal:install"] do |t|
exec('rake appraisal spec')
end
end
20 changes: 20 additions & 0 deletions gemfiles/rails_3.1.3.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "wasabi"
gem "savon", ">= 2.0.0"
gem "httpi"
gem "rspec-rails"
gem "guard"
gem "guard-rspec"
gem "rb-fsevent"
gem "appraisal"
gem "tzinfo"
gem "pry"
gem "simplecov"
gem "simplecov-summary"
gem "rails", "3.1.3"
gem "test-unit"

gemspec :path => "../"
20 changes: 20 additions & 0 deletions gemfiles/rails_3.2.12.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "wasabi"
gem "savon", ">= 2.0.0"
gem "httpi"
gem "rspec-rails"
gem "guard"
gem "guard-rspec"
gem "rb-fsevent"
gem "appraisal"
gem "tzinfo"
gem "pry"
gem "simplecov"
gem "simplecov-summary"
gem "rails", "3.2.12"
gem "test-unit"

gemspec :path => "../"
19 changes: 19 additions & 0 deletions gemfiles/rails_4.0.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "wasabi"
gem "savon", ">= 2.0.0"
gem "httpi"
gem "rspec-rails"
gem "guard"
gem "guard-rspec"
gem "rb-fsevent"
gem "appraisal"
gem "tzinfo"
gem "pry"
gem "simplecov"
gem "simplecov-summary"
gem "rails", "4.0.0"

gemspec :path => "../"
19 changes: 19 additions & 0 deletions gemfiles/rails_4.1.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "wasabi"
gem "savon", ">= 2.0.0"
gem "httpi"
gem "rspec-rails"
gem "guard"
gem "guard-rspec"
gem "rb-fsevent"
gem "appraisal"
gem "tzinfo"
gem "pry"
gem "simplecov"
gem "simplecov-summary"
gem "rails", "4.1.0"

gemspec :path => "../"
19 changes: 19 additions & 0 deletions gemfiles/rails_4.2.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "wasabi"
gem "savon", ">= 2.0.0"
gem "httpi"
gem "rspec-rails"
gem "guard"
gem "guard-rspec"
gem "rb-fsevent"
gem "appraisal"
gem "tzinfo"
gem "pry"
gem "simplecov"
gem "simplecov-summary"
gem "rails", "4.2.0"

gemspec :path => "../"
2 changes: 1 addition & 1 deletion lib/wash_out/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module WashOut
VERSION = "0.9.2"
VERSION = "0.10.0"
end
2 changes: 1 addition & 1 deletion spec/lib/wash_out/middleware_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
env = {}
expect {
WashOut::Middleware.raise_or_render_rexml_parse_error err, env
}.to raise_exception
}.to raise_exception(REXML::ParseException)

env['HTTP_SOAPACTION'] = 'pretend_action'
env['rack.errors'] = double 'logger', {:puts => true}
Expand Down

0 comments on commit 6bf7ef3

Please sign in to comment.