Return nil when looking up an attribute by name that does not exist instead of returning a fictitious attribute.

1 files changed, 9 insertions, 2 deletions

diff --git a/spec/attributes/header_spec.rb b/spec/attributes/header_spec.rb
index 5811041734..8fb4007003 100644
--- a/spec/attributes/header_spec.rb
+++ b/spec/attributes/header_spec.rb
@@ -18,8 +18,15 @@ module Arel
       end
     end
 
-    it "finds attributes by name" do
-      @relation.attributes[:name].should == Attributes::String.new(@relation, :name)
+    describe "attribute lookup" do
+      it "finds attributes by name" do
+        @relation.attributes[:name].should == Attributes::String.new(@relation, :name)
+      end
+
+      it "returns nil if no attribute is found" do
+        @relation.attributes[:does_not_exist].should be_nil
+        @relation[:does_not_exist].should be_nil
+      end
     end
 
     describe "#union" do