Skip to content

Commit 5512154

Browse files
authored
Merge pull request #278 from koenpunt/multi-rails
Testing multiple versions of Rails
2 parents 1f93ff5 + 9fba17d commit 5512154

22 files changed

+340
-267
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ test/dummy/tmp/
77
*.gem
88
.rbenv-gemsets
99
*.swp
10+
gemfiles/*.lock
11+
Gemfile.lock

.travis.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@ rvm:
55
- 2.1
66
- 2.2
77
- 2.3.0
8+
gemfile:
9+
- gemfiles/4.0.gemfile
10+
- gemfiles/4.1.gemfile
11+
- gemfiles/4.2.gemfile
12+
- gemfiles/5.0.gemfile
13+
matrix:
14+
exclude:
15+
- rvm: 1.9
16+
gemfile: gemfiles/5.0.gemfile
17+
- rvm: 2.0
18+
gemfile: gemfiles/5.0.gemfile
19+
- rvm: 2.1
20+
gemfile: gemfiles/5.0.gemfile
821
before_install:
922
- gem install bundler --conservative --version '~> 1.10'
1023
before_script:

Appraisals

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
appraise "4.0" do
2+
gem "rails", "~> 4.0.0"
3+
gemspec
4+
end
5+
6+
appraise "4.1" do
7+
gem "rails", "~> 4.1.0"
8+
gemspec
9+
end
10+
11+
appraise "4.2" do
12+
gem "rails", "~> 4.2"
13+
gemspec
14+
end
15+
16+
appraise "5.0" do
17+
gem "rails", "~> 5.0"
18+
gemspec
19+
end

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Bugfixes:
44
- Your contribution here!
55

66
Features:
7+
- The project is now tested against and compatible with the following Rails versions 4.0, 4.1, 4.2 and 5.0 (#278).
78
- Your contribution here!
89

910
## [2.5.2][] (2016-10-08)

Gemfile.lock

Lines changed: 0 additions & 92 deletions
This file was deleted.

README.md

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -586,24 +586,31 @@ We love pull requests! Here's a quick guide for contributing:
586586

587587
1. Fork the repo.
588588

589-
2. Run the existing test suite:
589+
2. Install the required dependencies.
590+
591+
```
592+
bundle install
593+
bundle exec appraisal install
594+
```
595+
596+
3. Run the existing test suite:
590597
591598
```
592599
$ bundle exec rake -f test/dummy/Rakefile db:create db:migrate RAILS_ENV=test
593-
$ bundle exec rake
600+
$ bundle exec appraisal rake test
594601
```
595602
596-
3. Add tests for your change.
603+
4. Add tests for your change.
597604
598-
4. Add your changes and make your test(s) pass. Following the conventions you
605+
5. Add your changes and make your test(s) pass. Following the conventions you
599606
see used in the source will increase the chance that your pull request is
600607
accepted right away.
601608
602-
5. Update the README if necessary.
609+
6. Update the README if necessary.
603610
604-
6. Add a line to the CHANGELOG for your bug fix or feature.
611+
7. Add a line to the CHANGELOG for your bug fix or feature.
605612
606-
7. Push to your fork and submit a pull request.
613+
8. Push to your fork and submit a pull request.
607614
608615
## Contributors
609616

bootstrap_form.gemspec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@ Gem::Specification.new do |s|
1717
s.test_files = Dir["test/**/*"]
1818

1919
s.add_development_dependency "mime-types", "~> 2.6.2"
20-
s.add_development_dependency "rails", "~> 4.0"
20+
s.add_development_dependency "rails", ">= 4.0"
2121
s.add_development_dependency "sqlite3"
2222
s.add_development_dependency "timecop", "~> 0.7.1"
2323
s.add_development_dependency "mocha"
24+
s.add_development_dependency "appraisal"
25+
s.add_development_dependency "equivalent-xml"
26+
s.add_development_dependency "nokogiri"
27+
s.add_development_dependency "diffy"
2428
end

gemfiles/4.0.gemfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This file was generated by Appraisal
2+
3+
source "http://rubygems.org"
4+
5+
gem "jquery-rails"
6+
gem "rails", "~> 4.0.0"
7+
8+
gemspec :path => "../"

gemfiles/4.1.gemfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This file was generated by Appraisal
2+
3+
source "http://rubygems.org"
4+
5+
gem "jquery-rails"
6+
gem "rails", "~> 4.1.0"
7+
8+
gemspec :path => "../"

gemfiles/4.2.gemfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This file was generated by Appraisal
2+
3+
source "http://rubygems.org"
4+
5+
gem "jquery-rails"
6+
gem "rails", "~> 4.2"
7+
8+
gemspec :path => "../"

0 commit comments

Comments
 (0)