From abb0a4bae26a446de93542da6673179b5163634f Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Sun, 11 Apr 2021 23:57:39 -0400
Subject: [PATCH] DEV: Add SCSS helper to replace `asset-uri` and `image-uri`
 (#12664)

---
 app/assets/images/select2-spinner.gif         | Bin 1435 -> 0 bytes
 app/assets/images/select2.png                 | Bin 525 -> 0 bytes
 app/assets/images/select2x2.png               | Bin 759 -> 0 bytes
 app/assets/images/spinner_96.gif              | Bin 11405 -> 0 bytes
 .../stylesheets/common/base/onebox.scss       |  12 +++++---
 .../stylesheets/common/foundation/mixins.scss |  11 +++++++
 lib/stylesheet/functions.rb                   |   2 ++
 lib/stylesheet/importer.rb                    |   7 ++++-
 .../images/favicons/discourse.png             | Bin
 .../google_branding/logo_calendar_128px.png   | Bin
 .../google_branding/logo_calendar_48px.png    | Bin
 .../google_branding/logo_docs_48px.png        | Bin
 .../google_branding/logo_drive_48px.png       | Bin
 .../google_branding/logo_forms_48px.png       | Bin
 .../google_branding/logo_sheets_48px.png      | Bin
 .../google_branding/logo_slides_48px.png      | Bin
 .../images/favicons/google_play.png           | Bin
 .../images/favicons/instagram.png             | Bin
 .../images/favicons/pdf_48px.png              | Bin
 .../images/favicons/pdf_64px.png              | Bin
 .../images/favicons/stackexchange.png         | Bin
 spec/components/stylesheet/compiler_spec.rb   |  29 ++++++++++++++++++
 spec/models/post_analyzer_spec.rb             |   2 +-
 spec/models/post_spec.rb                      |   2 +-
 24 files changed, 58 insertions(+), 7 deletions(-)
 delete mode 100644 app/assets/images/select2-spinner.gif
 delete mode 100644 app/assets/images/select2.png
 delete mode 100644 app/assets/images/select2x2.png
 delete mode 100644 app/assets/images/spinner_96.gif
 rename {app/assets => public}/images/favicons/discourse.png (100%)
 rename {app/assets => public}/images/favicons/google_branding/logo_calendar_128px.png (100%)
 rename {app/assets => public}/images/favicons/google_branding/logo_calendar_48px.png (100%)
 rename {app/assets => public}/images/favicons/google_branding/logo_docs_48px.png (100%)
 rename {app/assets => public}/images/favicons/google_branding/logo_drive_48px.png (100%)
 rename {app/assets => public}/images/favicons/google_branding/logo_forms_48px.png (100%)
 rename {app/assets => public}/images/favicons/google_branding/logo_sheets_48px.png (100%)
 rename {app/assets => public}/images/favicons/google_branding/logo_slides_48px.png (100%)
 rename {app/assets => public}/images/favicons/google_play.png (100%)
 rename {app/assets => public}/images/favicons/instagram.png (100%)
 rename {app/assets => public}/images/favicons/pdf_48px.png (100%)
 rename {app/assets => public}/images/favicons/pdf_64px.png (100%)
 rename {app/assets => public}/images/favicons/stackexchange.png (100%)

diff --git a/app/assets/images/select2-spinner.gif b/app/assets/images/select2-spinner.gif
deleted file mode 100644
index 703391003b296f5abf868210c79a720cea2987b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1435
zcmZ?wbhEHb6krfw_{`4`5fM>URkd&5J`oX-IdkTinVB&#Fg$qhAR{B=!-o%DU0rT&
zZYnA&Yu2n`VPX0I|G(mYZa>$MU}whwS0g<GW<~}E2F0H&tXvHI3_1)93=AM+8CVKG
zoSd$~RQjs?hG$!0!0ZwUpGO@hSI90-($JpcdD5tvkD+GS8OP@WI|>|P76n>7GU;mV
z4_KtK?&8s=s9kYun-1u%@YG=APCsqIX~2=j`sTud4VH_Y9WN-zJn<LiWMJfH31Kf#
zWoJ}w7h+0QWnu~yM0Eu}g8%~qOYDb}Kba<Vo>QG^<Gk3@^^gU7GRI;U1Lnj6VF7jL
zL`k=4o(#?p4Fm<Ew_ID?$iWhEik-2+!C|rdp%><vIt;fD`)|xp;plDtrEyJxkLh!$
z@P%Wl#XO3|^)gell+kPyVBlw9V2S#0@@L1Q2&J77Uao4E4wqCLW`ww1HodIq;drs3
zdy&Yog%Y-B6-1R8csF-4Yz&gp6Kd=$I8n2%w;}9E?SWk)EsJidvaoP6{#rFjgYUzU
z#va8p5BM#=cb^YdLiHddm}5Si)a2Z2w1j;c3)43d#^;JR)Oel57oAkp?AXJ?@=*2K
z0=6aXuM`tH<W#%XOuHc<#VeR(P|#4sa+5Xjg_y>|(}^_!vLe$SyG*F<x$5NUbU{Xr
zb(7j1-R+0JO2GWb0gG2Y1_l;afs>t13nG{@dCuRtrpT<p8s|Pi!hoYAFd|OWzhPtI
zSFg7-4n1j5_|YWme6r}|6g%f0hiR66%Vd?Dvc1xFh%g2)vAM!h3?Iy7P+VnSIQg<=
z!HuPAp%V^HRApSQ(RZlhW~0n=!v#|=bZ{lIx*pY;)Z(D%;UmP}u=v0v8H*`Lni8(a
ztPAC0WQfpMcY~+#poGGr8P1Ijj%Kp{oCXyJYO9!?FBzUllVbDY3&;@WVG~!*WXqB4
ztAqIrCB;U6IQjG3!U!%;j`Me}RvcmS@-njXZjL;8nM176<Fu}9NgEG?&!Z;C9crB_
zD;gbGCZF<24%A@r6LwJUx@#j~7{G9_LM5;D@__{vF_jCB%<|~5<`F+`$fwbw3A2xn
zL5Gonk%1qaQo=5rRBoN%`zmU^!|i9WC!VS-FAMM!wqRf2ak8<^@nhciWiu8oP;fZI
zVk+P8#zUJmdyUlLjkhIuxQ-@SMgQPoWNUsfqm?iGltQ3|8PD{Cw+=F_GHFO=!Inxu
z*&t|9#J%!95$UoRS@)KZN2Q&Q5@)A!_AU{S^iinj6V#V~x<G?Vy}e=6w?qzubq^0E
zyzmucZatQ$Q6bU7mh@4<KtSlw<uHvaRR=khFV->0*d5=lp!nR(%M!_R3=E76&}?ww
z<jbH*?OB;iZ$y31omn>J2!~&<QcQ^FN<O1I95>!LCH~<SXnf!`hl6=$%Z8#oYMd^O
znu%A0dRz}LWUydl^mKM(&|zuT^$9MRA=~)PEumDW$@Hn)LI!x+0mmK8x`+=aJ>yqZ
zEDPp8e%w{EEvU2e1Lu;DzU@)0ZkIcS7N_?=kY_laAaLS`)O?rZ#*Lv2lcu{g7T9t1
zKVo{Itf0c!<f0&G&eXv?%{*a|Jd2t~UxQlLo=p<MjL4x0i@2x{o`!vUesCS$G`-<s
zP0)9lwuiDOGld>c-5~LhBT`%Q=q8PMHy;WlNHp$TxKx#)qF~d3<Oi7=3;Yz63~~hg
jHe60o2=EY`*6tVUU~{J5Eupq>|I&VaO}WD^3=Gx)JMQ$+

diff --git a/app/assets/images/select2.png b/app/assets/images/select2.png
deleted file mode 100644
index 32c2fc3a22b27657ec7d7e7a07648725073c0a40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 525
zcmeAS@N?(olHy`uVBq!ia0y~yV6b6eV9?-TVPIh3*c4d8z`%IL)5S5Qg7NLa^V$3b
zGRHq&pB}d6W%Rz{$j41dGoL7&WzBwHJM~6m&B=bHr}8t@bon-^-`*}Gqn2%|xplY8
zrLxk6KR4#<bzi&^RWu{*>(`=4z8}+G-d>*3-#+b6_>R+wo{M^|b%M3#9Nx3Ivvi7q
zvsY`{F~eY=B(FEYR#!eVC97qGc;!6dJ+>#k`_jTzO`lG~Ga~9=wx5`ES*bwG_+(U=
zai8Rs^A@KJxkNMyCauv*>S&J=IkzEn(v1U|f4j0JlFwv^tzz2tnfLOttR#u#XE&F1
zNgSOKeq}{f#Ce@%E4p4Bkx1@ZrS|KGPnc-o%;+zd{q6T&dC~8Z%X6&Ivy0hK!16C&
z_Kme#-RBCXEVhkGGL!i})yw3_<bpFtrx*0NY`&Cv`pD%13$Kk%nn&mT5a2uR^JJ=@
zOwam<5}oW1XLRQ+6>2~9QRh`sWl!7Vu1lTQGA1lJaWqah@)LiuXs^k)lqq83Gmp)9
zUZNqJm#k)S-nYkck;#c<xye&i%06^TzM9I!JmuyR)|dlNrZOEq^EG8lgUvE$%?s@}
z*R%2jrcDo8z-jEe+eJ2Z#&)mPV2R*I%EzYcTo-cVq-~thG1V%=Wh=hy=rS~45t>zE
l+@Bd*WwYo^+TRbdpNcuyPVM*3XJBAp@O1TaS?83{1OOil@?ih~

diff --git a/app/assets/images/select2x2.png b/app/assets/images/select2x2.png
deleted file mode 100644
index e0a62658daefeffef908ec5c4729f85e9349437a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 759
zcmeAS@N?(olHy`uVBq!ia0y~yV5neVU<lw~W?*1=>gu?gfq`LHfKQ04dx1|!M@M^m
zdj}YFc6Rpn_qT(Ao0}V$21!8}uCA^S2C^0iyS~1@qobpzrw42d$Uumh?d|PtZEX-)
z2nkmJ(FidRqPVTCt-HIsxw#o4wQAKWh<HawM|XEOL?uMKo0}Ww3%zIt1_qmwAirRS
zf`$)&0|fppSnxpM!k;^L91d(a|NH0H1dfFwk6eGPoY~~X)5G#iv%}^7jc&m@IblWF
zX|tH$Pq@w9n|AlU&>RN_2F4AZE{-7;ac^%P?|W<@z!IRnamt*{={A<f&u;wlfB#m2
zEoJlFb~6h+Z9ZzX!oN=8rV9VNEsJ~SFIg!XG~H+Igk33Ftzv1rey@5uZ)eoan58-E
zEWTQOXPH!W?3eAe@~!`5UgxhfxN|->c0%j*>zdE=p7?&4AX9a>tMOnno4Ml2Bdcw0
z?OM!s{i(`K>-hzOSM#oHX;q9={qkV%Yj^HVeh)*>{a?QMRmJ=D_2pr*|No}W{W?$i
z`W&6jkJkR%bnesioXscKWbEMkyIVA)Re>#k)7^00?`N-`dZv|He01gYo%$14jK$t;
z+_L)X^N9Ll&UaakQgO@8a&K+PyzC|?K83}AZ_YJerAZ72)^}c-+w5@X?J))m@pIFU
z{QACrdjI*onjAOh#JZf>r@QLY*Uvm1b2#`KUY_6ob-KT>fxyA!Blqib8jlJ_bR`Hi
zGNv0UG(YBNlPRD2!IybW)T`*bLDP>MJ}MR=dsL$PK|{p+xT{~2G;RF!n9@#%hT6?N
zb71A<*qI7y-}}p-Prokg@t<*~aK~%+rYWa9T|%1Ybft>-FfQPU$=YPmu06eaGOxfX
iw(j6biO(C3%hzwpJn^0BYBvJ|1B0ilpUXO@geCwLpL3`H

diff --git a/app/assets/images/spinner_96.gif b/app/assets/images/spinner_96.gif
deleted file mode 100644
index 0fe33214395e84ceee21777367e1a4db4feee060..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11405
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
KF`0#t!5RQoZmaSD

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 29eb1a03e0c..a5716c7e662 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -87,7 +87,7 @@ a.loading-onebox {
 
 @mixin onebox-favicon($class, $image) {
   &.#{$class} .source {
-    background: image-url("favicons/#{$image}.png") no-repeat 0% 50%;
+    background: absolute-image-url("/favicons/#{$image}.png") no-repeat 0% 50%;
     background-size: 16px 16px;
     padding-left: 20px;
   }
@@ -289,7 +289,9 @@ aside.onebox {
 
 @mixin gdocs-logo($type) {
   &.g-#{$type}-logo {
-    background: image-url("favicons/google_branding/logo_#{$type}_48px.png")
+    background: absolute-image-url(
+        "/favicons/google_branding/logo_#{$type}_48px.png"
+      )
       no-repeat;
   }
 }
@@ -316,7 +318,9 @@ aside.onebox {
     width: 128px;
     height: 128px;
     &.g-calendar-logo {
-      background: image-url("favicons/google_branding/logo_calendar_128px.png")
+      background: absolute-image-url(
+          "/favicons/google_branding/logo_calendar_128px.png"
+        )
         no-repeat;
     }
   }
@@ -635,7 +639,7 @@ aside.onebox.stackexchange .onebox-body {
     width: 60px;
     height: 50px;
     float: left;
-    background: image-url("favicons/pdf_64px.png") no-repeat;
+    background: absolute-image-url("/favicons/pdf_64px.png") no-repeat;
     background-size: 48px 48px;
     display: inline-block;
   }
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index d6bd2eddce7..28c6b807c49 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -194,3 +194,14 @@ $breakpoints: (
     @return "dark";
   }
 }
+
+@function absolute-image-url($path) {
+  // public_image_path is added by the stylesheet importer
+  // it returns a CDN or subfolder path (if applicable).
+  // SCSS will compile (and return the relative path) if public_image_path is missing.
+  @if variable-exists(public_image_path) {
+    @return url("#{$public_image_path}#{$path}");
+  } @else {
+    @return url("#{$path}");
+  }
+}
diff --git a/lib/stylesheet/functions.rb b/lib/stylesheet/functions.rb
index fa1c3330d33..4abc98a51a4 100644
--- a/lib/stylesheet/functions.rb
+++ b/lib/stylesheet/functions.rb
@@ -3,9 +3,11 @@
 module Stylesheet
   module ScssFunctions
     def asset_url(path)
+      Discourse.deprecate("The `asset-url` SCSS function is deprecated. Use `absolute-image-url` instead.")
       SassC::Script::Value::String.new("url('#{ActionController::Base.helpers.asset_url(path.value)}')")
     end
     def image_url(path)
+      Discourse.deprecate("The `image-url` SCSS function is deprecated. Use `absolute-image-url` instead.")
       SassC::Script::Value::String.new("url('#{ActionController::Base.helpers.image_url(path.value)}')")
     end
   end
diff --git a/lib/stylesheet/importer.rb b/lib/stylesheet/importer.rb
index 01ca4686db6..8b02e809c97 100644
--- a/lib/stylesheet/importer.rb
+++ b/lib/stylesheet/importer.rb
@@ -152,8 +152,13 @@ module Stylesheet
       contents
     end
 
+    def public_image_path
+      image_path = UrlHelper.absolute("#{Discourse.base_path}/images")
+      "$public_image_path: \"#{image_path}\"; "
+    end
+
     def prepended_scss
-      "#{color_variables} @import \"common/foundation/variables\"; @import \"common/foundation/mixins\"; "
+      "#{color_variables} #{public_image_path} @import \"common/foundation/variables\"; @import \"common/foundation/mixins\"; "
     end
 
     def initialize(options)
diff --git a/app/assets/images/favicons/discourse.png b/public/images/favicons/discourse.png
similarity index 100%
rename from app/assets/images/favicons/discourse.png
rename to public/images/favicons/discourse.png
diff --git a/app/assets/images/favicons/google_branding/logo_calendar_128px.png b/public/images/favicons/google_branding/logo_calendar_128px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_calendar_128px.png
rename to public/images/favicons/google_branding/logo_calendar_128px.png
diff --git a/app/assets/images/favicons/google_branding/logo_calendar_48px.png b/public/images/favicons/google_branding/logo_calendar_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_calendar_48px.png
rename to public/images/favicons/google_branding/logo_calendar_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_docs_48px.png b/public/images/favicons/google_branding/logo_docs_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_docs_48px.png
rename to public/images/favicons/google_branding/logo_docs_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_drive_48px.png b/public/images/favicons/google_branding/logo_drive_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_drive_48px.png
rename to public/images/favicons/google_branding/logo_drive_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_forms_48px.png b/public/images/favicons/google_branding/logo_forms_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_forms_48px.png
rename to public/images/favicons/google_branding/logo_forms_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_sheets_48px.png b/public/images/favicons/google_branding/logo_sheets_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_sheets_48px.png
rename to public/images/favicons/google_branding/logo_sheets_48px.png
diff --git a/app/assets/images/favicons/google_branding/logo_slides_48px.png b/public/images/favicons/google_branding/logo_slides_48px.png
similarity index 100%
rename from app/assets/images/favicons/google_branding/logo_slides_48px.png
rename to public/images/favicons/google_branding/logo_slides_48px.png
diff --git a/app/assets/images/favicons/google_play.png b/public/images/favicons/google_play.png
similarity index 100%
rename from app/assets/images/favicons/google_play.png
rename to public/images/favicons/google_play.png
diff --git a/app/assets/images/favicons/instagram.png b/public/images/favicons/instagram.png
similarity index 100%
rename from app/assets/images/favicons/instagram.png
rename to public/images/favicons/instagram.png
diff --git a/app/assets/images/favicons/pdf_48px.png b/public/images/favicons/pdf_48px.png
similarity index 100%
rename from app/assets/images/favicons/pdf_48px.png
rename to public/images/favicons/pdf_48px.png
diff --git a/app/assets/images/favicons/pdf_64px.png b/public/images/favicons/pdf_64px.png
similarity index 100%
rename from app/assets/images/favicons/pdf_64px.png
rename to public/images/favicons/pdf_64px.png
diff --git a/app/assets/images/favicons/stackexchange.png b/public/images/favicons/stackexchange.png
similarity index 100%
rename from app/assets/images/favicons/stackexchange.png
rename to public/images/favicons/stackexchange.png
diff --git a/spec/components/stylesheet/compiler_spec.rb b/spec/components/stylesheet/compiler_spec.rb
index 6de836e425a..b71b2d6cce3 100644
--- a/spec/components/stylesheet/compiler_spec.rb
+++ b/spec/components/stylesheet/compiler_spec.rb
@@ -87,6 +87,35 @@ describe Stylesheet::Compiler do
     expect(css).not_to include('image-url')
   end
 
+  it "supports absolute-image-url" do
+    scss = Stylesheet::Importer.new({}).prepended_scss
+    scss += ".body{background-image: absolute-image-url('/favicons/github.png');}"
+    css, _map = Stylesheet::Compiler.compile(scss, "test.scss")
+
+    expect(css).to include('url("http://test.localhost/images/favicons/github.png")')
+    expect(css).not_to include('absolute-image-url')
+  end
+
+  it "supports absolute-image-url in subfolder" do
+    set_subfolder "/subfo"
+    scss = Stylesheet::Importer.new({}).prepended_scss
+    scss += ".body{background-image: absolute-image-url('/favicons/github.png');}"
+    css, _map = Stylesheet::Compiler.compile(scss, "test2.scss")
+
+    expect(css).to include('url("http://test.localhost/subfo/images/favicons/github.png")')
+    expect(css).not_to include('absolute-image-url')
+  end
+
+  it "supports absolute-image-url with CDNs" do
+    set_cdn_url "https://awesome.com"
+    scss = Stylesheet::Importer.new({}).prepended_scss
+    scss += ".body{background-image: absolute-image-url('/favicons/github.png');}"
+    css, _map = Stylesheet::Compiler.compile(scss, "test2.scss")
+
+    expect(css).to include('url("https://awesome.com/images/favicons/github.png")')
+    expect(css).not_to include('absolute-image-url')
+  end
+
   context "with a color scheme" do
     it "returns the default color definitions when no color scheme is specified" do
       css, _map = Stylesheet::Compiler.compile_asset("color_definitions")
diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb
index dccd31597ca..f7de1074ee5 100644
--- a/spec/models/post_analyzer_spec.rb
+++ b/spec/models/post_analyzer_spec.rb
@@ -119,7 +119,7 @@ describe PostAnalyzer do
     let(:raw_post_one_image_md) { "![sherlock](http://bbc.co.uk/sherlock.jpg)" }
     let(:raw_post_two_images_html) { "<img src='http://discourse.org/logo.png'> <img src='http://bbc.co.uk/sherlock.jpg'>" }
     let(:raw_post_with_avatars) { '<img alt="smiley" title=":smiley:" src="/assets/emoji/smiley.png" class="avatar"> <img alt="wink" title=":wink:" src="/assets/emoji/wink.png" class="avatar">' }
-    let(:raw_post_with_favicon) { '<img src="/assets/favicons/wikipedia.png" class="favicon">' }
+    let(:raw_post_with_favicon) { '<img src="/images/favicons/discourse.png" class="favicon">' }
     let(:raw_post_with_thumbnail) { '<img src="/assets/emoji/smiley.png" class="thumbnail">' }
     let(:raw_post_with_two_classy_images) { "<img src='http://discourse.org/logo.png' class='classy'> <img src='http://bbc.co.uk/sherlock.jpg' class='classy'>" }
     let(:raw_post_with_two_embedded_media) { '<video width="950" height="700" controls><source src="https://bbc.co.uk/news.mp4" type="video/mp4"></video><audio controls><source type="audio/mpeg" src="https://example.com/audio.mp3"></audio>' }
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 5db5dab72cf..4108857b481 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -241,7 +241,7 @@ describe Post do
     let(:post_one_image) { post_with_body("![sherlock](http://bbc.co.uk/sherlock.jpg)", newuser) }
     let(:post_two_images) { post_with_body("<img src='http://discourse.org/logo.png'> <img src='http://bbc.co.uk/sherlock.jpg'>", newuser) }
     let(:post_with_avatars) { post_with_body('<img alt="smiley" title=":smiley:" src="/assets/emoji/smiley.png" class="avatar"> <img alt="wink" title=":wink:" src="/assets/emoji/wink.png" class="avatar">', newuser) }
-    let(:post_with_favicon) { post_with_body('<img src="/assets/favicons/wikipedia.png" class="favicon">', newuser) }
+    let(:post_with_favicon) { post_with_body('<img src="/images/favicons/discourse.png" class="favicon">', newuser) }
     let(:post_image_within_quote) { post_with_body('[quote]<img src="coolimage.png">[/quote]', newuser) }
     let(:post_image_within_code) { post_with_body('<code><img src="coolimage.png"></code>', newuser) }
     let(:post_image_within_pre) { post_with_body('<pre><img src="coolimage.png"></pre>', newuser) }