File tree Expand file tree Collapse file tree 3 files changed +6
-7
lines changed Expand file tree Collapse file tree 3 files changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ group :test do
54
54
gem 'sqlite3' , platform : ( @windows_platforms + [ :ruby ] )
55
55
platforms :jruby do
56
56
if version == 'master' || version >= '5'
57
- gem 'activerecord-jdbcsqlite3-adapter' , github : 'jruby/activerecord-jdbc-adapter' , branch : 'rails-5 '
57
+ gem 'activerecord-jdbcsqlite3-adapter' , '>= 1.3.0' # github: 'jruby/activerecord-jdbc-adapter', branch: 'master '
58
58
else
59
59
gem 'activerecord-jdbcsqlite3-adapter'
60
60
end
Original file line number Diff line number Diff line change @@ -13,11 +13,9 @@ cache:
13
13
14
14
install :
15
15
- SET PATH=C:\%ruby_version%\bin;%PATH%
16
- - gem update --system
17
- - gem uninstall bundler -a -x
18
- - gem install bundler -v 1.13.7
19
16
- bundle env
20
- - bundle install --path=vendor/bundle --retry=3 --jobs=3
17
+ - bundle check || bundle install --path=vendor/bundle --retry=3 --jobs=3
18
+ - bundle clean --force
21
19
22
20
before_test :
23
21
- ruby -v
Original file line number Diff line number Diff line change @@ -183,10 +183,11 @@ def test_not_showing_pagination_links
183
183
def test_raises_descriptive_error_when_serialization_context_unset
184
184
render_options = { adapter : :json_api }
185
185
adapter = serializable ( using_kaminari , render_options )
186
- exception = assert_raises do
186
+ exception_class = ActiveModelSerializers ::Adapter ::JsonApi ::PaginationLinks ::MissingSerializationContextError
187
+
188
+ exception = assert_raises ( exception_class ) do
187
189
adapter . as_json
188
190
end
189
- exception_class = ActiveModelSerializers ::Adapter ::JsonApi ::PaginationLinks ::MissingSerializationContextError
190
191
assert_equal exception_class , exception . class
191
192
assert_match ( /CollectionSerializer#paginated\? / , exception . message )
192
193
end
You can’t perform that action at this time.
0 commit comments