diff --git a/samples/HostedInAspNet.Client/wwwroot/customJsFileForTests.js b/samples/HostedInAspNet.Client/wwwroot/customJsFileForTests.js new file mode 100644 index 0000000000..5183d9fa30 --- /dev/null +++ b/samples/HostedInAspNet.Client/wwwroot/customJsFileForTests.js @@ -0,0 +1,3 @@ +// This is only used for E2E tests to verify that we're correctly serving static content. +// Later this will be replaced with something more useful. +window.customJsWasLoaded = true; diff --git a/samples/HostedInAspNet.Client/wwwroot/index.html b/samples/HostedInAspNet.Client/wwwroot/index.html index 7ece3426ca..ed1a339a4f 100644 --- a/samples/HostedInAspNet.Client/wwwroot/index.html +++ b/samples/HostedInAspNet.Client/wwwroot/index.html @@ -5,7 +5,8 @@ Sample Blazor app - Loading... - + Loading... + + diff --git a/samples/StandaloneApp/wwwroot/css/bootstrap/bootstrap-native.min.js b/samples/StandaloneApp/wwwroot/css/bootstrap/bootstrap-native.min.js new file mode 100644 index 0000000000..82be40e8d7 --- /dev/null +++ b/samples/StandaloneApp/wwwroot/css/bootstrap/bootstrap-native.min.js @@ -0,0 +1,2 @@ +// Native Javascript for Bootstrap 3 v2.0.12 | © dnp_theme | MIT-License +!function(t,e){if("function"==typeof define&&define.amd)define([],e);else if("object"==typeof module&&module.exports)module.exports=e();else{var n=e();t.Affix=n.Affix,t.Alert=n.Alert,t.Button=n.Button,t.Carousel=n.Carousel,t.Collapse=n.Collapse,t.Dropdown=n.Dropdown,t.Modal=n.Modal,t.Popover=n.Popover,t.ScrollSpy=n.ScrollSpy,t.Tab=n.Tab,t.Tooltip=n.Tooltip}}(this,function(){var t="undefined"!=typeof global?global:this||window,e=document.documentElement,n=document.body,i="data-toggle",o="data-dismiss",a="data-spy",l="data-ride",r="Affix",c="Alert",u="Button",s="Carousel",f="Collapse",d="Dropdown",h="Modal",p="Popover",m="ScrollSpy",v="Tab",g="Tooltip",b="data-backdrop",x="data-keyboard",T="data-target",y="data-interval",w="data-height",C="data-pause",I="data-original-title",A="data-original-text",L="data-dismissible",E="data-trigger",M="data-animation",k="data-container",S="data-placement",H="data-delay",B="data-offset-top",D="data-offset-bottom",N="backdrop",W="keyboard",P="delay",$="content",j="target",O="interval",q="pause",z="animation",R="placement",U="container",X="offsetTop",Y="offsetBottom",F="offsetLeft",G="scrollTop",J="scrollLeft",K="clientWidth",Q="clientHeight",V="offsetWidth",Z="offsetHeight",_="innerWidth",tt="innerHeight",et="scrollHeight",nt="height",it="aria-expanded",ot="aria-hidden",at="click",lt="hover",rt="keydown",ct="resize",ut="scroll",st="show",ft="shown",dt="hide",ht="hidden",pt="close",mt="closed",vt="slid",gt="slide",bt="change",xt="getAttribute",Tt="setAttribute",yt="hasAttribute",wt="getElementsByTagName",Ct="getBoundingClientRect",It="querySelectorAll",At="getElementsByClassName",Lt="indexOf",Et="parentNode",Mt="length",kt="toLowerCase",St="Transition",Ht="Webkit",Bt="style",Dt="active",Nt="in",Wt="collapsing",Pt="disabled",$t="loading",jt="left",Ot="right",qt="top",zt="bottom",Rt=!("opacity"in n[Bt]),Ut="navbar-fixed-top",Xt="navbar-fixed-bottom",Yt="onmouseleave"in document?["mouseenter","mouseleave"]:["mouseover","mouseout"],Ft=/\b(top|bottom|left|top)+/,Gt=Ht+St in e[Bt]||St[kt]()in e[Bt],Jt=Ht+St in e[Bt]?Ht[kt]()+St+"End":St[kt]()+"end",Kt=function(t){t.focus?t.focus():t.setActive()},Qt=function(t,e){t.classList.add(e)},Vt=function(t,e){t.classList.remove(e)},Zt=function(t,e){return t.classList.contains(e)},_t=function(t){for(var e=[],n=0,i=t[Mt];n-1||l===r)&&new e(o[a])}},se=/^\#(.)+$/,fe=function(e){var n=e&&(e.currentStyle||t.getComputedStyle(e)),i=/px/.test(n.borderTopWidth)?Math.round(n.borderTopWidth.replace("px","")):0,o=/px/.test(n.borderBottomWidth)?Math.round(n.borderBottomWidth.replace("px","")):0,a=/px/.test(n.marginTop)?Math.round(n.marginTop.replace("px","")):0,l=/px/.test(n.marginBottom)?Math.round(n.marginBottom.replace("px","")):0;return e[Q]+parseInt(i)+parseInt(o)+parseInt(a)+parseInt(l)},de=function(t){for(var e=0,n=0,i=t.children[Mt];n=0&&i[jt]>=0&&i[zt]<=(t[tt]||e[Q])&&i[Ot]<=(t[_]||e[K])},pe=function(){return{y:t.pageYOffset||e[G],x:t.pageXOffset||e[J]}},me=function(t,e,i,o){var a=t[Ct](),l=o===n?pe():{x:o[F]+o[J],y:o[X]+o[G]},r={w:a[Ot]-a[jt],h:a[zt]-a[qt]},c={w:e[V],h:e[Z]};i===qt?(e[Bt][qt]=a[qt]+l.y-c.h+"px",e[Bt][jt]=a[jt]+l.x-c.w/2+r.w/2+"px"):i===zt?(e[Bt][qt]=a[qt]+l.y+r.h+"px",e[Bt][jt]=a[jt]+l.x-c.w/2+r.w/2+"px"):i===jt?(e[Bt][qt]=a[qt]+l.y-c.h/2+r.h/2+"px",e[Bt][jt]=a[jt]+l.x-c.w+"px"):i===Ot&&(e[Bt][qt]=a[qt]+l.y-c.h/2+r.h/2+"px",e[Bt][jt]=a[jt]+l.x+r.w+"px"),e.className[Lt](i)===-1&&(e.className=e.className.replace(Ft,i))},ve=function(t){return t===qt?zt:t===zt?qt:t===jt?Ot:t===Ot?jt:t},ge=function(i,o){i=ee(i),o=o||{};var a=i[xt](T),l=i[xt](B),c=i[xt](D),u="affix",s="affixed",f="function",d="update",h="affix-top",p="affixed-top",m="affix-bottom",v="affixed-bottom";if(this[j]=o[j]?ee(o[j]):ee(a)||null,this[X]=o[X]?o[X]:parseInt(l)||0,this[Y]=o[Y]?o[Y]:parseInt(c)||0,this[j]||this[X]||this[Y]){var g,b,x,y,w,C,I=this,A=Gt?50:500,L=!1,E=!1,M=function(){return Math.max(n[et],n[Z],e[Q],e[et],e[Z])},k=function(){return null!==I[j]?I[j][Ct]()[qt]+y:I[X]?parseInt(typeof I[X]===f?I[X]():I[X]||0):void 0},S=function(){if(I[Y])return x-i[Z]-parseInt(typeof I[Y]===f?I[Y]():I[Y]||0)},H=function(){x=M(),y=parseInt(pe().y,0),g=k(),b=S(),w=parseInt(g)-y<0&&y>parseInt(g),C=parseInt(b)-y<0&&y>parseInt(b)},N=function(){L||Zt(i,u)||(re.call(i,u,u),re.call(i,h,u),Qt(i,u),L=!0,re.call(i,s,u),re.call(i,p,u))},W=function(){L&&Zt(i,u)&&(Vt(i,u),L=!1)},P=function(){E||Zt(i,m)||(re.call(i,u,u),re.call(i,m,u),Qt(i,m),E=!0,re.call(i,s,u),re.call(i,v,u))},$=function(){E&&Zt(i,m)&&(Vt(i,m),E=!1)},O=function(){C?(w&&W(),P()):($(),w?N():W())};this[d]=function(){H(),O()},r in i||(ie(t,ut,this[d]),ie(t,ct,function(){setTimeout(function(){I[d]()},A)})),i[r]=this,this[d]()}};ue(r,ge,a);var be=function(t){t=ee(t);var e=this,n="alert",i=ne(t,"."+n),a=function(){Zt(i,"fade")?le(i,r):r()},l=function(a){var l=a[j];l=l[yt](o)?l:l[Et],l&&l[yt](o)&&(i=ne(l,"."+n),t=ee("["+o+'="'+n+'"]',i),(t===l||t===l[Et])&&i&&e.close())},r=function(){re.call(i,mt,n),oe(t,at,l),i[Et].removeChild(i)};this.close=function(){i&&t&&Zt(i,Nt)&&(re.call(i,pt,n),Vt(i,Nt),i&&a())},c in t||ie(t,at,l),t[c]=this};ue(c,be,o);var xe=function(t,e){t=ee(t),e=e||null;var n=!1,i="button",o="checked",a="reset",l="LABEL",r="INPUT",c=function(){e&&e!==a&&(e===$t&&(Qt(t,Pt),t[Tt](Pt,Pt)),t[Tt](A,t.innerHTML.replace(/^\s+|\s+$/g,"")),t.innerHTML=t[xt]("data-"+e+"-text"))},s=function(){t[xt](A)&&((Zt(t,Pt)||t[xt](Pt)===Pt)&&(Vt(t,Pt),t.removeAttribute(Pt)),t.innerHTML=t[xt](A))},f=function(e){var a=e[j][Et],c=e[j].tagName===l?e[j]:a.tagName===l?a:null;if(c){var u=this,s=te(u,"btn"),f=c[wt](r)[0];if(f){if("checkbox"===f.type&&(f[o]?(Vt(c,Dt),f[xt](o),f.removeAttribute(o),f[o]=!1):(Qt(c,Dt),f[xt](o),f[Tt](o,o),f[o]=!0),n||(n=!0,re.call(f,bt,i),re.call(t,bt,i))),"radio"===f.type&&!n&&!f[o]){Qt(c,Dt),f[Tt](o,o),f[o]=!0,re.call(f,bt,i),re.call(t,bt,i),n=!0;for(var d=0,h=s[Mt];dd||n===v-1&&0===d)&&(g=f[c]=Ot),f.slideTo(d)}},k=function(t){if(t.preventDefault(),!p){var e=t.currentTarget||t.srcElement;e===w?(d++,g=f[c]=jt,d===v-1?d=v-1:d===v&&(d=0)):e===T&&(d--,g=f[c]=Ot,0===d?d=0:d<0&&(d=v-1)),f.slideTo(d)}},S=function(t){if(!p){switch(t.which){case 39:d++,g=f[c]=jt,d==v-1?d=v-1:d==v&&(d=0);break;case 37:d--,g=f[c]=Ot,0==d?d=0:d<0&&(d=v-1);break;default:return}f.slideTo(d)}},H=function(t){for(var e=0,n=A[Mt];e-1&&(n.persist||r))return;c=null,m()}(/\#$/.test(l.href)||l[Et]&&/\#$/.test(l[Et].href))&&e.preventDefault()},p=function(){re.call(a,st,l,c),Qt(a,r),u[Tt](it,!0),re.call(a,ft,l,c),ie(document,rt,f),o=!0},m=function(){re.call(a,dt,l,c),Vt(a,r),u[Tt](it,!1),re.call(a,ht,l,c),oe(document,rt,f),o=!1};this.toggle=function(){Zt(a,r)&&o?m():p()},d in t||(u[Tt]("tabindex","0"),ie(document,at,h)),t[d]=this};ue(d,we,i);var Ce=function(i,a){i=ee(i);var l=i[xt](T)||i[xt]("href"),r=ee(l),c=Zt(i,"modal")?i:r,u="modal",s="static",f="paddingLeft",d="paddingRight",p="modal-backdrop";if(Zt(i,"modal")&&(i=null),c){a=a||{},this[W]=a[W]!==!1&&"false"!==c[xt](x),this[N]=a[N]!==s&&c[xt](b)!==s||s,this[N]=a[N]!==!1&&"false"!==c[xt](b)&&this[N],this[$]=a[$];var m,v,g,y,w=this,C=this.open=!1,I=null,A=te(e,Ut).concat(te(e,Xt)),L=function(){var n=e[Ct]();return t[_]||n[Ot]-Math.abs(n[jt])},E=function(){var e,i=n.currentStyle||t.getComputedStyle(n),o=parseInt(i[d],10);if(m&&(n[Bt][d]=o+g+"px",A[Mt]))for(var a=0;ae[Q],g=k()},H=function(){c[Bt][f]=!m&&v?g+"px":"",c[Bt][d]=m&&!v?g+"px":""},B=function(){c[Bt][f]="",c[Bt][d]=""},D=function(){var t=document.createElement("div");y=ee("."+p),null===y&&(t[Tt]("class",p+" fade"),y=t,n.appendChild(y))},P=function(){y=ee("."+p),y&&null!==y&&"object"==typeof y&&(n.removeChild(y),y=null)},O=function(){Zt(c,Nt)?oe(document,rt,Y):ie(document,rt,Y)},q=function(){Zt(c,Nt)?oe(t,ct,w.update):ie(t,ct,w.update)},z=function(){Zt(c,Nt)?oe(c,at,F):ie(c,at,F)},R=function(){C=w.open=!0,Kt(c),re.call(c,ft,u,I)},U=function(){q(),z(),O(),c[Bt].display="",C=w.open=!1,i&&Kt(i),re.call(c,ht,u),setTimeout(function(){te(document,u+" "+Nt)[0]||(B(),M(),Vt(n,u+"-open"),P())},100)},X=function(t){var e=t[j];e=e[yt](T)||e[yt]("href")?e:e[Et],C||e!==i||Zt(c,Nt)||(c.modalTrigger=i,I=i,w.show(),t.preventDefault())},Y=function(t){var e=t.which||t.keyCode;w[W]&&27==e&&C&&w.hide()},F=function(t){var e=t[j];C&&(e[Et][xt](o)===u||e[xt](o)===u||e===c&&w[N]!==s)&&(w.hide(),I=null,t.preventDefault())};this.toggle=function(){C&&Zt(c,Nt)?this.hide():this.show()},this.show=function(){re.call(c,st,u,I);var t=te(document,u+" in")[0];t&&t!==c&&t.modalTrigger[h].hide(),this[N]&&D(),y&&!Zt(y,Nt)&&setTimeout(function(){Qt(y,Nt)},0),setTimeout(function(){c[Bt].display="block",S(),E(),H(),q(),z(),O(),Qt(n,u+"-open"),Qt(c,Nt),c[Tt](ot,!1),Zt(c,"fade")?le(c,R):R()},Gt?150:0)},this.hide=function(){re.call(c,dt,u),y=ee("."+p),Vt(c,Nt),c[Tt](ot,!0),!!y&&Vt(y,Nt),setTimeout(function(){Zt(c,"fade")?le(c,U):U()},Gt?150:0)},this.setContent=function(t){ee("."+u+"-content",c).innerHTML=t},this.update=function(){C&&(S(),E(),H())},!i||h in i||ie(i,at,X),this[$]&&this.setContent(this[$]),!!i&&(i[h]=this)}};ue(h,Ce,i);var Ie=function(e,i){e=ee(e);var o=e[xt](E),a=e[xt](M),l=e[xt](S),r=e[xt](L),c=e[xt](H),u=e[xt](k),s="popover",f="template",d="trigger",h="class",m="div",v="fade",g="data-title",b="data-content",x="dismissible",T='',y=ne(e,".modal"),w=ne(e,"."+Ut),C=ne(e,"."+Xt);i=i||{},this[f]=i[f]?i[f]:null,this[d]=i[d]?i[d]:o||lt,this[z]=i[z]&&i[z]!==v?i[z]:a||v,this[R]=i[R]?i[R]:l||qt,this[P]=parseInt(i[P]||c)||200,this[x]=!(!i[x]&&"true"!==r),this[U]=ee(i[U])?ee(i[U]):ee(u)?ee(u):w?w:C?C:y?y:n;var I=this,A=e[xt](g)||null,B=e[xt](b)||null;if(B||this[f]){var D=null,N=0,W=this[R],$=function(t){null!==D&&t[j]===ee(".close",D)&&I.hide()},O=function(){I[U].removeChild(D),N=null,D=null},q=function(){if(A=e[xt](g),B=e[xt](b),D=document.createElement(m),null!==B&&null===I[f]){if(D[Tt]("role","tooltip"),null!==A){var t=document.createElement("h3");t[Tt](h,s+"-title"),t.innerHTML=I[x]?A+T:A,D.appendChild(t)}var n=document.createElement(m),i=document.createElement(m);n[Tt](h,"arrow"),i[Tt](h,s+"-content"),D.appendChild(n),D.appendChild(i),i.innerHTML=I[x]&&null===A?B+T:B}else{var o=document.createElement(m);o.innerHTML=I[f],D.innerHTML=o.firstChild.innerHTML}I[U].appendChild(D),D[Bt].display="block",D[Tt](h,s+" "+W+" "+I[z])},X=function(){!Zt(D,Nt)&&Qt(D,Nt)},Y=function(){me(e,D,W,I[U]),he(D)||(W=ve(W),me(e,D,W,I[U]))},F=function(){re.call(e,ft,s)},G=function(){O(),re.call(e,ht,s)};this.toggle=function(){null===D?I.show():I.hide()},this.show=function(){clearTimeout(N),N=setTimeout(function(){null===D&&(W=I[R],q(),Y(),X(),re.call(e,st,s),I[z]?le(D,F):F())},20)},this.hide=function(){clearTimeout(N),N=setTimeout(function(){D&&null!==D&&Zt(D,Nt)&&(re.call(e,dt,s),Vt(D,Nt),I[z]?le(D,G):G())},I[P])},p in e||(I[d]===lt?(ie(e,Yt[0],I.show),I[x]||ie(e,Yt[1],I.hide)):/^(click|focus)$/.test(I[d])&&(ie(e,I[d],I.toggle),I[x]||ie(e,"blur",I.hide)),I[x]&&ie(document,at,$),!Rt&&ie(t,ct,I.hide)),e[p]=I}};ue(p,Ie,i);var Ae=function(e,n){e=ee(e);var i=ee(e[xt](T));if(n=n||{},n[j]||i){for(var o,a=n[j]&&ee(n[j])||i,l=a&&a[wt]("A"),r=[],c=[],u=e[Z]=f&&d>o;if(!u&&h)"LI"!==n.tagName||Zt(n,Dt)||(Qt(n,Dt),u=!0,a&&!Zt(a,Dt)&&Qt(a,Dt),re.call(e,"activate","scrollspy",r[t]));else if(h){if(!h&&!u||u&&h)return}else"LI"===n.tagName&&Zt(n,Dt)&&(Vt(n,Dt),u=!1,a&&Zt(a,Dt)&&!te(n[Et],Dt).length&&Vt(a,Dt))},g=function(){o=s?pe().y:e[G];for(var t=0,n=r[Mt];t1&&(t=e[e[Mt]-1]):t=e[0],t[wt]("A")[0]},x=function(){return ee(b()[xt]("href"))},T=function(t){t.preventDefault(),r=t[j][xt](i)===o||se.test(t[j][xt]("href"))?t[j]:t[j][Et],d.show()};this.show=function(){r=r||t,f=ee(r[xt]("href")),u=b(),s=x(),u[l]&&r[l]||Zt(r[Et],Dt)||(u[l]=r[l]=!0,Vt(u[Et],Dt),Qt(r[Et],Dt),p&&(Zt(t[Et][Et],"dropdown-menu")?Zt(p,Dt)||Qt(p,Dt):Zt(p,Dt)&&Vt(p,Dt)),c&&(c[Bt][a]=de(s)+"px"),function(){Vt(s,Nt),re.call(u,dt,o,r),function(){Zt(s,"fade")?le(s,g):g()}()}(),function(){Zt(f,"fade")?le(f,m):m()}())},v in t||ie(t,at,T),this[a]&&(c=x()[Et]),t[v]=this}};ue(v,Le,i);var Ee=function(t,e){t=ee(t);var i=t[xt](M),o=t[xt](S),a=t[xt](H),l=t[xt](k),r="tooltip",c="class",u="title",s="fade",f="div",d=ne(t,".modal"),h=ne(t,"."+Ut),p=ne(t,"."+Xt);e=e||{},this[z]=e[z]&&e[z]!==s?e[z]:i||s,this[R]=e[R]?e[R]:o||qt,this[P]=parseInt(e[P]||a)||200,this[U]=ee(e[U])?ee(e[U]):ee(l)?ee(l):h?h:p?p:d?d:n;var m=this,v=0,b=this[R],x=null,T=t[xt](u)||t[xt](I);if(T){var y=function(){m[U].removeChild(x),x=null,v=null},w=function(){T=t[xt](u)||t[xt](I),x=document.createElement(f),x[Tt]("role",r);var e=document.createElement(f),n=document.createElement(f);e[Tt](c,r+"-arrow"),n[Tt](c,r+"-inner"),x.appendChild(e),x.appendChild(n),n.innerHTML=T,m[U].appendChild(x),x[Tt](c,r+" "+b+" "+m[z])},C=function(){me(t,x,b,m[U]),he(x)||(b=ve(b),me(t,x,b,m[U]))},A=function(){!Zt(x,Nt)&&Qt(x,Nt)},L=function(){re.call(t,ft,r)},E=function(){y(),re.call(t,ht,r)};this.show=function(){clearTimeout(v),v=setTimeout(function(){null===x&&(b=m[R],w(),C(),A(),re.call(t,st,r),m[z]?le(x,L):L())},20)},this.hide=function(){clearTimeout(v),v=setTimeout(function(){x&&null!==x&&Zt(x,Nt)&&(re.call(t,dt,r),Vt(x,Nt),m[z]?le(x,E):E())},m[P])},this.toggle=function(){x?m.hide():m.show()},g in t||(t[Tt](I,T),t.removeAttribute(u),ie(t,Yt[0],this.show),ie(t,Yt[1],this.hide)),t[g]=this}};return ue(g,Ee,i),{Affix:ge,Alert:be,Button:xe,Carousel:Te,Collapse:ye,Dropdown:we,Modal:Ce,Popover:Ie,ScrollSpy:Ae,Tab:Le,Tooltip:Ee}}); diff --git a/samples/StandaloneApp/wwwroot/index.html b/samples/StandaloneApp/wwwroot/index.html index a93d572f3e..561788da12 100644 --- a/samples/StandaloneApp/wwwroot/index.html +++ b/samples/StandaloneApp/wwwroot/index.html @@ -6,6 +6,8 @@ Loading... + + diff --git a/src/Microsoft.AspNetCore.Blazor.Server/BlazorAppBuilderExtensions.cs b/src/Microsoft.AspNetCore.Blazor.Server/BlazorAppBuilderExtensions.cs index 985d0e5465..e3097bd052 100644 --- a/src/Microsoft.AspNetCore.Blazor.Server/BlazorAppBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Blazor.Server/BlazorAppBuilderExtensions.cs @@ -42,6 +42,18 @@ namespace Microsoft.AspNetCore.Builder FileProvider = distFileProvider, ContentTypeProvider = CreateContentTypeProvider(), }); + + if (!string.IsNullOrEmpty(config.WebRootPath)) + { + // In development, we serve the wwwroot files directly from source + // (and don't require them to be copied into dist). + // TODO: When publishing is implemented, have config.WebRootPath set + // to null so that it only serves files that were copied to dist + applicationBuilder.UseStaticFiles(new StaticFileOptions + { + FileProvider = new PhysicalFileProvider(config.WebRootPath) + }); + } } private static IContentTypeProvider CreateContentTypeProvider() diff --git a/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/HostedInAspNetTest.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/HostedInAspNetTest.cs index a054891c64..af552df1a7 100644 --- a/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/HostedInAspNetTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/HostedInAspNetTest.cs @@ -3,6 +3,9 @@ using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure; using Microsoft.AspNetCore.Blazor.E2ETest.Infrastructure.ServerFixtures; +using OpenQA.Selenium; +using OpenQA.Selenium.Support.UI; +using System; using Xunit; namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests @@ -14,13 +17,29 @@ namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests { serverFixture.BuildWebHostMethod = HostedInAspNet.Server.Program.BuildWebHost; serverFixture.Environment = AspNetEnvironment.Development; + Navigate("/", noReload: true); + WaitUntilLoaded(); } [Fact] public void HasTitle() { - Navigate("/", noReload: true); Assert.Equal("Sample Blazor app", Browser.Title); } + + [Fact] + public void ServesStaticAssetsFromClientAppWebRoot() + { + var javascriptExecutor = (IJavaScriptExecutor)Browser; + var bootstrapTooltipType = javascriptExecutor + .ExecuteScript("return window.customJsWasLoaded;"); + Assert.True((bool)bootstrapTooltipType); + } + + private void WaitUntilLoaded() + { + new WebDriverWait(Browser, TimeSpan.FromSeconds(30)).Until( + driver => driver.FindElement(By.TagName("app")).Text != "Loading..."); + } } } diff --git a/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/StandaloneAppTest.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/StandaloneAppTest.cs index 4cbbedb11d..bfcac18d6e 100644 --- a/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/StandaloneAppTest.cs +++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/StandaloneAppTest.cs @@ -31,6 +31,16 @@ namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests { Assert.Equal("Hello, world!", Browser.FindElement(By.TagName("h1")).Text); } + + [Fact] + public void ServesStaticAssetsFromClientAppWebRoot() + { + // Verify that bootstrap.js was loaded + var javascriptExecutor = (IJavaScriptExecutor)Browser; + var bootstrapTooltipType = javascriptExecutor + .ExecuteScript("return typeof (window.Tooltip);"); + Assert.Equal("function", bootstrapTooltipType); + } private void WaitUntilLoaded() {