aboutsummaryrefslogtreecommitdiffstats
path: root/spec/models/user_spec.rb
diff options
context:
space:
mode:
authorfrancis <francis>2009-09-15 17:45:50 +0000
committerfrancis <francis>2009-09-15 17:45:50 +0000
commit3e63196fe2268c1ea4618a261bb18b76a81bacf6 (patch)
tree0603719fe50cb8db2bc38352d41da199ea0b595b /spec/models/user_spec.rb
parent64552606573d812452b77e868137de183f0cf2d6 (diff)
Change censor rules to apply to strings in place, so using less memory on large strings.
Add lots of test code for censor rules.
Diffstat (limited to 'spec/models/user_spec.rb')
-rw-r--r--spec/models/user_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 72e8ceb50..f4df22e9d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -241,7 +241,7 @@ describe User, " when setting a profile photo" do
end
it "should attach it to the user" do
- data = load_image_fixture("parrot.png")
+ data = load_file_fixture("parrot.png")
profile_photo = ProfilePhoto.new(:data => data)
@user.set_profile_photo(profile_photo)
profile_photo.user.should == @user
@@ -250,9 +250,9 @@ describe User, " when setting a profile photo" do
# it "should destroy old photos being replaced" do
# ProfilePhoto.count.should == 0
#
-# data_1 = load_image_fixture("parrot.png")
+# data_1 = load_file_fixture("parrot.png")
# profile_photo_1 = ProfilePhoto.new(:data => data_1)
-# data_2 = load_image_fixture("parrot.jpg")
+# data_2 = load_file_fixture("parrot.jpg")
# profile_photo_2 = ProfilePhoto.new(:data => data_2)
#
# @user.set_profile_photo(profile_photo_1)