From 30463f88fa964563d891ca19c4e6f2fe37ae91b9 Mon Sep 17 00:00:00 2001 From: Eric Guo Date: Wed, 19 Aug 2015 13:30:56 +0800 Subject: [PATCH] Make testing suite running and pass in Windows thanks @bf4 give many help and suggestion, original PR https://github.com/rails-api/active_model_serializers/pull/1014 --- Gemfile | 3 +++ test/generators/serializer_generator_test.rb | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index baf12948..bdfff856 100644 --- a/Gemfile +++ b/Gemfile @@ -15,3 +15,6 @@ if version == "master" else gem "rails", "~> #{version}.0" end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/test/generators/serializer_generator_test.rb b/test/generators/serializer_generator_test.rb index 815468b7..e5c87d40 100644 --- a/test/generators/serializer_generator_test.rb +++ b/test/generators/serializer_generator_test.rb @@ -46,7 +46,11 @@ class SerializerGeneratorTest < Rails::Generators::TestCase def test_with_no_attributes_does_not_add_extra_space run_generator ["account"] assert_file "app/serializers/account_serializer.rb" do |content| - assert_no_match /\n\nend/, content + if RUBY_PLATFORM =~ /mingw/ + assert_no_match /\r\n\r\nend/, content + else + assert_no_match /\n\nend/, content + end end end end