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

Stick to bundle < 2

Browse Source
This commit is contained in:
Anton K 2019-03-11 15:08:37 +02:00
parent 1ebdda331a
commit 4a4a0f263e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appveyor.yml
View File

@ -4,6 +4,7 @@ skip_tags: true
environment: environment:
JRUBY_OPTS: "--dev -J-Xmx1024M --debug" JRUBY_OPTS: "--dev -J-Xmx1024M --debug"
RAILS_VERSION: 5.2
matrix: matrix:
- ruby_version: "Ruby23" - ruby_version: "Ruby23"
- ruby_version: "Ruby23-x64" - ruby_version: "Ruby23-x64"
@ -13,6 +14,9 @@ cache:
install: install:
- SET PATH=C:\%ruby_version%\bin;%PATH% - SET PATH=C:\%ruby_version%\bin;%PATH%
- gem uninstall bundler -a -x -I
- gem update --system 2.7.9
- # gem install bundler -v '1.17.3'
- bundle env - bundle env
- bundle check || bundle install --path=vendor/bundle --retry=3 --jobs=3 - bundle check || bundle install --path=vendor/bundle --retry=3 --jobs=3
- bundle clean --force - bundle clean --force

4
test/cache_test.rb
View File

@ -164,7 +164,7 @@ module ActiveModelSerializers
assert_equal 'Foo', author_json[:name] assert_equal 'Foo', author_json[:name]
author.update_attributes(name: 'Bar') author.update(name: 'Bar')
author_json = AuthorSerializerWithCache.new(author).as_json author_json = AuthorSerializerWithCache.new(author).as_json
expected = 'Bar' expected = 'Bar'
@ -202,10 +202,12 @@ module ActiveModelSerializers
end end
bar = 'Bar' bar = 'Bar'
Timecop.travel(10.seconds.from_now) do
author.update!(name: bar) author.update!(name: bar)
collection_json = render_object_with_cache(author_collection, each_serializer: AuthorSerializerWithCache) collection_json = render_object_with_cache(author_collection, each_serializer: AuthorSerializerWithCache)
assert_equal [{ name: bar }, { name: bar }, { name: foo2 }], collection_json assert_equal [{ name: bar }, { name: bar }, { name: foo2 }], collection_json
end
ensure ensure
ARModels::Author.cache_versioning = original_cache_versioning unless original_cache_versioning == :none ARModels::Author.cache_versioning = original_cache_versioning unless original_cache_versioning == :none
end end