aboutsummaryrefslogtreecommitdiff
path: root/ruby/tests
diff options
context:
space:
mode:
authorPaul Yang <TeBoring@users.noreply.github.com>2018-07-02 15:11:36 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2018-07-17 17:34:25 -0700
commit8356d270a54e18c21f4feac6f5e2b6f1061dc8d5 (patch)
tree6224f98ad30e99dc2d896423853892f2142f16ed /ruby/tests
parent7fdebf2c2eda381bc7f4701811aae334b0f742ab (diff)
downloadprotobuf-8356d270a54e18c21f4feac6f5e2b6f1061dc8d5.tar.gz
protobuf-8356d270a54e18c21f4feac6f5e2b6f1061dc8d5.tar.bz2
protobuf-8356d270a54e18c21f4feac6f5e2b6f1061dc8d5.zip
Add continuous test for ruby 2.3, 2.4 and 2.5 (#4829)
* Add continuous test for ruby 2.3, 2.4 and 2.5 * Change ruby 2.5 to 2.5.0 * No need to provide argument to rb_funcall when argc is 0 * Fix tests for ruby 2.5 * Use rescue instead of assert_raise to accept subclass of error
Diffstat (limited to 'ruby/tests')
-rw-r--r--ruby/tests/basic.rb4
-rw-r--r--ruby/tests/repeated_field_test.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/ruby/tests/basic.rb b/ruby/tests/basic.rb
index ad34d53d..d151022e 100644
--- a/ruby/tests/basic.rb
+++ b/ruby/tests/basic.rb
@@ -336,7 +336,9 @@ module BasicTest
# strings are immutable so we can't do this, but serialize should catch it.
m.optional_string = "asdf".encode!('UTF-8')
- assert_raise RuntimeError do
+ # Ruby 2.5 changed to raise FrozenError. However, assert_raise don't
+ # accept subclass. Don't specify type here.
+ assert_raise do
m.optional_string.encode!('ASCII-8BIT')
end
end
diff --git a/ruby/tests/repeated_field_test.rb b/ruby/tests/repeated_field_test.rb
index 61ac4afd..a4f3aab8 100644
--- a/ruby/tests/repeated_field_test.rb
+++ b/ruby/tests/repeated_field_test.rb
@@ -18,7 +18,7 @@ class RepeatedFieldTest < Test::Unit::TestCase
# jRuby additions to the Array class that we can ignore
arr_methods -= [ :indices, :iter_for_each, :iter_for_each_index,
:iter_for_each_with_index, :dimensions, :copy_data, :copy_data_simple,
- :nitems, :iter_for_reverse_each, :indexes]
+ :nitems, :iter_for_reverse_each, :indexes, :append, :prepend]
arr_methods.each do |method_name|
assert m.repeated_string.respond_to?(method_name) == true, "does not respond to #{method_name}"
end