Skip to content

Commit 82ad288

Browse files
committed
Add support for Rails 6.0.0 on Travis
1 parent 95f4ead commit 82ad288

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ rails_supported_versions:
2929
- &rails_5_1_jruby RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
3030
- &rails_5_2 RAILS_VERSION=5.2
3131
- &rails_5_2_jruby RAILS_VERSION=5.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
32-
- &rails_6_0 RAILS_VERSION=6.0.0.rc2
33-
- &rails_6_0_jruby RAILS_VERSION=6.0.0.rc2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
32+
- &rails_6_0 RAILS_VERSION=6.0
33+
- &rails_6_0_jruby RAILS_VERSION=6.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
3434
- &rails_master RAILS_VERSION=master
3535
- &rails_master_jruby RAILS_VERSION=master JRUBY_OPTS='--dev -J-Xmx1024M --debug'
3636

Gemfile

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# frozen_string_literal: true
22

33
source 'https://rubygems.org'
4+
5+
git_source(:github) do |repo_name|
6+
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
7+
"https://github.com/#{repo_name}.git"
8+
end
9+
410
#
511
# Add a Gemfile.local to locally bundle gems outside of version control
612
local_gemfile = File.join(File.expand_path('..', __FILE__), 'Gemfile.local')

test/adapter/json/transform_test.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ def test_transform_serialization_ctx_overrides_global_config
5656

5757
def test_transform_undefined
5858
mock_request(:blam)
59-
result = nil
6059
assert_raises NoMethodError do
61-
result = @adapter.serializable_hash
60+
@adapter.serializable_hash
6261
end
6362
end
6463

test/support/serialization_testing.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ def with_namespace_separator(separator)
2020
end
2121

2222
def with_prepended_lookup(lookup_proc)
23-
original_lookup = ActiveModelSerializers.config.serializer_lookup_cahin
23+
original_lookup = ActiveModelSerializers.config.serializer_lookup_chain
2424
ActiveModelSerializers.config.serializer_lookup_chain.unshift lookup_proc
2525
yield
2626
ensure
27-
ActiveModelSerializers.config.serializer_lookup_cahin = original_lookup
27+
ActiveModelSerializers.config.serializer_lookup_chain = original_lookup
2828
end
2929

3030
# Aliased as :with_configured_adapter to clarify that

0 commit comments

Comments
 (0)