'
cpp.should be_dirty
diff --git a/spec/components/file_store/local_store_spec.rb b/spec/components/file_store/local_store_spec.rb
index aca9e4b48e9..684a9a273b5 100644
--- a/spec/components/file_store/local_store_spec.rb
+++ b/spec/components/file_store/local_store_spec.rb
@@ -35,25 +35,38 @@ describe LocalStore do
it "returns a relative url" do
store.expects(:copy_file)
- store.store_optimized_image({}, optimized_image).should == "/uploads/default/_optimized/86f/7e4/37faa5a7fce_100x200.png"
+ store.store_optimized_image({}, optimized_image).should == "/uploads/default/_optimized/86f/7e4/37faa5a7fc_100x200.png"
end
end
- describe "remove_file" do
+ describe "remove_upload" do
- it "does not delete any file" do
+ it "does not delete non uploaded" do
File.expects(:delete).never
- store.remove_file("/path/to/file")
+ upload = Upload.new
+ upload.stubs(:url).returns("/path/to/file")
+ store.remove_upload(upload)
end
it "deletes the file locally" do
File.expects(:delete)
- store.remove_file("/uploads/default/42/253dc8edf9d4ada1.png")
+ upload = Upload.new
+ upload.stubs(:url).returns("/uploads/default/42/253dc8edf9d4ada1.png")
+ store.remove_upload(upload)
end
end
+ describe "remove_optimized_image" do
+
+ end
+
+ describe "remove_avatar" do
+
+ end
+
+
describe "has_been_uploaded?" do
it "identifies local or relatives urls" do
diff --git a/spec/components/file_store/s3_store_spec.rb b/spec/components/file_store/s3_store_spec.rb
index 8b38a4d9160..fc43173f5db 100644
--- a/spec/components/file_store/s3_store_spec.rb
+++ b/spec/components/file_store/s3_store_spec.rb
@@ -40,6 +40,7 @@ describe S3Store do
it "returns a relative url" do
upload.stubs(:id).returns(42)
+ upload.stubs(:extension).returns(".png")
store.store_upload(uploaded_file, upload).should == "//s3_upload_bucket.s3.amazonaws.com/42e9d71f5ee7c92d6dc9e92ffdad17b8bd49418f98.png"
end
@@ -54,20 +55,32 @@ describe S3Store do
end
- describe "remove_file" do
+ describe "remove_upload" do
- it "does not delete any file" do
+ it "does not delete non uploaded file" do
store.expects(:remove).never
- store.remove_file("//other_bucket.s3.amazonaws.com/42.png")
+ upload = Upload.new
+ upload.stubs(:url).returns("//other_bucket.s3.amazonaws.com/42.png")
+ store.remove_upload(upload)
end
it "deletes the file on s3" do
store.expects(:remove)
- store.remove_file("//s3_upload_bucket.s3.amazonaws.com/42.png")
+ upload = Upload.new
+ upload.stubs(:url).returns("//s3_upload_bucket.s3.amazonaws.com/42.png")
+ store.remove_upload(upload)
end
end
+ describe "remove_optimized_image" do
+
+ end
+
+ describe "remove_avatar" do
+
+ end
+
describe "has_been_uploaded?" do
it "identifies S3 uploads" do
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index 10440313e1c..41c8ff3a91c 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -628,7 +628,7 @@ describe Guardian do
Guardian.new(nil).can_see_flags?(post).should be_false
end
- it "allow regular uses to see flags" do
+ it "allow regular users to see flags" do
Guardian.new(user).can_see_flags?(post).should be_false
end
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 3ce512cb7eb..6fe8c978e9c 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -14,18 +14,27 @@ test
PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"][sam][/quote]").should =~ /\[sam\]/
end
- it "produces a quote even with new lines in it" do
- PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd\n[/quote]").should match_html ""
- end
+ describe "with avatar" do
- it "should produce a quote" do
- PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd[/quote]").should match_html ""
- end
+ before(:each) do
+ eviltrout = User.new
+ eviltrout.stubs(:avatar_template).returns("http://test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/{size}.png")
+ User.expects(:where).with(username_lower: "eviltrout").returns([eviltrout])
+ end
- it "trims spaces on quote params" do
- PrettyText.cook("[quote=\"EvilTrout, post:555, topic: 666\"]ddd[/quote]").should match_html ""
- end
+ it "produces a quote even with new lines in it" do
+ PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd\n[/quote]").should match_html ""
+ end
+ it "should produce a quote" do
+ PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd[/quote]").should match_html ""
+ end
+
+ it "trims spaces on quote params" do
+ PrettyText.cook("[quote=\"EvilTrout, post:555, topic: 666\"]ddd[/quote]").should match_html ""
+ end
+
+ end
it "should handle 3 mentions in a row" do
PrettyText.cook('@hello @hello @hello').should match_html "
@hello@hello@hello
"
diff --git a/spec/models/optimized_image_spec.rb b/spec/models/optimized_image_spec.rb
index b2d2db798d2..743c3bb0fcf 100644
--- a/spec/models/optimized_image_spec.rb
+++ b/spec/models/optimized_image_spec.rb
@@ -19,7 +19,7 @@ describe OptimizedImage do
oi.extension.should == ".jpg"
oi.width.should == 100
oi.height.should == 200
- oi.url.should == "/uploads/default/_optimized/da3/9a3/ee5e6b4b0d3_100x200.jpg"
+ oi.url.should == "/uploads/default/_optimized/da3/9a3/ee5e6b4b0d_100x200.jpg"
end
end
diff --git a/test/javascripts/components/bbcode_test.js b/test/javascripts/components/bbcode_test.js
index 5941ed812d3..a80a2bfec20 100644
--- a/test/javascripts/components/bbcode_test.js
+++ b/test/javascripts/components/bbcode_test.js
@@ -2,7 +2,6 @@
module("Discourse.BBCode");
var format = function(input, expected, text) {
-
var cooked = Discourse.Markdown.cook(input, {lookupAvatar: false});
equal(cooked, "
