ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-24 14:56:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #162 from frodsan/fix_edge_tests

Browse Source 
Fix failing tests on Rails master
This commit is contained in:
Rafael Mendonça França 2012-11-25 12:36:33 -08:00
commit 470d65d12f
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.travis.yml
View File

@ -11,22 +11,17 @@ rvm:
- rbx-19mode - rbx-19mode
gemfile: gemfile:
- Gemfile - Gemfile
- gemfiles/Gemfile.edge-rails - Gemfile.edge
matrix: matrix:
exclude: exclude:
# Edge Rails is only compatible with 1.9.3 # Edge Rails is only compatible with 1.9.3
- gemfile: gemfiles/Gemfile.edge-rails - gemfile: Gemfile.edge
rvm: 1.8.7 rvm: 1.8.7
- gemfile: gemfiles/Gemfile.edge-rails - gemfile: Gemfile.edge
rvm: 1.9.2 rvm: 1.9.2
- gemfile: gemfiles/Gemfile.edge-rails - gemfile: Gemfile.edge
rvm: ree rvm: ree
- gemfile: gemfiles/Gemfile.edge-rails - gemfile: Gemfile.edge
rvm: jruby rvm: jruby
- gemfile: gemfiles/Gemfile.edge-rails - gemfile: Gemfile.edge
rvm: rbx-18mode rvm: rbx-18mode
allow_failures:
- gemfile: gemfiles/Gemfile.edge-rails
rvm: 1.9.3
- gemfile: gemfiles/Gemfile.edge-rails
rvm: rbx-19mode

2
gemfiles/Gemfile.edge-rails → Gemfile.edge
View File

@ -1,6 +1,6 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gemspec :path => '..' gemspec
gem 'rails', github: 'rails/rails' gem 'rails', github: 'rails/rails'

4
test/generators_test.rb
View File

@ -1,6 +1,10 @@
require 'test_helper' require 'test_helper'
class Foo < Rails::Application class Foo < Rails::Application
if Rails.version.start_with? '4'
config.eager_load = false
config.secret_key_base = 'abc123'
end
end end
Rails.application.load_generators Rails.application.load_generators