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

Add support for Rails 6.0.0 on Travis

Browse Source
This commit is contained in:
Wasif Hossain 2019-08-21 22:21:31 +06:00
parent 95f4ead7de
commit 82ad288fc7
No known key found for this signature in database
GPG Key ID: 14C15A54E34D7803
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -29,8 +29,8 @@ rails_supported_versions:
- &rails_5_1_jruby RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug' - &rails_5_1_jruby RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
- &rails_5_2 RAILS_VERSION=5.2 - &rails_5_2 RAILS_VERSION=5.2
- &rails_5_2_jruby RAILS_VERSION=5.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug' - &rails_5_2_jruby RAILS_VERSION=5.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
- &rails_6_0 RAILS_VERSION=6.0.0.rc2 - &rails_6_0 RAILS_VERSION=6.0
- &rails_6_0_jruby RAILS_VERSION=6.0.0.rc2 JRUBY_OPTS='--dev -J-Xmx1024M --debug' - &rails_6_0_jruby RAILS_VERSION=6.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
- &rails_master RAILS_VERSION=master - &rails_master RAILS_VERSION=master
- &rails_master_jruby RAILS_VERSION=master JRUBY_OPTS='--dev -J-Xmx1024M --debug' - &rails_master_jruby RAILS_VERSION=master JRUBY_OPTS='--dev -J-Xmx1024M --debug'

6
Gemfile
View File

@ -1,6 +1,12 @@
# frozen_string_literal: true # frozen_string_literal: true
source 'https://rubygems.org' source 'https://rubygems.org'
git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
"https://github.com/#{repo_name}.git"
end
# #
# Add a Gemfile.local to locally bundle gems outside of version control # Add a Gemfile.local to locally bundle gems outside of version control
local_gemfile = File.join(File.expand_path('..', __FILE__), 'Gemfile.local') local_gemfile = File.join(File.expand_path('..', __FILE__), 'Gemfile.local')

3
test/adapter/json/transform_test.rb
View File

@ -56,9 +56,8 @@ module ActiveModelSerializers
def test_transform_undefined def test_transform_undefined
mock_request(:blam) mock_request(:blam)
result = nil
assert_raises NoMethodError do assert_raises NoMethodError do
result = @adapter.serializable_hash @adapter.serializable_hash
end end
end end

4
test/support/serialization_testing.rb
View File

@ -20,11 +20,11 @@ module SerializationTesting
end end
def with_prepended_lookup(lookup_proc) def with_prepended_lookup(lookup_proc)
original_lookup = ActiveModelSerializers.config.serializer_lookup_cahin original_lookup = ActiveModelSerializers.config.serializer_lookup_chain
ActiveModelSerializers.config.serializer_lookup_chain.unshift lookup_proc ActiveModelSerializers.config.serializer_lookup_chain.unshift lookup_proc
yield yield
ensure ensure
ActiveModelSerializers.config.serializer_lookup_cahin = original_lookup ActiveModelSerializers.config.serializer_lookup_chain = original_lookup
end end
# Aliased as :with_configured_adapter to clarify that # Aliased as :with_configured_adapter to clarify that