From 35e56f6fa535288abf1de7fa70c2faed5e2d88ff Mon Sep 17 00:00:00 2001 From: Gaurish Sharma Date: Mon, 13 Jan 2014 16:54:06 +0530 Subject: standardize on jruby_skip & rbx_skip This Adds helpers(jruby_skip & rbx_skip). In Future, Plan is to use these helpers instead of calls directly to RUBY_ENGINE/RbConfig/JRUBY_VERSION --- actionview/test/abstract_unit.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'actionview') diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb index 9928da4774..9eae3a4fbd 100644 --- a/actionview/test/abstract_unit.rb +++ b/actionview/test/abstract_unit.rb @@ -331,3 +331,11 @@ module ActionDispatch end end +# Skips the current run on Rubinius using Minitest::Assertions#skip +def rubinius_skip(message = '') + skip message if RUBY_ENGINE == 'rbx' +end +# Skips the current run on JRuby using Minitest::Assertions#skip +def jruby_skip(message = '') + skip message if defined?(JRUBY_VERSION) +end -- cgit v1.2.3 From fd68adc8a9b5d3c917542d9b0c22359715e04c8a Mon Sep 17 00:00:00 2001 From: Waynn Lue Date: Mon, 13 Jan 2014 14:23:58 -0800 Subject: "serie" => "series" --- actionview/test/template/form_collections_helper_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionview') diff --git a/actionview/test/template/form_collections_helper_test.rb b/actionview/test/template/form_collections_helper_test.rb index 7a62b9d907..18632465db 100644 --- a/actionview/test/template/form_collections_helper_test.rb +++ b/actionview/test/template/form_collections_helper_test.rb @@ -182,7 +182,7 @@ class FormCollectionsHelperTest < ActionView::TestCase end # COLLECTION CHECK BOXES - test 'collection check boxes accepts a collection and generate a serie of checkboxes for value method' do + test 'collection check boxes accepts a collection and generate a series of checkboxes for value method' do collection = [Category.new(1, 'Category 1'), Category.new(2, 'Category 2')] with_collection_check_boxes :user, :category_ids, collection, :id, :name @@ -204,7 +204,7 @@ class FormCollectionsHelperTest < ActionView::TestCase assert_select "input[type=hidden][name='user[other_category_ids][]'][value=]", :count => 1 end - test 'collection check boxes accepts a collection and generate a serie of checkboxes with labels for label method' do + test 'collection check boxes accepts a collection and generate a series of checkboxes with labels for label method' do collection = [Category.new(1, 'Category 1'), Category.new(2, 'Category 2')] with_collection_check_boxes :user, :category_ids, collection, :id, :name -- cgit v1.2.3