aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-08-12 14:24:21 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-08-12 14:24:21 -0700
commit1036749e394e5f7f039e75cdec7675f9ca5047b0 (patch)
tree17587fb28a10d798bed16522d335afa434489fbf
parent25083947e3f3ca8cf19380366bd3e186261b17f3 (diff)
downloadrails-1036749e394e5f7f039e75cdec7675f9ca5047b0.tar.gz
rails-1036749e394e5f7f039e75cdec7675f9ca5047b0.tar.bz2
rails-1036749e394e5f7f039e75cdec7675f9ca5047b0.zip
starting a spec for the table
-rw-r--r--lib/arel/table.rb2
-rw-r--r--spec/arel/table_spec.rb37
2 files changed, 20 insertions, 19 deletions
diff --git a/lib/arel/table.rb b/lib/arel/table.rb
index e4056074ae..a4ae9bd18d 100644
--- a/lib/arel/table.rb
+++ b/lib/arel/table.rb
@@ -3,7 +3,7 @@ module Arel
@engine = nil
class << self; attr_accessor :engine; end
- def initialize table_name, engine
+ def initialize table_name, engine = Table.engine
@table_name = table_name
@engine = engine
end
diff --git a/spec/arel/table_spec.rb b/spec/arel/table_spec.rb
index d1c7cc46ba..20c962c26a 100644
--- a/spec/arel/table_spec.rb
+++ b/spec/arel/table_spec.rb
@@ -9,30 +9,31 @@ module Arel
describe '[]' do
describe 'when given a', Symbol do
it "manufactures an attribute if the symbol names an attribute within the relation" do
- check @relation[:id].should == Attributes::Integer.new(@relation, :id)
+ column = @relation[:id]
+ #.should == Attributes::Integer.new(@relation, :id)
end
end
- describe 'when given an', Attribute do
- it "returns the attribute if the attribute is within the relation" do
- @relation[@relation[:id]].should == @relation[:id]
- end
+ #describe 'when given an', Attribute do
+ # it "returns the attribute if the attribute is within the relation" do
+ # @relation[@relation[:id]].should == @relation[:id]
+ # end
- it "returns nil if the attribtue is not within the relation" do
- another_relation = Table.new(:photos)
- @relation[another_relation[:id]].should be_nil
- end
- end
+ # it "returns nil if the attribtue is not within the relation" do
+ # another_relation = Table.new(:photos)
+ # @relation[another_relation[:id]].should be_nil
+ # end
+ #end
- describe 'when given an', Expression do
- before do
- @expression = @relation[:id].count
- end
+ #describe 'when given an', Expression do
+ # before do
+ # @expression = @relation[:id].count
+ # end
- it "returns the Expression if the Expression is within the relation" do
- @relation[@expression].should be_nil
- end
- end
+ # it "returns the Expression if the Expression is within the relation" do
+ # @relation[@expression].should be_nil
+ # end
+ #end
end
end
end