File tree 4 files changed +11
-6
lines changed
4 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -29,8 +29,8 @@ rails_supported_versions:
29
29
- &rails_5_1_jruby RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
30
30
- &rails_5_2 RAILS_VERSION=5.2
31
31
- &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'
34
34
- &rails_master RAILS_VERSION=master
35
35
- &rails_master_jruby RAILS_VERSION=master JRUBY_OPTS='--dev -J-Xmx1024M --debug'
36
36
Original file line number Diff line number Diff line change 1
1
# frozen_string_literal: true
2
2
3
3
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
+
4
10
#
5
11
# Add a Gemfile.local to locally bundle gems outside of version control
6
12
local_gemfile = File . join ( File . expand_path ( '..' , __FILE__ ) , 'Gemfile.local' )
Original file line number Diff line number Diff line change @@ -56,9 +56,8 @@ def test_transform_serialization_ctx_overrides_global_config
56
56
57
57
def test_transform_undefined
58
58
mock_request ( :blam )
59
- result = nil
60
59
assert_raises NoMethodError do
61
- result = @adapter . serializable_hash
60
+ @adapter . serializable_hash
62
61
end
63
62
end
64
63
Original file line number Diff line number Diff line change @@ -20,11 +20,11 @@ def with_namespace_separator(separator)
20
20
end
21
21
22
22
def with_prepended_lookup ( lookup_proc )
23
- original_lookup = ActiveModelSerializers . config . serializer_lookup_cahin
23
+ original_lookup = ActiveModelSerializers . config . serializer_lookup_chain
24
24
ActiveModelSerializers . config . serializer_lookup_chain . unshift lookup_proc
25
25
yield
26
26
ensure
27
- ActiveModelSerializers . config . serializer_lookup_cahin = original_lookup
27
+ ActiveModelSerializers . config . serializer_lookup_chain = original_lookup
28
28
end
29
29
30
30
# Aliased as :with_configured_adapter to clarify that
You can’t perform that action at this time.
0 commit comments