Skip to content

Fix Appraisals and test against the intended version of Rails #270

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

Merged
merged 3 commits into from
May 18, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,27 +1,20 @@
appraise "rails-3.1" do
gem 'rails', '~> 3.1'
# Buggy sprockets can break tests under Ruby 2.0. Use a decent version.
# See https://github.com/sstephenson/sprockets/issues/352
gem 'sprockets', '>= 2.2.2'
end

appraise "rails-3.2" do
gem 'rails', '~> 3.2'
gem 'rails', '~> 3.2.21'
end

appraise "rails-4.0" do
gem 'rails', '~> 4.0'
gem 'rails', '~> 4.0.13'
end

appraise "rails-4.0-with-therubyracer" do
gem 'rails', '~> 4.0'
gem 'rails', '~> 4.0.13'
gem 'therubyracer', '0.12.0', :platform => :mri
end

appraise "rails-4.1" do
gem 'rails', '~> 4.1'
gem 'rails', '~> 4.1.10'
end

appraise "rails-4.2" do
gem 'rails', '~> 4.2'
gem 'rails', '~> 4.2.1'
end
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# react-rails


`react-rails` makes it easy to use [React](http://facebook.github.io/react/) and [JSX](http://facebook.github.io/react/docs/jsx-in-depth.html) in your Ruby on Rails (3.1+) application. `react-rails` can:
`react-rails` makes it easy to use [React](http://facebook.github.io/react/) and [JSX](http://facebook.github.io/react/docs/jsx-in-depth.html) in your Ruby on Rails (3.2+) application. `react-rails` can:

- Provide [various `react` builds](#reactjs-builds) to your asset bundle
- Transform [`.jsx` in the asset pipeline](#jsx)
Expand Down
8 changes: 0 additions & 8 deletions gemfiles/rails_3.1.gemfile

This file was deleted.

2 changes: 1 addition & 1 deletion gemfiles/rails_3.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source "http://rubygems.org"

gem "rails", "~> 3.2"
gem "rails", "~> 3.2.21"

gemspec :path => "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_4.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source "http://rubygems.org"

gem "rails", "~> 4.0"
gem "rails", "~> 4.0.13"

gemspec :path => "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_4.0_with_therubyracer.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "http://rubygems.org"

gem "rails", "~> 4.0"
gem "rails", "~> 4.0.13"
gem "therubyracer", "0.12.0", :platform => :mri

gemspec :path => "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_4.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source "http://rubygems.org"

gem "rails", "~> 4.1"
gem "rails", "~> 4.1.10"

gemspec :path => "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_4.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source "http://rubygems.org"

gem "rails", "~> 4.2"
gem "rails", "~> 4.2.1"

gemspec :path => "../"
2 changes: 1 addition & 1 deletion react-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Gem::Specification.new do |s|
s.add_dependency 'coffee-script-source', '~>1.8'
s.add_dependency 'connection_pool'
s.add_dependency 'execjs'
s.add_dependency 'rails', '>= 3.1'
s.add_dependency 'rails', '>= 3.2'
s.add_dependency 'tilt'

s.files = Dir[
Expand Down
2 changes: 1 addition & 1 deletion test/dummy/config/initializers/secret_token.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
# if you're sharing your code publicly.
Dummy::Application.config.secret_key_base = '43fa5672451bbd0a171668e625edc433eb00eeeb14c2606546e262e499ab853cfb532998d4809abe5019bf13888863e3a2c7d5cf7757de7a2b1fb50826d9874e'

# for rails 3.1 & 3.2
# For Rails 3.2.
Dummy::Application.config.secret_token = Dummy::Application.config.secret_key_base