From 823e4e91158a7e50a56fb92519fc50917b3b33fd Mon Sep 17 00:00:00 2001 From: Robin Dupret Date: Fri, 27 Feb 2015 14:29:54 +0100 Subject: Add the platform-specific skip helpers to ActiveModel --- activemodel/test/cases/helper.rb | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'activemodel') diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb index 4ce6103593..3276f69f09 100644 --- a/activemodel/test/cases/helper.rb +++ b/activemodel/test/cases/helper.rb @@ -14,6 +14,15 @@ require 'active_support/testing/autorun' require 'mocha/setup' # FIXME: stop using mocha +# 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 + # FIXME: we have tests that depend on run order, we should fix that and # remove this method call. require 'active_support/test_case' -- cgit v1.2.3 From 562b0b23684333be8766dc73c419f7b753933626 Mon Sep 17 00:00:00 2001 From: Robin Dupret Date: Mon, 2 Mar 2015 17:14:45 +0100 Subject: Skip the failing tests on Rubinius for now --- activemodel/test/cases/attribute_assignment_test.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'activemodel') diff --git a/activemodel/test/cases/attribute_assignment_test.rb b/activemodel/test/cases/attribute_assignment_test.rb index 402caf21f7..3831c9c500 100644 --- a/activemodel/test/cases/attribute_assignment_test.rb +++ b/activemodel/test/cases/attribute_assignment_test.rb @@ -58,6 +58,8 @@ class AttributeAssignmentTest < ActiveModel::TestCase end test "assign private attribute" do + rubinius_skip "https://github.com/rubinius/rubinius/issues/3328" + model = Model.new assert_raises(ActiveModel::AttributeAssignment::UnknownAttributeError) do model.assign_attributes(metadata: { a: 1 }) -- cgit v1.2.3