+ cpp.html.should match_html ''
cpp.should be_dirty
@@ -159,37 +101,107 @@ describe CookedPostProcessor do
let(:cpp) { CookedPostProcessor.new(post) }
it "adds a topic image if there's one in the post" do
- FastImage.stubs(:size).returns([100, 100])
+ FastImage.stubs(:size)
+ post.topic.image_url.should be_nil
cpp.post_process_images
post.topic.reload
- post.topic.image_url.should == "http://test.localhost/uploads/default/2/3456789012345678.png"
+ post.topic.image_url.should be_present
end
end
end
- context "post_process_oneboxes" do
+ context ".extract_images" do
- let(:post) { build(:post_with_youtube, id: 123) }
- let(:cpp) { CookedPostProcessor.new(post, invalidate_oneboxes: true) }
+ let(:post) { build(:post_with_images_in_quote_and_onebox) }
+ let(:cpp) { CookedPostProcessor.new(post) }
- before do
- Oneboxer.expects(:onebox).with("http://www.youtube.com/watch?v=9bZkp7q19f0", post_id: 123, invalidate_oneboxes: true).returns('GANGNAM STYLE
")
+ cpp.post_process_oneboxes
end
- context "crawl_images is disabled" do
-
- before { SiteSetting.stubs(:crawl_images?).returns(false) }
-
- it "doesn't call FastImage" do
- FastImage.expects(:size).never
- cpp.get_size("http://foo.bar/image1.png").should == nil
- end
-
- it "is always allowed to crawl our own images" do
- store = {}
- Discourse.expects(:store).returns(store)
- store.expects(:has_been_uploaded?).returns(true)
- FastImage.expects(:size).returns([100, 200])
- cpp.get_size("http://foo.bar/image2.png").should == [100, 200]
- end
-
+ it "is dirty" do
+ cpp.should be_dirty
end
- it "caches the results" do
- SiteSetting.stubs(:crawl_images?).returns(true)
- FastImage.expects(:size).returns([200, 400])
- cpp.get_size("http://foo.bar/image3.png")
- cpp.get_size("http://foo.bar/image3.png").should == [200, 400]
+ it "inserts the onebox without wrapping p" do
+ cpp.html.should match_html "GANGNAM STYLE
')
- cpp.post_process_oneboxes
- end
-
- it "should be dirty" do
- cpp.should be_dirty
- end
-
- it "inserts the onebox without wrapping p" do
- cpp.html.should match_html "GANGNAM STYLE
"
+ it "does not extract images inside oneboxes or quotes" do
+ cpp.extract_images.length.should == 0
end
end
- context "get_filename" do
+ context ".get_size_from_image_sizes" do
+
+ let(:post) { build(:post) }
+ let(:cpp) { CookedPostProcessor.new(post) }
+
+ it "returns the size" do
+ image_sizes = { "http://my.discourse.org/image.png" => { "width" => 111, "height" => 222 } }
+ cpp.get_size_from_image_sizes("/image.png", image_sizes).should == [111, 222]
+ end
+
+ end
+
+ context ".get_size" do
+
+ let(:post) { build(:post) }
+ let(:cpp) { CookedPostProcessor.new(post) }
+
+ it "ensures urls are absolute" do
+ cpp.expects(:is_valid_image_url?).with("http://test.localhost/relative/url/image.png")
+ cpp.get_size("/relative/url/image.png")
+ end
+
+ it "ensures urls have a default scheme" do
+ cpp.expects(:is_valid_image_url?).with("http://schemaless.url/image.jpg")
+ cpp.get_size("//schemaless.url/image.jpg")
+ end
+
+ it "caches the results" do
+ SiteSetting.stubs(:crawl_images?).returns(true)
+ FastImage.expects(:size).returns([200, 400])
+ cpp.get_size("http://foo.bar/image3.png")
+ cpp.get_size("http://foo.bar/image3.png").should == [200, 400]
+ end
+
+ context "when crawl_images is disabled" do
+
+ before { SiteSetting.stubs(:crawl_images?).returns(false) }
+
+ it "doesn't call FastImage" do
+ FastImage.expects(:size).never
+ cpp.get_size("http://foo.bar/image1.png").should == nil
+ end
+
+ it "is always allowed to crawl our own images" do
+ store = stub
+ store.expects(:has_been_uploaded?).returns(true)
+ Discourse.expects(:store).returns(store)
+ FastImage.expects(:size).returns([100, 200])
+ cpp.get_size("http://foo.bar/image2.png").should == [100, 200]
+ end
+
+ end
+
+ end
+
+ context ".is_valid_image_url?" do
+
+ let(:post) { build(:post) }
+ let(:cpp) { CookedPostProcessor.new(post) }
+
+ it "validates HTTP(s) urls" do
+ cpp.is_valid_image_url?("http://domain.com").should == true
+ cpp.is_valid_image_url?("https://domain.com").should == true
+ end
+
+ it "doesn't validate other urls" do
+ cpp.is_valid_image_url?("ftp://domain.com").should == false
+ cpp.is_valid_image_url?("ftps://domain.com").should == false
+ cpp.is_valid_image_url?("/tmp/image.png").should == false
+ cpp.is_valid_image_url?("//domain.com").should == false
+ end
+
+ it "doesn't throw an exception with a bad URI" do
+ cpp.is_valid_image_url?("http://doGANGNAM STYLE
"
end
end
- context "is_valid_image_uri?" do
+ context ".optimize_urls" do
+
+ let(:post) { build(:post_with_uploads_and_links) }
+ let(:cpp) { CookedPostProcessor.new(post) }
+
+ it "uses schemaless url for uploads" do
+ cpp.optimize_urls
+ cpp.html.should match_html 'Link
+ 
Google
+ 
'
+ end
+
+ context "when CDN is enabled" do
+
+ it "uses schemaless CDN url for uploads" do
+ Rails.configuration.action_controller.stubs(:asset_host).returns("http://my.cdn.com")
+ cpp.optimize_urls
+ cpp.html.should match_html 'Link
+ 
Google
+ '
+ end
+
+ end
+
+ end
+
+ context ".pull_hotlinked_images" do
let(:post) { build(:post) }
let(:cpp) { CookedPostProcessor.new(post) }
- it "needs the scheme to be either http or https" do
- cpp.is_valid_image_uri?("http://domain.com").should == true
- cpp.is_valid_image_uri?("https://domain.com").should == true
- cpp.is_valid_image_uri?("ftp://domain.com").should == false
- cpp.is_valid_image_uri?("ftps://domain.com").should == false
- cpp.is_valid_image_uri?("//domain.com").should == false
- cpp.is_valid_image_uri?("/tmp/image.png").should == false
+ it "does not run when crawl images is disabled" do
+ SiteSetting.stubs(:crawl_images).returns(false)
+ Jobs.expects(:cancel_scheduled_job).never
+ cpp.pull_hotlinked_images
end
- it "doesn't throw an exception with a bad URI" do
- cpp.is_valid_image_uri?("http://do
","http://a.com").should ==
- "hello![hello](\"http://a.com/hello.png\"){kind=link}
![](\"http://a.com/a.jpeg\")
"
- end
-
- it "should not touch non images" do
- PrettyText.apply_cdn("hello","http://a.com").should ==
- "hello"
- end
-
- it "should not touch schemaless links" do
- PrettyText.apply_cdn("hello","http://a.com").should ==
- "hello"
- end
- end
end
diff --git a/spec/controllers/admin/versions_controller_spec.rb b/spec/controllers/admin/versions_controller_spec.rb
index 364c5503a..3825ceed9 100644
--- a/spec/controllers/admin/versions_controller_spec.rb
+++ b/spec/controllers/admin/versions_controller_spec.rb
@@ -34,4 +34,4 @@ describe Admin::VersionsController do
end
end
end
-end
\ No newline at end of file
+end
diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb
index e3ac09475..c34e1c5f5 100644
--- a/spec/fabricators/post_fabricator.rb
+++ b/spec/fabricators/post_fabricator.rb
@@ -59,13 +59,29 @@ Fabricator(:post_with_unsized_images, from: :post) do
end
Fabricator(:post_with_image_url, from: :post) do
- cooked ''
+ cooked ''
end
Fabricator(:post_with_large_image, from: :post) do
cooked '
'
end
+Fabricator(:post_with_uploads, from: :post) do
+ cooked '
+Link
+
+'
+end
+
+Fabricator(:post_with_uploads_and_links, from: :post) do
+ cooked '
+Link
+
+Google
+
+'
+end
+
Fabricator(:post_with_external_links, from: :post) do
user
topic
diff --git a/spec/models/optimized_image_spec.rb b/spec/models/optimized_image_spec.rb
index 743c3bb0f..0e663ea5f 100644
--- a/spec/models/optimized_image_spec.rb
+++ b/spec/models/optimized_image_spec.rb
@@ -4,53 +4,88 @@ describe OptimizedImage do
it { should belong_to :upload }
- let(:upload) { Fabricate(:upload) }
- let(:oi) { OptimizedImage.create_for(upload, 100, 200) }
+ let(:upload) { build(:upload) }
+
+ before { upload.id = 42 }
describe ".create_for" do
- before { ImageSorcery.any_instance.expects(:convert).returns(true) }
+ context "when using an internal store" do
- describe "internal store" do
+ let(:store) { FakeInternalStore.new }
+ before { Discourse.stubs(:store).returns(store) }
+
+ context "when an error happened while generatign the thumbnail" do
+
+ before { ImageSorcery.any_instance.stubs(:convert).returns(false) }
+
+ it "returns nil" do
+ OptimizedImage.create_for(upload, 100, 200).should be_nil
+ end
+
+ end
+
+ context "when the thumbnail is properly generated" do
+
+ before { ImageSorcery.any_instance.stubs(:convert).returns(true) }
+
+ it "does not download a copy of the original image" do
+ store.expects(:download).never
+ OptimizedImage.create_for(upload, 100, 200)
+ end
+
+ it "closes and removes the tempfile" do
+ Tempfile.any_instance.expects(:close!)
+ OptimizedImage.create_for(upload, 100, 200)
+ end
+
+ it "works" do
+ oi = OptimizedImage.create_for(upload, 100, 200)
+ oi.sha1.should == "da39a3ee5e6b4b0d3255bfef95601890afd80709"
+ oi.extension.should == ".jpg"
+ oi.width.should == 100
+ oi.height.should == 200
+ oi.url.should == "/internally/stored/optimized/image.jpg"
+ end
- it "works" do
- Tempfile.any_instance.expects(:close!)
- oi.sha1.should == "da39a3ee5e6b4b0d3255bfef95601890afd80709"
- oi.extension.should == ".jpg"
- oi.width.should == 100
- oi.height.should == 200
- oi.url.should == "/uploads/default/_optimized/da3/9a3/ee5e6b4b0d_100x200.jpg"
end
end
describe "external store" do
- require 'file_store/s3_store'
- require 'fog'
+ let(:store) { FakeExternalStore.new }
+ before { Discourse.stubs(:store).returns(store) }
- let(:store) { S3Store.new }
+ context "when an error happened while generatign the thumbnail" do
+
+ before { ImageSorcery.any_instance.stubs(:convert).returns(false) }
+
+ it "returns nil" do
+ OptimizedImage.create_for(upload, 100, 200).should be_nil
+ end
- before do
- Discourse.stubs(:store).returns(store)
- SiteSetting.stubs(:s3_upload_bucket).returns("S3_Upload_Bucket")
- SiteSetting.stubs(:s3_access_key_id).returns("s3_access_key_id")
- SiteSetting.stubs(:s3_secret_access_key).returns("s3_secret_access_key")
- Fog.mock!
end
- it "works" do
- # fake downloaded file
- downloaded_file = {}
- downloaded_file.expects(:path).returns("/path/to/fake.png")
- downloaded_file.expects(:close!)
- store.expects(:download).returns(downloaded_file)
- # assertions
- oi.sha1.should == "da39a3ee5e6b4b0d3255bfef95601890afd80709"
- oi.extension.should == ".png"
- oi.width.should == 100
- oi.height.should == 200
- oi.url.should =~ /^\/\/s3_upload_bucket.s3.amazonaws.com\/[0-9a-f]+_100x200.png/
+ context "when the thumbnail is properly generated" do
+
+ before { ImageSorcery.any_instance.stubs(:convert).returns(true) }
+
+ it "downloads a copy of the original image" do
+ Tempfile.any_instance.expects(:close!).twice
+ store.expects(:download).with(upload).returns(Tempfile.new(["discourse-external", ".jpg"]))
+ OptimizedImage.create_for(upload, 100, 200)
+ end
+
+ it "works" do
+ oi = OptimizedImage.create_for(upload, 100, 200)
+ oi.sha1.should == "da39a3ee5e6b4b0d3255bfef95601890afd80709"
+ oi.extension.should == ".jpg"
+ oi.width.should == 100
+ oi.height.should == 200
+ oi.url.should == "/externally/stored/optimized/image.jpg"
+ end
+
end
end
@@ -58,3 +93,44 @@ describe OptimizedImage do
end
end
+
+class FakeInternalStore
+
+ def internal?
+ true
+ end
+
+ def external?
+ !internal?
+ end
+
+ def path_for(upload)
+ upload.url
+ end
+
+ def store_optimized_image(file, optimized_image)
+ "/internally/stored/optimized/image#{optimized_image.extension}"
+ end
+
+end
+
+class FakeExternalStore
+
+ def external?
+ true
+ end
+
+ def internal?
+ !external?
+ end
+
+ def store_optimized_image(file, optimized_image)
+ "/externally/stored/optimized/image#{optimized_image.extension}"
+ end
+
+ def download(upload)
+ extension = File.extname(upload.original_filename)
+ Tempfile.new(["discourse-s3", extension])
+ end
+
+end
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index 7c812ffe3..4006bc796 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -46,18 +46,10 @@ describe Upload do
upload.create_thumbnail!(100, 100)
end
- it "does not create another thumbnail" do
- SiteSetting.expects(:create_thumbnails?).returns(true)
- upload.expects(:has_thumbnail?).returns(true)
- OptimizedImage.expects(:create_for).never
- upload.create_thumbnail!(100, 100)
- end
-
it "creates a thumbnail" do
upload = Fabricate(:upload)
thumbnail = Fabricate(:optimized_image, upload: upload)
SiteSetting.expects(:create_thumbnails?).returns(true)
- upload.expects(:has_thumbnail?).returns(false)
OptimizedImage.expects(:create_for).returns(thumbnail)
upload.create_thumbnail!(100, 100)
upload.reload
@@ -66,7 +58,7 @@ describe Upload do
end
- context ".create_for" do
+ context "#create_for" do
it "does not create another upload if it already exists" do
Upload.expects(:where).with(sha1: image_sha1).returns([upload])
diff --git a/spec/models/user_action_spec.rb b/spec/models/user_action_spec.rb
index 98f553e55..d0b34a274 100644
--- a/spec/models/user_action_spec.rb
+++ b/spec/models/user_action_spec.rb
@@ -210,7 +210,6 @@ describe UserAction do
end
end
-
describe 'private messages' do
let(:user) do