Skip to content

Commit 753cbbb

Browse files
committed
Improve appraisal setup
Test against: * Rails 4.2 legacy setup * Rails 5.1, Active Admin 1.x * Rails 5.x, Active Admin 1.x
1 parent bd067da commit 753cbbb

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cache:
1010

1111
gemfile:
1212
- gemfiles/rails_4.2_active_admin_1.0.0.pre4.gemfile
13-
- gemfiles/rails_5.1_active_admin_1.0.gemfile
14-
- gemfiles/rails_5.1_active_admin_1.1.gemfile
13+
- gemfiles/rails_5.1_active_admin_1.x.gemfile
14+
- gemfiles/rails_5.x_active_admin_1.x.gemfile
1515

1616
script: bundle exec rspec

Appraisals

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ appraise 'rails-4.2-active-admin-1.0.0.pre4' do
44
gem 'jquery-ui-rails', '~> 5.0'
55
end
66

7-
appraise 'rails-5.1-active-admin-1.0' do
8-
gem 'rails', '~> 5.1'
7+
appraise 'rails-5.1-active-admin-1.x' do
8+
gem 'rails', '~> 5.1.0'
99
gem 'activeadmin', '~> 1.0'
1010
end
1111

12-
appraise 'rails-5.1-active-admin-1.1' do
13-
gem 'rails', '~> 5.1'
14-
gem 'activeadmin', '~> 1.1'
12+
appraise 'rails-5.x-active-admin-1.x' do
13+
gem 'rails', '~> 5.2'
14+
gem 'activeadmin', '~> 1.0'
1515
end

gemfiles/rails_5.1_active_admin_1.1.gemfile renamed to gemfiles/rails_5.1_active_admin_1.x.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "sass-rails"
6-
gem "rails", "~> 5.1"
7-
gem "activeadmin", "~> 1.1"
6+
gem "rails", "~> 5.1.0"
7+
gem "activeadmin", "~> 1.0"
88

99
gemspec path: "../"

gemfiles/rails_5.1_active_admin_1.0.gemfile renamed to gemfiles/rails_5.x_active_admin_1.x.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "sass-rails"
6-
gem "rails", "~> 5.1"
6+
gem "rails", "~> 5.2"
77
gem "activeadmin", "~> 1.0"
88

99
gemspec path: "../"

0 commit comments

Comments
 (0)