File tree Expand file tree Collapse file tree 5 files changed +22
-22
lines changed
src/test/java/net/codestory/http Expand file tree Collapse file tree 5 files changed +22
-22
lines changed Original file line number Diff line number Diff line change 457457 <dependency >
458458 <groupId >org.webjars</groupId >
459459 <artifactId >bootstrap</artifactId >
460- <version >3.3.5 </version >
460+ <version >3.4.1 </version >
461461 <scope >test</scope >
462462 </dependency >
463463 <dependency >
Original file line number Diff line number Diff line change 1515 */
1616package net .codestory .http .compilers ;
1717
18- import static org .assertj .core .api .Assertions .*;
19-
20- import java .nio .file .*;
21-
2218import net .codestory .http .io .Resources ;
2319import net .codestory .http .misc .Env ;
24- import org .junit .*;
25- import org .junit .rules .*;
20+ import org .junit .Rule ;
21+ import org .junit .Test ;
22+ import org .junit .rules .ExpectedException ;
23+
24+ import java .nio .file .Paths ;
25+
26+ import static org .assertj .core .api .Assertions .assertThat ;
2627
2728public class LessCompilerTest {
2829 static Resources resources = new Resources (Env .prod ());
@@ -73,7 +74,7 @@ public void import_less() {
7374
7475 @ Test
7576 public void import_less_from_webjar () {
76- String css = compile ("style.less" , "@import '/webjars/bootstrap/3.3.5 /less/bootstrap.less';" );
77+ String css = compile ("style.less" , "@import '/webjars/bootstrap/3.4.1 /less/bootstrap.less';" );
7778
7879 assertThat (css ).isNotEmpty ().doesNotContain ("@import" );
7980 }
Original file line number Diff line number Diff line change @@ -28,12 +28,12 @@ public class WebjarsInDevTest extends AbstractDevWebServerTest {
2828
2929 @ Test
3030 public void webjar_css () {
31- get ("/webjars/bootstrap/3.3.5 /css/bootstrap.min.css" ).should ().respond (200 ).haveType ("text/css" ).contain ("Bootstrap v3.3.5 " );
31+ get ("/webjars/bootstrap/3.4.1 /css/bootstrap.min.css" ).should ().respond (200 ).haveType ("text/css" ).contain ("Bootstrap v3.4.1 " );
3232 }
3333
3434 @ Test
3535 public void webjar_js () {
36- get ("/webjars/bootstrap/3.3.5 /js/bootstrap.min.js" ).should ().respond (200 ).haveType ("text/javascript;charset=UTF-8" ).contain ("Bootstrap v3.3.5 " );
36+ get ("/webjars/bootstrap/3.4.1 /js/bootstrap.min.js" ).should ().respond (200 ).haveType ("text/javascript;charset=UTF-8" ).contain ("Bootstrap v3.4.1 " );
3737 }
3838
3939 @ Test
@@ -49,10 +49,10 @@ public void print_possible_candidates() {
4949
5050 assertThat (stderr .getLog ())
5151 .contains ("Found these webjars files with extension: .js" )
52- .contains ("/webjars/bootstrap/3.3.5 /js/bootstrap.js" )
53- .contains ("/webjars/bootstrap/3.3.5 /js/bootstrap.min.js" )
52+ .contains ("/webjars/bootstrap/3.4.1 /js/bootstrap.js" )
53+ .contains ("/webjars/bootstrap/3.4.1 /js/bootstrap.min.js" )
5454 .contains ("/webjars/jquery/1.11.1/jquery.js" )
55- .doesNotContain ("/webjars/bootstrap/3.3.5 /css/bootstrap.min.css" );
55+ .doesNotContain ("/webjars/bootstrap/3.4.1 /css/bootstrap.min.css" );
5656 }
5757
5858 @ Test
Original file line number Diff line number Diff line change @@ -32,12 +32,12 @@ public class WebjarsTest extends AbstractProdWebServerTest {
3232
3333 @ Test
3434 public void webjar_css () {
35- get ("/webjars/bootstrap/3.3.5 /css/bootstrap.min.css" ).should ().respond (200 ).haveType ("text/css" ).contain ("Bootstrap v3.3.5 " );
35+ get ("/webjars/bootstrap/3.4.1 /css/bootstrap.min.css" ).should ().respond (200 ).haveType ("text/css" ).contain ("Bootstrap v3.4.1 " );
3636 }
3737
3838 @ Test
3939 public void webjar_js () {
40- get ("/webjars/bootstrap/3.3.5 /js/bootstrap.min.js" ).should ().respond (200 ).haveType ("text/javascript;charset=UTF-8" ).contain ("Bootstrap v3.3.5 " );
40+ get ("/webjars/bootstrap/3.4.1 /js/bootstrap.min.js" ).should ().respond (200 ).haveType ("text/javascript;charset=UTF-8" ).contain ("Bootstrap v3.4.1 " );
4141 }
4242
4343 @ Test
Original file line number Diff line number Diff line change 1515 */
1616package net .codestory .http .templating .helpers ;
1717
18- import static java .util .Collections .singletonMap ;
19- import static org .assertj .core .api .Assertions .assertThat ;
20- import static org .mockito .Mockito .mock ;
21-
22- import org .junit .Test ;
23-
2418import com .github .jknack .handlebars .Context ;
2519import com .github .jknack .handlebars .Handlebars ;
2620import com .github .jknack .handlebars .Options ;
2721import com .github .jknack .handlebars .TagType ;
2822import com .github .jknack .handlebars .Template ;
23+ import org .junit .Test ;
24+
25+ import static java .util .Collections .singletonMap ;
26+ import static org .assertj .core .api .Assertions .assertThat ;
27+ import static org .mockito .Mockito .mock ;
2928
3029public class WebjarHelperSourceTest {
3130 static WebjarHelperSource webjarHelper = new WebjarHelperSource (true );
@@ -34,7 +33,7 @@ public class WebjarHelperSourceTest {
3433 public void css () {
3534 CharSequence script = webjarHelper .webjar ("bootstrap.css" , null );
3635
37- assertThat (script ).hasToString ("<link rel=\" stylesheet\" href=\" /webjars/bootstrap/3.3.5 /css/bootstrap.min.css\" >" );
36+ assertThat (script ).hasToString ("<link rel=\" stylesheet\" href=\" /webjars/bootstrap/3.4.1 /css/bootstrap.min.css\" >" );
3837 }
3938
4039 @ Test
You can’t perform that action at this time.
0 commit comments