diff options
author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-13 08:16:38 -0500 |
---|---|---|
committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-13 08:16:38 -0500 |
commit | 8b79f5d49cb8d4877e136a76e515edef41ef6f28 (patch) | |
tree | 95feb1a0b94f43fd38533adc508df2daf823ea86 /app/post_test.go | |
parent | 32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c (diff) | |
parent | fbef16f8630f74248157c2cd9e546ece355c869a (diff) | |
download | chat-8b79f5d49cb8d4877e136a76e515edef41ef6f28.tar.gz chat-8b79f5d49cb8d4877e136a76e515edef41ef6f28.tar.bz2 chat-8b79f5d49cb8d4877e136a76e515edef41ef6f28.zip |
Merge branch 'ccbrown-rm-willnorris-proxy-support' into release-4.7
Diffstat (limited to 'app/post_test.go')
-rw-r--r-- | app/post_test.go | 54 |
1 files changed, 10 insertions, 44 deletions
diff --git a/app/post_test.go b/app/post_test.go index c8ed726b1..ebe973270 100644 --- a/app/post_test.go +++ b/app/post_test.go @@ -210,38 +210,27 @@ func TestImageProxy(t *testing.T) { ImageURL: "http://mydomain.com/myimage", ProxiedImageURL: "https://127.0.0.1/f8dace906d23689e8d5b12c3cefbedbf7b9b72f5/687474703a2f2f6d79646f6d61696e2e636f6d2f6d79696d616765", }, - "willnorris/imageproxy": { - ProxyType: "willnorris/imageproxy", - ProxyURL: "https://127.0.0.1", - ProxyOptions: "x1000", - ImageURL: "http://mydomain.com/myimage", - ProxiedImageURL: "https://127.0.0.1/x1000/http://mydomain.com/myimage", - }, - "willnorris/imageproxy_SameSite": { - ProxyType: "willnorris/imageproxy", + "atmos/camo_SameSite": { + ProxyType: "atmos/camo", ProxyURL: "https://127.0.0.1", + ProxyOptions: "foo", ImageURL: "http://mymattermost.com/myimage", ProxiedImageURL: "http://mymattermost.com/myimage", }, - "willnorris/imageproxy_PathOnly": { - ProxyType: "willnorris/imageproxy", + "atmos/camo_PathOnly": { + ProxyType: "atmos/camo", ProxyURL: "https://127.0.0.1", + ProxyOptions: "foo", ImageURL: "/myimage", ProxiedImageURL: "/myimage", }, - "willnorris/imageproxy_EmptyImageURL": { - ProxyType: "willnorris/imageproxy", + "atmos/camo_EmptyImageURL": { + ProxyType: "atmos/camo", ProxyURL: "https://127.0.0.1", + ProxyOptions: "foo", ImageURL: "", ProxiedImageURL: "", }, - "willnorris/imageproxy_WithSigning": { - ProxyType: "willnorris/imageproxy", - ProxyURL: "https://127.0.0.1", - ProxyOptions: "x1000|foo", - ImageURL: "http://mydomain.com/myimage", - ProxiedImageURL: "https://127.0.0.1/x1000,sbhHVoG5d60UvnNtGh6Iy6x4PaMmnsh8JfZ7JfErKjGU=/http://mydomain.com/myimage", - }, } { t.Run(name, func(t *testing.T) { th.App.UpdateConfig(func(cfg *model.Config) { @@ -356,27 +345,4 @@ func TestMakeOpenGraphURLsAbsolute(t *testing.T) { } }) } -} - -var imageProxyBenchmarkSink *model.Post - -func BenchmarkPostWithProxyRemovedFromImageURLs(b *testing.B) { - th := Setup().InitBasic() - defer th.TearDown() - - th.App.UpdateConfig(func(cfg *model.Config) { - cfg.ServiceSettings.ImageProxyType = model.NewString("willnorris/imageproxy") - cfg.ServiceSettings.ImageProxyOptions = model.NewString("x1000|foo") - cfg.ServiceSettings.ImageProxyURL = model.NewString("https://127.0.0.1") - }) - - post := &model.Post{ - Message: "![foo](http://mydomain.com/myimage)", - } - - b.ResetTimer() - - for i := 0; i < b.N; i++ { - imageProxyBenchmarkSink = th.App.PostWithProxyAddedToImageURLs(post) - } -} +}
\ No newline at end of file |