Skip to content
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.

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

Improve testing of different Ruby, Rails versions #257

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 9 additions & 7 deletions .gitignore
@@ -1,11 +1,13 @@
test/*/log/*.log
doc
coverage
*.rbc
*.swo
*.swp
.bundle
.svn/
Gemfile.lock
coverage
doc
gemfiles/
pkg
*.swp
*.swo
tags
test/*/log/*.log
tmp
.bundle
*.rbc
18 changes: 2 additions & 16 deletions .travis.yml
@@ -1,28 +1,14 @@
script: "bundle exec rake spec cucumber"

rvm:
- 1.8.7
- 1.9.2
- 1.9.3
- 2.0.0
- rbx-18mode
- jruby

gemfile:
- gemfiles/3.0.gemfile
- gemfiles/3.1.gemfile
- gemfiles/3.2.gemfile

matrix:
allow_failures:
- rvm: 1.8.7
- rvm: rbx-18mode
- rvm: jruby
exclude:
- rvm: 2.0.0
- rvm: rbx-18mode
gemfile: gemfiles/3.0.gemfile
- rvm: rbx-18mode
gemfile: gemfiles/3.1.gemfile
- rvm: jruby
gemfile: gemfiles/3.0.gemfile
- rvm: jruby
gemfile: gemfiles/3.1.gemfile
16 changes: 6 additions & 10 deletions Appraisals
@@ -1,15 +1,11 @@
appraise '3.0' do
gem 'rails', '~> 3.0.17'
if RUBY_VERSION >= '2.0'
name, version = 'ruby.2.support', '>= 3.2.13'
else
name, version = 'rails.3.support', '~> 3.0'
end

appraise '3.1' do
gem 'rails', '~> 3.1.8'
gem 'jquery-rails'
gem 'sass-rails'
end

appraise '3.2' do
gem 'rails', '~> 3.2.8'
appraise name do
gem 'jquery-rails'
gem 'rails', version
gem 'sass-rails'
end
21 changes: 13 additions & 8 deletions Gemfile.lock
Expand Up @@ -97,6 +97,10 @@ GEM
rake (10.0.3)
rdoc (3.12.2)
json (~> 1.4)
rspec (2.13.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
diff-lcs (>= 1.1.3, < 2.0)
Expand All @@ -115,10 +119,10 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
strong_parameters (0.1.5)
actionpack (~> 3.1)
activemodel (~> 3.1)
railties (~> 3.1)
strong_parameters (0.2.0)
actionpack (~> 3.0)
activemodel (~> 3.0)
railties (~> 3.0)
thor (0.17.0)
tilt (1.3.6)
treetop (1.4.12)
Expand All @@ -132,17 +136,18 @@ PLATFORMS
DEPENDENCIES
activerecord-jdbc-adapter
activerecord-jdbcsqlite3-adapter
appraisal (~> 0.4)
aruba
appraisal (~> 0.5)
aruba (~> 0.5)
bundler (~> 1.1)
cucumber (~> 1.1)
jdbc-sqlite3
jruby-openssl
rails (~> 3.0)
rake (>= 0.9.2)
rake (~> 10.0)
rspec (~> 2.13)
rspec-rails (~> 2.13)
shoulda-context (~> 1.0.0)
shoulda-matchers!
sqlite3
strong_parameters
strong_parameters (~> 0.2)
therubyrhino
14 changes: 5 additions & 9 deletions Rakefile
Expand Up @@ -15,14 +15,10 @@ Cucumber::Rake::Task.new do |t|
t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
end

task :default do |t|
if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
exec 'rake spec cucumber'
else
Rake::Task['appraise'].execute
end
end
desc 'Default'
task :default => [:all]

task :appraise => ['appraisal:install'] do |t|
exec 'rake appraisal'
desc 'Test the engine under all supported Rails versions'
task :all => ['appraisal:install'] do |t|
exec 'rake appraisal spec cucumber'
end
14 changes: 0 additions & 14 deletions gemfiles/3.0.gemfile

This file was deleted.

139 changes: 0 additions & 139 deletions gemfiles/3.0.gemfile.lock

This file was deleted.

16 changes: 0 additions & 16 deletions gemfiles/3.1.gemfile

This file was deleted.