Permalink
Browse files

Target Rails 4.1 on master, keep 4.0 and 3.2 gemfiles to test on travis

  • Loading branch information...
1 parent 6922611 commit 0c4e6040f22749fc562c567c521879a41ab829c9 @carlosantoniodasilva carlosantoniodasilva committed May 5, 2014
Showing with 45 additions and 29 deletions.
  1. +1 −0 .travis.yml
  2. +4 −0 CHANGELOG.md
  3. +2 −2 Gemfile
  4. +24 −20 Gemfile.lock
  5. +2 −1 gemfiles/Gemfile-rails.3.2.x
  6. +7 −0 gemfiles/Gemfile-rails.4.0.x
  7. +3 −2 test/flash_responder_test.rb
  8. +2 −4 test/test_helper.rb
View
@@ -5,6 +5,7 @@ rvm:
- 2.1.1
gemfile:
- gemfiles/Gemfile-rails.3.2.x
+ - gemfiles/Gemfile-rails.4.0.x
- Gemfile
notifications:
email: false
View
@@ -1,3 +1,7 @@
+## Unreleased
+
+* Support Rails 4.1.
+
## 1.0.0
* Improve controller generator to work closer to the Rails 4 one, and make it
View
@@ -2,6 +2,6 @@ source 'https://rubygems.org'
gemspec
-gem 'railties', '~> 4.0.0'
-gem 'activemodel', '~> 4.0.0'
+gem 'railties', '~> 4.1.0'
+gem 'activemodel', '~> 4.1.0'
gem 'mocha'
View
@@ -7,47 +7,51 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- actionpack (4.0.4)
- activesupport (= 4.0.4)
- builder (~> 3.1.0)
- erubis (~> 2.7.0)
+ actionpack (4.1.0)
+ actionview (= 4.1.0)
+ activesupport (= 4.1.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
- activemodel (4.0.4)
- activesupport (= 4.0.4)
- builder (~> 3.1.0)
- activesupport (4.0.4)
+ actionview (4.1.0)
+ activesupport (= 4.1.0)
+ builder (~> 3.1)
+ erubis (~> 2.7.0)
+ activemodel (4.1.0)
+ activesupport (= 4.1.0)
+ builder (~> 3.1)
+ activesupport (4.1.0)
i18n (~> 0.6, >= 0.6.9)
- minitest (~> 4.2)
- multi_json (~> 1.3)
+ json (~> 1.7, >= 1.7.7)
+ minitest (~> 5.1)
thread_safe (~> 0.1)
- tzinfo (~> 0.3.37)
- builder (3.1.4)
+ tzinfo (~> 1.1)
+ builder (3.2.2)
erubis (2.7.0)
i18n (0.6.9)
+ json (1.8.1)
metaclass (0.0.4)
- minitest (4.7.5)
+ minitest (5.3.3)
mocha (1.0.0)
metaclass (~> 0.0.1)
- multi_json (1.9.3)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
- railties (4.0.4)
- actionpack (= 4.0.4)
- activesupport (= 4.0.4)
+ railties (4.1.0)
+ actionpack (= 4.1.0)
+ activesupport (= 4.1.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.1)
thor (0.19.1)
thread_safe (0.3.3)
- tzinfo (0.3.39)
+ tzinfo (1.1.0)
+ thread_safe (~> 0.1)
PLATFORMS
ruby
DEPENDENCIES
- activemodel (~> 4.0.0)
+ activemodel (~> 4.1.0)
mocha
- railties (~> 4.0.0)
+ railties (~> 4.1.0)
responders!
@@ -1,6 +1,7 @@
source 'https://rubygems.org'
-gem 'responders', :path => '..'
+gemspec path: '..'
+
# Fixed 3.2.3 because 3.2.2 is broken.
gem 'railties', '~> 3.2.3'
gem 'mocha'
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'railties', '~> 4.0.0'
+gem 'activemodel', '~> 4.0.0'
+gem 'mocha'
@@ -191,9 +191,10 @@ def test_never_set_flash_now
assert_not_flash_now :failure
end
- # If we have flash.now, it's always marked as used.
+ # If we have flash.now, it's always marked as used. Rails 4.1 has string keys,
+ # whereas 3.2 and 4.0 has symbols, so we need to test both.
def assert_flash_now(k)
- assert flash.used_keys.include?(k.to_sym),
+ assert flash.used_keys.include?(k.to_sym) || flash.used_keys.include?(k.to_s),
"Expected #{k} to be in flash.now, but it's not."
end
View
@@ -1,7 +1,5 @@
-require 'bundler'
-
-Bundler.setup
-require 'test/unit'
+require 'bundler/setup'
+require 'minitest/autorun'
require 'mocha/setup'
# Configure Rails

0 comments on commit 0c4e604

Please sign in to comment.