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
5454 gem 'sqlite3' , platform : ( @windows_platforms + [ :ruby ] )
5555 platforms :jruby do
5656 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 '
5858 else
5959 gem 'activerecord-jdbcsqlite3-adapter'
6060 end
Original file line number Diff line number Diff line change @@ -13,11 +13,9 @@ cache:
1313
1414install :
1515 - 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
1916 - 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
2119
2220before_test :
2321 - ruby -v
Original file line number Diff line number Diff line change @@ -183,10 +183,11 @@ def test_not_showing_pagination_links
183183 def test_raises_descriptive_error_when_serialization_context_unset
184184 render_options = { adapter : :json_api }
185185 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
187189 adapter . as_json
188190 end
189- exception_class = ActiveModelSerializers ::Adapter ::JsonApi ::PaginationLinks ::MissingSerializationContextError
190191 assert_equal exception_class , exception . class
191192 assert_match ( /CollectionSerializer#paginated\? / , exception . message )
192193 end
You can’t perform that action at this time.
0 commit comments