Merge branch 'master' of git@github.com:railsrumble/teamwnn

ryanb · Oct 19, 2008 · 4122f47 · 4122f47
2 parents 60ec64b + 66f1317
commit 4122f47
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/models/project.rb b/app/models/project.rb
@@ -15,6 +15,6 @@ def to_s
   end
 
   def self.fetch(user, id_or_token)
-    Project.find_by_token(id_or_token) || user.projects.find(id_or_token)
+    Project.find_by_token(id_or_token) || (user || User.new).projects.find(id_or_token)
   end
 end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
@@ -34,4 +34,10 @@
     project = Factory(:project)
     Project.fetch(nil, project.token).should == project
   end
+
+  it "should not beable to fetch if user is nil with bad token" do
+    lambda {
+      Project.fetch(nil, 'badtoken')
+    }.should raise_error(ActiveRecord::RecordNotFound)
+  end
 end