more test coverage

1 files changed, 24 insertions, 15 deletions

diff --git a/spec/active_relation/relations/projection_spec.rb b/spec/active_relation/relations/projection_spec.rb
index e792eec3b8..739a16c8ef 100644
--- a/spec/active_relation/relations/projection_spec.rb
+++ b/spec/active_relation/relations/projection_spec.rb
@@ -3,36 +3,45 @@ require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
 module ActiveRelation
   describe Projection do
     before do
-      @relation1 = Table.new(:foo)
-      @relation2 = Table.new(:bar)
-      @attribute1 = @relation1[:id]
-      @attribute2 = @relation2[:id]
+      @relation = Table.new(:users)
+      @attribute = @relation[:id]
     end
-  
-    it "needs to test that [] is limited" do
-      pending
+    
+    describe '#attributes' do
+      before do
+        @projection = Projection.new(@relation, @attribute)
+      end
+      
+      it "manufactures attributes associated with the projection relation" do
+        @projection.attributes.should == [@attribute].collect { |a| a.bind(@projection) }
+      end
     end
     
     describe '==' do
+      before do
+        @another_relation = Table.new(:photos)
+        @another_attribute = @relation[:name]
+      end
+      
       it "obtains if the relations and attributes are identical" do
-        Projection.new(@relation1, @attribute1, @attribute2).should == Projection.new(@relation1, @attribute1, @attribute2)
-        Projection.new(@relation1, @attribute1).should_not == Projection.new(@relation2, @attribute1)
-        Projection.new(@relation1, @attribute1).should_not == Projection.new(@relation1, @attribute2)
+        Projection.new(@relation, @attribute).should == Projection.new(@relation, @attribute)
+        Projection.new(@relation, @attribute).should_not == Projection.new(@another_relation, @attribute)
+        Projection.new(@relation, @attribute).should_not == Projection.new(@relation, @another_attribute)
       end
     end
   
     describe '#qualify' do
       it "distributes over the relation and attributes" do
-        Projection.new(@relation1, @attribute1).qualify. \
-          should == Projection.new(@relation1.qualify, @attribute1.qualify)
+        Projection.new(@relation, @attribute).qualify. \
+          should == Projection.new(@relation.qualify, @attribute.qualify)
       end
     end
   
     describe '#to_sql' do
       it "manufactures sql with a limited select clause" do
-        Projection.new(@relation1, @attribute1).to_sql.should be_like("""
-          SELECT `foo`.`id`
-          FROM `foo`
+        Projection.new(@relation, @attribute).to_sql.should be_like("""
+          SELECT `users`.`id`
+          FROM `users`
         """)
       end
     end