aboutsummaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
Diffstat (limited to 'spec')
-rw-r--r--spec/active_relation/unit/relations/relation_spec.rb6
-rw-r--r--spec/active_relation/unit/relations/table_spec.rb5
2 files changed, 8 insertions, 3 deletions
diff --git a/spec/active_relation/unit/relations/relation_spec.rb b/spec/active_relation/unit/relations/relation_spec.rb
index 2e9f7fd3c8..5e434e52a6 100644
--- a/spec/active_relation/unit/relations/relation_spec.rb
+++ b/spec/active_relation/unit/relations/relation_spec.rb
@@ -156,7 +156,11 @@ module ActiveRelation
describe Relation::Enumerable do
it "is enumerable" do
- pending
+ pending "I don't like this mock-based test"
+ data = [1,2,3]
+ mock.instance_of(Session).read(anything) { data }
+ @relation.collect.should == data
+ @relation.first.should == data.first
end
end
end
diff --git a/spec/active_relation/unit/relations/table_spec.rb b/spec/active_relation/unit/relations/table_spec.rb
index 41ed2dc404..e62f84d93a 100644
--- a/spec/active_relation/unit/relations/table_spec.rb
+++ b/spec/active_relation/unit/relations/table_spec.rb
@@ -92,8 +92,9 @@ module ActiveRelation
end
describe '#reset' do
- it "" do
- pending
+ it "reloads columns from the database" do
+ lambda { stub(@relation).columns { [] } }.should_not change { @relation.attributes }
+ lambda { @relation.reset }.should change { @relation.attributes }
end
end
end