Permalink
Browse files

Revert "Marked a spec as pending under rbx"

This reverts commit d6940fa.

The bug has been fixed in Rubinius:

evanphx/rubinius@f92ec4e
  • Loading branch information...
1 parent d6940fa commit 0383791e34ecce982abfecb5a3d1271b9c2d2e2e @dbussink dbussink committed Feb 26, 2011
Showing with 18 additions and 22 deletions.
  1. +18 −20 spec/dm-tags/taggable_spec.rb
  2. +0 −2 spec/spec_helper.rb
@@ -33,26 +33,24 @@
it "should set the associated collection of tags to those whose names
are in the tag list upon saving, creating and deleting as necessary" do
- pending_if 'rubinius causes the queries to become mangled', defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx' do
- tag1 = Tag.create(:name => 'tag1')
- tag2 = Tag.create(:name => 'tag2')
- tag3 = Tag.create(:name => 'tag3')
- @taggable = TaggedModel.new
- @taggable.tag_list = 'tag1, tag2, tag3'
- @taggable.save.should be(true)
- @taggable.tags.sort_by{|tag| tag.id}.should == [tag1, tag2, tag3]
- @taggable.tag_list = 'tag1, tag2'
- @taggable.save.should be(true) # Should dirty the model when changed.
- pending do
- @taggable.tags.sort_by{|tag| tag.id}.should == [tag1, tag2]
- end
- @taggable.tag_list = 'tag3, tag4'
- @taggable.save.should be(true)
- @taggable = @taggable.model.get(*@taggable.key)
- pending do
- @taggable.tags.sort_by{|tag| tag.id}.should == [tag3, Tag.first(:name => 'tag4')]
- @taggable.skills.sort_by{|skill| skill.id}.should_not == [tag3, Tag.first(:name => 'tag4')]
- end
+ tag1 = Tag.create(:name => 'tag1')
+ tag2 = Tag.create(:name => 'tag2')
+ tag3 = Tag.create(:name => 'tag3')
+ @taggable = TaggedModel.new
+ @taggable.tag_list = 'tag1, tag2, tag3'
+ @taggable.save.should be(true)
+ @taggable.tags.sort_by{|tag| tag.id}.should == [tag1, tag2, tag3]
+ @taggable.tag_list = 'tag1, tag2'
+ @taggable.save.should be(true) # Should dirty the model when changed.
+ pending do
+ @taggable.tags.sort_by{|tag| tag.id}.should == [tag1, tag2]
+ end
+ @taggable.tag_list = 'tag3, tag4'
+ @taggable.save.should be(true)
+ @taggable = @taggable.model.get(*@taggable.key)
+ pending do
+ @taggable.tags.sort_by{|tag| tag.id}.should == [tag3, Tag.first(:name => 'tag4')]
+ @taggable.skills.sort_by{|skill| skill.id}.should_not == [tag3, Tag.first(:name => 'tag4')]
end
end
View
@@ -1,6 +1,5 @@
require 'dm-core/spec/setup'
require 'dm-core/spec/lib/adapter_helpers'
-require 'dm-core/spec/lib/pending_helpers'
require 'dm-tags'
require 'dm-migrations'
@@ -11,7 +10,6 @@
Spec::Runner.configure do |config|
config.extend(DataMapper::Spec::Adapters::Helpers)
- config.include(DataMapper::Spec::PendingHelpers)
config.before do
Object.send(:remove_const, :TaggedModel) if defined?(TaggedModel)

0 comments on commit 0383791

Please sign in to comment.